diff --git a/include/ListView/ListViewController.php b/include/ListView/ListViewController.php index cfc9d96551b13895905e52edcddaaac289efda52..94c4e811cd046782dc9cd64407afc8402e17e642 100644 --- a/include/ListView/ListViewController.php +++ b/include/ListView/ListViewController.php @@ -497,7 +497,7 @@ class ListViewController { if(!empty($value) && !empty($this->nameList[$fieldName]) && !empty($parentModule)) { $parentMeta = $this->queryGenerator->getMeta($parentModule); $value = textlength_check($this->nameList[$fieldName][$value]); - if ($parentMeta->isModuleEntity() && $parentModule != "Users" && $parentModule != 'SLA') { + if ($parentMeta->isModuleEntity() && $parentModule != "Users") { $value = "<a class='js-reference-display-value' href='?module=$parentModule&view=Detail&". "record=$rawValue' title='".getTranslatedString($parentModule, $parentModule)."'>$value</a>"; } diff --git a/modules/Contacts/actions/RelationAjax.php b/modules/Contacts/actions/RelationAjax.php index 5a7189ef657e5d011f215f3e73d622220d98181e..2a6c893ab2fa47feb13a0fd1240ec45601f71427 100644 --- a/modules/Contacts/actions/RelationAjax.php +++ b/modules/Contacts/actions/RelationAjax.php @@ -21,23 +21,6 @@ class Contacts_RelationAjax_Action extends Vtiger_RelationAjax_Action { $autoFillFieldName = $data['fieldname']; $autofillRecordId = $recordModel->get($autoFillFieldName); - //added to handle extra relation for cases sla - if ($autoFillFieldName == 'slaid') { - //if contact doesn't have related sla then fetch contact related sla - if (!$autofillRecordId) { - $account_id = $recordModel->get('account_id'); - if ($account_id) { - $accountsRecordModel = Vtiger_Record_Model::getInstanceById($account_id, 'Accounts'); - $autofillRecordId = $accountsRecordModel->get($autoFillFieldName); - } - //if organization doesn't have related sla get default sla - if (!$autofillRecordId) { - include_once 'modules/Settings/SLA/models/Record.php'; - $autofillRecordId = Settings_SLA_Record_Model::getDefaultSLA(); - } - } - } - $autoFillNameArray = getEntityName($autoFillModule, $autofillRecordId); $autoFillName = $autoFillNameArray[$autofillRecordId]; diff --git a/modules/Vtiger/actions/ExportData.php b/modules/Vtiger/actions/ExportData.php index 0a61c7173cc409b7393146efa696e49b7db1185c..648a9e20d8e61b575cdb40f93939cc08af2ed1af 100644 --- a/modules/Vtiger/actions/ExportData.php +++ b/modules/Vtiger/actions/ExportData.php @@ -84,7 +84,7 @@ class Vtiger_ExportData_Action extends Vtiger_Mass_Action { } function getAdditionalQueryModules(){ - return array_merge(getInventoryModules(), array('Products', 'Services', 'PriceBooks', 'Cases')); + return array_merge(getInventoryModules(), array('Products', 'Services', 'PriceBooks')); } /** diff --git a/modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc b/modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc index d2a2ccb37f86da541a41020d0b4275d1cdf5f006..f9fb860dd9a3378a285654027eb43009a6113bdd 100644 --- a/modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc +++ b/modules/com_vtiger_workflow/tasks/VTCreateEntityTask.inc @@ -168,12 +168,6 @@ class VTCreateEntityTask extends VTTask { $fieldValue = $recordId; } else { $fieldValue = ''; - if ($fieldReferenceModule == 'SLA') { - $slaDefaultId = Settings_SLA_Record_Model::getDefaultSLA(); - if (!empty($slaDefaultId)) { - $fieldValue = $slaDefaultId; - } - } } } } diff --git a/pkg/vtiger/modules/ModComments/modules/ModComments/actions/SaveAjax.php b/pkg/vtiger/modules/ModComments/modules/ModComments/actions/SaveAjax.php index ef88dce5941bf6d3a75830b36deeccd6654851d6..f99ca966a250a3d15be496a5b1e1e1df3f851209 100644 --- a/pkg/vtiger/modules/ModComments/modules/ModComments/actions/SaveAjax.php +++ b/pkg/vtiger/modules/ModComments/modules/ModComments/actions/SaveAjax.php @@ -36,13 +36,6 @@ class ModComments_SaveAjax_Action extends Vtiger_SaveAjax_Action { $result['id'] = $result['_recordId'] = $recordModel->getId(); $result['_recordLabel'] = $recordModel->getName(); - if($request->get('source_module') == 'Cases'){ - $caseRecordModel = Vtiger_Record_Model::getInstanceById($request->get('related_to')); - //Notify to other users, who are there in detail view of the same record - $caseRecordModel->notifyToUser($userId); - // - } - $response = new Vtiger_Response(); $response->setEmitType(Vtiger_Response::$EMIT_JSON); $response->setResult($result);