Merge lp:~jfb-tempo-consulting/unifield-server/US-8276 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/product/product.py'
--- bin/addons/product/product.py	2020-08-11 12:55:22 +0000
+++ bin/addons/product/product.py	2021-04-15 08:08:23 +0000
@@ -470,7 +470,8 @@
             ret.joins['"product_product"'] = [('"stock_mission_report_line_location"', 'id', 'product_id', 'LEFT JOIN')]
             ret.where_clause.append(' "stock_mission_report_line_location"."remote_instance_id" is NULL AND "stock_mission_report_line_location"."location_id" in %s ')
             ret.where_clause_params.append(tuple(location_ids))
-            ret.having = ' GROUP BY "product_product"."id" HAVING sum("stock_mission_report_line_location"."quantity") >0 '
+            ret.having_group_by = ' GROUP BY "product_product"."id" '
+            ret.having = ' HAVING sum("stock_mission_report_line_location"."quantity") >0 '
         if filter_in_any_product_list:
             ret.tables.append('"product_list_line"')
             ret.joins['"product_product"'] = [('"product_list_line"', 'id', 'name', 'INNER JOIN')]

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2021-02-02 10:20:51 +0000
+++ bin/osv/orm.py	2021-04-15 08:08:23 +0000
@@ -4842,6 +4842,7 @@
         translation = 0
         if order_spec:
             order_by_elements = []
+            order_by_elements_nodir = []
             self._check_qorder(order_spec)
             for order_part in order_spec.split(','):
                 translatable = False
@@ -4890,6 +4891,8 @@
                         trans_name = '"ir_translation%s"' % translation
                         init_field = '"%s"."%s"' % (self._table, order_field)
                         order_by_elements.append('COALESCE(%s."value", %s) %s' % (trans_name, init_field, order_direction))
+                        if query.having:
+                            order_by_elements_nodir.append('COALESCE(%s."value", %s)' % (trans_name, init_field))
                         left_join_clause = 'LEFT JOIN "ir_translation" %s' % trans_name
                         on_clause = 'ON %s.res_id = "%s".id AND %s.name = \'%s,%s\' AND %s.type = \'model\' AND %s.lang = \'%s\'' % (
                             trans_name, trans_table, trans_name, trans_obj_name, order_field, trans_name, trans_name, context.get('lang', 'en_US'))
@@ -4905,6 +4908,8 @@
 
                         init_field = self._inherits_join_calc(order_field, query)
                         order_by_elements.append('COALESCE(%s."value", %s) %s' % (trans_name, init_field, order_direction))
+                        if query.having:
+                            order_by_elements_nodir.append('COALESCE(%s."value", %s)' % (trans_name, init_field))
                         left_join_clause = 'LEFT JOIN "ir_translation" %s' % trans_name
                         on_clause = 'ON %s.res_id = "%s".id AND %s.name = \'%s,%s\' AND %s.type = \'model\' AND %s.lang = \'%s\'' % (
                             trans_name, parent_obj._table, trans_name, parent_obj._name, order_field, trans_name, trans_name, context.get('lang', 'en_US'))
@@ -4924,11 +4929,18 @@
                     if isinstance(end_inner_clause, list):
                         for clause in end_inner_clause:
                             order_by_elements.append("%s %s" % (clause, order_direction))
+                            if query.having:
+                                order_by_elements_nodir.append(clause)
                     else:
                         order_by_elements.append("%s %s" % (end_inner_clause, order_direction))
+                        if query.having:
+                            order_by_elements_nodir.append(end_inner_clause)
             if order_by_elements:
                 order_by_clause = ",".join(order_by_elements)
 
+        if order_by_elements_nodir:
+            query.having_group_by = '%s, %s' % (query.having_group_by, ','.join(order_by_elements_nodir))
+
         return order_by_clause and (' ORDER BY %s ' % order_by_clause) or '', from_order_clause
 
     def _search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False, access_rights_uid=None):
@@ -4947,7 +4959,7 @@
 
         query = self._where_calc(cr, user, args, context=context)
         self._apply_ir_rules(cr, user, query, 'read', context=context)
-        if order == 'NO_ORDER':
+        if order == 'NO_ORDER' or count:
             order_by=''
             from_order_clause = []
         else:
@@ -4970,11 +4982,12 @@
                 return res[0][0]
             else:
                 count_query = ''.join(('SELECT "%s".id FROM ' % self._table,
-                                       from_clause, where_str, query.having, limit_str, offset_str))
+                                       from_clause, where_str, query.having_group_by, query.having, limit_str, offset_str))
                 cr.execute(count_query, where_clause_params)
                 return cr.rowcount
+
         select_query = ''.join(('SELECT "%s".id FROM ' % self._table,
-                                from_clause, where_str, query.having, order_by,limit_str, offset_str))
+                                from_clause, where_str, query.having_group_by, query.having, order_by,limit_str, offset_str))
         cr.execute(select_query, where_clause_params)
         res = cr.fetchall()
         return [x[0] for x in res]

=== modified file 'bin/osv/query.py'
--- bin/osv/query.py	2020-06-08 14:18:17 +0000
+++ bin/osv/query.py	2021-04-15 08:08:23 +0000
@@ -53,6 +53,7 @@
         self.where_clause_params = where_clause_params or []
 
         self.having = ''
+        self.having_group_by = ''
         # holds table joins done explicitly, supporting outer joins. The JOIN
         # condition should not be in `where_clause`. The dict is used as follows:
         #   self.joins = {