diff --git a/include/Webservices/WebserviceField.php b/include/Webservices/WebserviceField.php index c5add0d22c19018b099b1b259f586f7fc4421dbf..3499c3a190dcbd489e480914b9c7ec8a3fe7570a 100644 --- a/include/Webservices/WebserviceField.php +++ b/include/Webservices/WebserviceField.php @@ -378,7 +378,7 @@ class WebserviceField{ if ($moduleName == 'Events') $moduleName = 'Calendar'; if($numRows == 0){ - $sql = "select * from vtiger_$fieldName"; + $sql = "SELECT * FROM vtiger_$fieldName ORDER BY sortorderid"; $result = $this->pearDB->pquery($sql,array()); $numRows = $this->pearDB->num_rows($result); for($i=0;$i<$numRows;++$i){ diff --git a/vtlib/Vtiger/Functions.php b/vtlib/Vtiger/Functions.php index 4d80efb50d3c1a08793411e1f19ce92532588668..b2ab241f9fcf836708f75f2248a822ad32bb8464 100644 --- a/vtlib/Vtiger/Functions.php +++ b/vtlib/Vtiger/Functions.php @@ -955,7 +955,7 @@ class Vtiger_Functions { static function getPickListValuesFromTableForRole($tablename, $roleid) { global $adb; - $query = "select $tablename from vtiger_$tablename inner join vtiger_role2picklist on vtiger_role2picklist.picklistvalueid = vtiger_$tablename.picklist_valueid where roleid=? and picklistid in (select picklistid from vtiger_picklist) order by sortid"; + $query = "select $tablename from vtiger_$tablename inner join vtiger_role2picklist on vtiger_role2picklist.picklistvalueid = vtiger_$tablename.picklist_valueid where roleid=? and picklistid in (select picklistid from vtiger_picklist) order by sortorderid"; $result = $adb->pquery($query, array($roleid)); $fldVal = Array(); while ($row = $adb->fetch_array($result)) {