diff --git a/modules/Calendar/models/Module.php b/modules/Calendar/models/Module.php index 5823a868bb3f210483802e65448816fe99369e35..4c79cd351ada8206df67288c656e40556ccb742a 100644 --- a/modules/Calendar/models/Module.php +++ b/modules/Calendar/models/Module.php @@ -204,7 +204,7 @@ class Calendar_Module_Model extends Vtiger_Module_Model { * Function to get export query * @return <String> query; */ - public function getExportQuery() { + public function getExportQuery($where) { $currentUserModel = Users_Record_Model::getCurrentUserModel(); $userId = $currentUserModel->getId(); $userGroup = new GetUserGroups(); diff --git a/modules/Reports/models/Module.php b/modules/Reports/models/Module.php index f2eddd24a3e56eb4e87499c546cc2b1ae2799c87..aebd2653bf4d74da7425dea0c3849e50ca61025f 100644 --- a/modules/Reports/models/Module.php +++ b/modules/Reports/models/Module.php @@ -14,7 +14,7 @@ class Reports_Module_Model extends Vtiger_Module_Model { * Function deletes report * @param Reports_Record_Model $reportModel */ - function deleteRecord(Reports_Record_Model $reportModel) { + function deleteRecord(Vtiger_Record_Model $reportModel) { $currentUser = Users_Record_Model::getCurrentUserModel(); $subOrdinateUsers = $currentUser->getSubordinateUsers(); @@ -59,7 +59,7 @@ class Reports_Module_Model extends Vtiger_Module_Model { * Function returns quick links for the module * @return <Array of Vtiger_Link_Model> */ - function getSideBarLinks() { + function getSideBarLinks($linkParams) { $quickLinks = array( array( 'linktype' => 'SIDEBARLINK', @@ -149,4 +149,4 @@ class Reports_Module_Model extends Vtiger_Module_Model { function getUtilityActionsNames() { return array('Export'); } -} \ No newline at end of file +} diff --git a/modules/Settings/Vtiger/models/CompanyDetails.php b/modules/Settings/Vtiger/models/CompanyDetails.php index f41aa8582844464f75947b44d5eeb0336420d0c1..0ae626cb3b0ea6ecaab9c99787d0c585ffa667e9 100644 --- a/modules/Settings/Vtiger/models/CompanyDetails.php +++ b/modules/Settings/Vtiger/models/CompanyDetails.php @@ -153,7 +153,7 @@ class Settings_Vtiger_CompanyDetails_Model extends Settings_Vtiger_Module_Model * Function to get the instance of Company details module model * @return <Settings_Vtiger_CompanyDetais_Model> $moduleModel */ - public static function getInstance() { + public static function getInstance($name = '') { $moduleModel = new self(); $db = PearDatabase::getInstance(); diff --git a/modules/Users/models/Privileges.php b/modules/Users/models/Privileges.php index aafb3d72231ea4c6ab69911945ca69498137b442..8577549574a983d3cd0f5be87798574333524dbf 100644 --- a/modules/Users/models/Privileges.php +++ b/modules/Users/models/Privileges.php @@ -106,7 +106,7 @@ class Users_Privileges_Model extends Users_Record_Model { * @param <Number> $userId * @return Users_Privilege_Model object */ - public static function getInstanceById($userId) { + public static function getInstanceById($userId, $module = NULL) { if (empty($userId)) return null; @@ -198,4 +198,4 @@ class Users_Privileges_Model extends Users_Record_Model { } return false; } -} \ No newline at end of file +} diff --git a/modules/Vtiger/uitypes/Date.php b/modules/Vtiger/uitypes/Date.php index 0d7280ad78534cffa409142be13a22d4b078370e..5b1b46126e37b540eab7c0be2a90a3ed85fc961a 100644 --- a/modules/Vtiger/uitypes/Date.php +++ b/modules/Vtiger/uitypes/Date.php @@ -23,7 +23,7 @@ class Vtiger_Date_UIType extends Vtiger_Base_UIType { * @param <Object> $value * @return <Object> */ - public function getDisplayValue($value) { + public function getDisplayValue($value, $record = false, $recordInstance = false) { if(empty($value)){ return $value; } else { @@ -119,4 +119,4 @@ class Vtiger_Date_UIType extends Vtiger_Base_UIType { return 'uitypes/DateFieldSearchView.tpl'; } -} \ No newline at end of file +} diff --git a/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/models/Module.php b/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/models/Module.php index 8b56e142fdaae71cc80f3a7fd7d03c0349020c71..a1fb5d565f7bc8fbcb9fded84c46dd45b5bdaae9 100644 --- a/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/models/Module.php +++ b/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/models/Module.php @@ -32,7 +32,7 @@ class EmailTemplates_Module_Model extends Vtiger_Module_Model { * @param EmailtTemplates_Record_Model $recordModel * @return <integer> template id */ - public function saveRecord(EmailTemplates_Record_Model $recordModel) { + public function saveRecord(Vtiger_Record_Model $recordModel) { $db = PearDatabase::getInstance(); $recordId = $templateid = $recordModel->getId(); $systemtemplate = $recordModel->get('systemtemplate'); @@ -65,7 +65,7 @@ class EmailTemplates_Module_Model extends Vtiger_Module_Model { * Function to delete the email template * @param type $recordIds */ - public function deleteRecord(EmailTemplates_Record_Model $recordModel) { + public function deleteRecord(Vtiger_Record_Model $recordModel) { $recordId = $recordModel->getId(); $db = PearDatabase::getInstance(); $db->pquery('DELETE FROM vtiger_emailtemplates WHERE templateid = ? AND systemtemplate = ? ', array($recordId, '0'));