Skip to content
Snippets Groups Projects
Commit 4d01f6da authored by Satish's avatar Satish
Browse files

Unnecessary code removed

parent af129f8a
No related branches found
No related tags found
No related merge requests found
...@@ -61,7 +61,6 @@ $languageStrings = array( ...@@ -61,7 +61,6 @@ $languageStrings = array(
'Prof.'=>'Prof.', 'Prof.'=>'Prof.',
'User List'=>'User List', 'User List'=>'User List',
'LBL_TRANSACTIONS' => 'Transactions',
); );
$jsLanguageStrings = array( $jsLanguageStrings = array(
......
...@@ -62,15 +62,15 @@ class Settings_MenuEditor_Module_Model extends Settings_Vtiger_Module_Model { ...@@ -62,15 +62,15 @@ class Settings_MenuEditor_Module_Model extends Settings_Vtiger_Module_Model {
$userPrivModel = Users_Privileges_Model::getCurrentUserPrivilegesModel(); $userPrivModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
if ($count > 0) { if ($count > 0) {
for ($i = 0; $i < $count; $i++) { for ($i = 0; $i < $count; $i++) {
$appname = $db->query_result($result, $i, 'appname');
$tabid = $db->query_result($result, $i, 'tabid'); $tabid = $db->query_result($result, $i, 'tabid');
$sequence = $db->query_result($result, $i, 'sequence');
$moduleName = getTabModuleName($tabid); $moduleName = getTabModuleName($tabid);
if ($moduleName === 'Transactions')
continue; //Transactions module should not be available in Menu
$moduleModel = Vtiger_Module_Model::getInstance($moduleName); $moduleModel = Vtiger_Module_Model::getInstance($moduleName);
if (empty($moduleModel)) if (empty($moduleModel)) {
continue; continue;
}
$sequence = $db->query_result($result, $i, 'sequence');
$appname = $db->query_result($result, $i, 'appname');
$moduleModel->set('app2tab_sequence', $sequence); $moduleModel->set('app2tab_sequence', $sequence);
if (($userPrivModel->isAdminUser() || if (($userPrivModel->isAdminUser() ||
$userPrivModel->hasGlobalReadPermission() || $userPrivModel->hasGlobalReadPermission() ||
......
...@@ -300,17 +300,13 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model { ...@@ -300,17 +300,13 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
public static function getPicklistSupportedModules() { public static function getPicklistSupportedModules() {
$db = PearDatabase::getInstance(); $db = PearDatabase::getInstance();
$restrictedPickListModule = array('Transactions');
// vtlib customization: Ignore disabled modules.
$query = "SELECT distinct vtiger_tab.tablabel, vtiger_tab.name as tabname $query = "SELECT distinct vtiger_tab.tablabel, vtiger_tab.name as tabname
FROM vtiger_tab FROM vtiger_tab
inner join vtiger_field on vtiger_tab.tabid=vtiger_field.tabid inner join vtiger_field on vtiger_tab.tabid=vtiger_field.tabid
WHERE uitype IN (15,33,16,114) and vtiger_field.tabid NOT IN (29,10) and vtiger_tab.presence != 1 and vtiger_field.presence in (0,2) WHERE uitype IN (15,33,16,114) and vtiger_field.tabid NOT IN (29,10) and vtiger_tab.presence != 1 and vtiger_field.presence in (0,2)
AND vtiger_tab.tablabel NOT IN (" . generateQuestionMarks($restrictedPickListModule) . ")
ORDER BY vtiger_tab.tabid ASC"; ORDER BY vtiger_tab.tabid ASC";
// END $result = $db->pquery($query, array());
$result = $db->pquery($query, array($restrictedPickListModule));
$modulesModelsList = array(); $modulesModelsList = array();
while($row = $db->fetch_array($result)){ while($row = $db->fetch_array($result)){
......
...@@ -50,7 +50,6 @@ $languageStrings = array( ...@@ -50,7 +50,6 @@ $languageStrings = array(
'Contact Id' => 'Contact Id', 'Contact Id' => 'Contact Id',
'Support Start Date' => 'Support Start Date' , 'Support Start Date' => 'Support Start Date' ,
'Support End Date' => 'Support End Date' , 'Support End Date' => 'Support End Date' ,
'LBL_TRANSACTIONS' => 'Transactions',
'Other Phone' => 'Secondary Phone', 'Other Phone' => 'Secondary Phone',
'Email' => 'Primary Email', 'Email' => 'Primary Email',
......
...@@ -50,7 +50,6 @@ $languageStrings = array( ...@@ -50,7 +50,6 @@ $languageStrings = array(
'Contact Id' => 'Contact Id', 'Contact Id' => 'Contact Id',
'Support Start Date' => 'Soutien Date de début' , 'Support Start Date' => 'Soutien Date de début' ,
'Support End Date' => 'Soutien Date de fin' , 'Support End Date' => 'Soutien Date de fin' ,
'LBL_TRANSACTIONS' => 'Transactions',
'Other Phone' => 'Téléphone Secondaire', 'Other Phone' => 'Téléphone Secondaire',
'Email' => 'E-Mail Principale', 'Email' => 'E-Mail Principale',
......
...@@ -50,7 +50,6 @@ $languageStrings = array( ...@@ -50,7 +50,6 @@ $languageStrings = array(
'Contact Id' => 'Contacto Id', 'Contact Id' => 'Contacto Id',
'Support Start Date' => 'Soporte Fecha de Inicio' , 'Support Start Date' => 'Soporte Fecha de Inicio' ,
'Support End Date' => 'Soporte Fecha de finalización', 'Support End Date' => 'Soporte Fecha de finalización',
'LBL_TRANSACTIONS' => 'Transactions',
'Other Phone' => 'Teléfono secundario', 'Other Phone' => 'Teléfono secundario',
'Email' => 'Correo electrónico principal', 'Email' => 'Correo electrónico principal',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment