Merge branch 'master' of http://code.vtiger.com/vtiger/vtigercrm

modules/Vtiger/models/ListView.php

@@ -189,6 +189,10 @@ class Vtiger_ListView_Model extends Vtiger_Base_Model {
 		if(empty($orderBy) && empty($sortOrder) && $moduleName != "Users"){
 			$orderBy = 'modifiedtime';
 			$sortOrder = 'DESC';
+			if (PerformancePrefs::getBoolean('LISTVIEW_DEFAULT_SORTING', true)) {
+                                $orderBy = $moduleFocus->default_order_by;
+                                $sortOrder = $moduleFocus->default_sort_order;
+                        }
 		}
 
         if(!empty($orderBy)){

modules/Vtiger/models/RelationListView.php

@@ -213,6 +213,13 @@ class Vtiger_RelationListView_Model extends Vtiger_Base_Model {
 
 		$orderBy = $this->getForSql('orderby');
 		$sortOrder = $this->getForSql('sortorder');
+
+                if (!$orderBy & PerformancePrefs::getBoolean('LISTVIEW_DEFAULT_SORTING', true)) {
+                        $entityModule=CRMEntity::getInstance($relationModule->name);
+                        $orderBy=$entityModule->default_order_by;
+                        $sortorder=$entityModule->default_sort_order;
+                }
+
 		if($orderBy) {
 
             $orderByFieldModuleModel = $relationModule->getFieldByColumn($orderBy);
@@ -506,4 +513,4 @@ class Vtiger_RelationListView_Model extends Vtiger_Base_Model {
         }         
     }
 
-}
+}
\ No newline at end of file