Reverse order of GROUP BY and ORDER BY

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12174 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml

@@ -252,15 +252,14 @@ WHERE\n
     <dtml-if expression> AND <dtml-var expression> </dtml-if>\n
   </dtml-let>\n
 </dtml-if>\n
-<dtml-if sort_on>\n
-ORDER BY\n
-  <dtml-var sort_on>\n
-</dtml-if>\n
 <dtml-if group_by_expression>\n
 GROUP BY\n
   <dtml-var group_by_expression>\n
 </dtml-if>\n
-
+<dtml-if sort_on>\n
+ORDER BY\n
+  <dtml-var sort_on>\n
+</dtml-if>\n
 
 ]]></string> </value>
                     </item>

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml

@@ -294,14 +294,14 @@ WHERE \n
     <dtml-if expression> AND <dtml-var expression> </dtml-if>\n
   </dtml-let>\n
 </dtml-if>\n
-<dtml-if sort_on>\n
-ORDER BY\n
-  <dtml-var sort_on>\n
-</dtml-if>\n
 <dtml-if group_by_expression>\n
 GROUP BY\n
   <dtml-var group_by_expression>\n
 </dtml-if>\n
+<dtml-if sort_on>\n
+ORDER BY\n
+  <dtml-var sort_on>\n
+</dtml-if>\n
 <dtml-if limit_expression>\n
 LIMIT <dtml-var "limit_expression">\n
 <dtml-else>\n