Merge branch 'fix_quickcreate_sortorder' into 'master'

fixes quickcreate field ordering and anything else that needs all the fields for…

… the module in the order they appear on the screen in blocks ref #115

See merge request !36

vtlib/Vtiger/Field.php

@@ -236,7 +236,7 @@ class Vtiger_Field extends Vtiger_FieldBasic {
 		global $adb;
 		$instances = false;
 
-		$query = "SELECT * FROM vtiger_field WHERE tabid=? ORDER BY sequence";
+		$query = "SELECT * FROM vtiger_field left join vtiger_blocks on vtiger_field.block=vtiger_blocks.blockid WHERE vtiger_field.tabid=? ORDER BY vtiger_blocks.sequence,vtiger_field.sequence";
 		$queryParams = Array($moduleInstance->id);
 
 		$result = $adb->pquery($query, $queryParams);
@@ -259,4 +259,4 @@ class Vtiger_Field extends Vtiger_FieldBasic {
 		self::log("Deleting fields of the module ... DONE");
 	}
 }
-?>
\ No newline at end of file
+?>