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

[jftempo]

=== modified file 'bin/addons/account/account_move_line.py'
--- bin/addons/account/account_move_line.py	2021-07-07 16:30:21 +0000
+++ bin/addons/account/account_move_line.py	2022-01-05 14:32:14 +0000
@@ -632,7 +632,6 @@
         'debit_currency': 0.0,
         'credit_currency': 0.0,
     }
-    _order = "date desc, id desc"
     _sql_constraints = [
         ('credit_debit1', 'CHECK (credit*debit=0)',  'Wrong credit or debit value in accounting entry !'),
         ('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in accounting entry !'),
@@ -645,6 +644,9 @@
         cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'account_move_line_journal_id_period_id_index\'')
         if not cr.fetchone():
             cr.execute('CREATE INDEX account_move_line_journal_id_period_id_index ON account_move_line (journal_id, period_id)')
+        cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'account_move_line_move_id_id_index\'')
+        if not cr.fetchone():
+            cr.execute('CREATE INDEX account_move_line_move_id_id_index ON account_move_line (move_id DESC, id)')
         return ret
 
     def _check_no_view(self, cr, uid, ids, context=None):

=== modified file 'bin/addons/account_override/account_move_line.py'
--- bin/addons/account_override/account_move_line.py	2021-08-26 11:43:10 +0000
+++ bin/addons/account_override/account_move_line.py	2022-01-05 14:32:14 +0000
@@ -309,7 +309,7 @@
                                      help="This indicates the state of the Journal Entry."),
         'is_addendum_line': fields.boolean('Is an addendum line?', readonly=True,
                                            help="This inform account_reconciliation module that this line is an addendum line for reconciliations."),
-        'move_id': fields.many2one('account.move', 'Entry Sequence', ondelete="cascade", help="The move of this entry line.", select=2, required=True, readonly=True),
+        'move_id': fields.many2one('account.move', 'Entry Sequence', ondelete="cascade", help="The move of this entry line.", select=2, required=True, readonly=True, join=True),
         'name': fields.char('Description', size=64, required=True, readonly=True),
         'journal_id': fields.many2one('account.journal', 'Journal Code', required=True, select=1),
         'debit': fields.float('Func. Debit', digits_compute=dp.get_precision('Account')),
@@ -374,7 +374,8 @@
         'is_si_refund': lambda *a: False,
     }
 
-    _order = 'move_id DESC'
+    _order = 'move_id DESC, id'
+    # see account_move_line_move_id_id_index on account_move_line
 
     def default_get(self, cr, uid, fields, context=None, from_web=False):
         """

=== modified file 'bin/osv/expression.py'
--- bin/osv/expression.py	2021-08-09 18:09:28 +0000
+++ bin/osv/expression.py	2022-01-05 14:32:14 +0000
@@ -121,7 +121,26 @@
             working_table = table
             main_table = table
             fargs = left.split('.', 1)
-            if fargs[0] in table._inherit_fields:
+            inherited_fields = fargs[0] in table._inherit_fields
+
+            if not inherited_fields and len(fargs) > 1:
+                # check if m2o fields can be sql joined
+                field = working_table._columns.get(fargs[0], False)
+                if field and field._type == 'many2one' and field._obj and field._join:
+                    new_working_table = working_table.pool.get(field._obj)
+                    if new_working_table not in self.__all_tables:
+                        self.__joins.append('%s.%s=%s.%s' % (new_working_table._table, 'id', main_table._table, fargs[0]))
+                        self.__all_tables.append(new_working_table)
+                    working_table = new_working_table
+                    self.__field_tables[i] = working_table
+                    left = fargs[1]
+                    fargs = left.split('.', 1)
+                    self.__exp[i] = (left, operator, right)
+                    inherited_fields = fargs[0] in working_table._inherit_fields
+                    if inherited_fields:
+                        main_table = working_table
+
+            if inherited_fields:
                 while True:
                     field = main_table._columns.get(fargs[0], False)
                     if field:
@@ -142,6 +161,7 @@
                 continue
 
             field_obj = table.pool.get(field._obj)
+
             if len(fargs) > 1:
                 if field._type == 'many2one':
                     right = field_obj.search(cr, uid, [(fargs[1], operator,
@@ -171,7 +191,7 @@
                     # values in the database, so we must ignore it : we generate a dummy leaf
                     self.__exp[i] = self.__DUMMY_LEAF
                 else:
-                    subexp = field.search(cr, uid, table, left, [self.__exp[i]], context=context)
+                    subexp = field.search(cr, uid, working_table, left, [self.__exp[i]], context=context)
                     if not subexp:
                         self.__exp[i] = self.__DUMMY_LEAF
                     else:
@@ -181,6 +201,10 @@
                         self.__exp.insert(i + 1, self.__DUMMY_LEAF)
                         for j, se in enumerate(subexp):
                             self.__exp.insert(i + 2 + j, se)
+                            if self.__field_tables.get(i+j):
+                                # replace joined table
+                                self.__field_tables[i+2+j] = self.__field_tables[i+j]
+                                del self.__field_tables[i+j]
             # else, the value of the field is store in the database, so we search on it
 
             elif field._type == 'one2many':

=== modified file 'bin/osv/fields.py'
--- bin/osv/fields.py	2021-04-08 13:15:31 +0000
+++ bin/osv/fields.py	2022-01-05 14:32:14 +0000
@@ -59,6 +59,7 @@
     _symbol_f = _symbol_set
     _symbol_set = (_symbol_c, _symbol_f)
     _symbol_get = None
+    _join = False
 
     def __init__(self, string='unknown', required=False, readonly=False,
                  domain=None, context=None, states=None, priority=0,
@@ -376,6 +377,9 @@
     def __init__(self, obj, string='unknown', **args):
         _column.__init__(self, string=string, **args)
         self._obj = obj
+        self._join = args.get('join', False)
+        if self._join and not self.required:
+            raise Exception('join fields must be required')
 
     def set_memory(self, cr, obj, id, field, values, user=None, context=None):
         obj.datas.setdefault(id, {})

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2021-10-20 13:51:35 +0000
+++ bin/osv/orm.py	2022-01-05 14:32:14 +0000
@@ -1015,7 +1015,6 @@
                     else:
                         while pos < len(datas):
                             res2 = process_liness(self, datas, prefix + [field[len(prefix)]], current_module, relation_obj._name, newfd, pos, first)
-                            print res2
                             if not res2:
                                 break
                             (newrow, pos, w2, data_res_id2, xml_id2) = res2
@@ -2069,7 +2068,9 @@
         or approximate.
         :return: (count, boolean) boolean is True in case of approximation
         """
-        if not args:
+        if not args or \
+                (self._table in ['account_move_line', 'account_move'] and args in ([('period_id.number', '!=', 0)], [('period_id.number', '!=', 0), ('move_id.state', '=', 'posted')])) or \
+                (self._table == 'account_analytic_line' and args == [('account_id.category', '=', 'FUNDING')]):
             cr.execute("""
                 SELECT reltuples::BIGINT AS approximate_row_count
                 FROM pg_class WHERE relname = '%s'
@@ -2078,7 +2079,15 @@
             approximative_result = approximative_result and approximative_result[0][0] or 0
             # check if approximative is big
             if approximative_result > 100000:
-                return int(approximative_result), True
+                exclude = 0
+                if self._table in ['account_move_line', 'account_move']:
+                    exclude = self.search_count(cr, user, [('period_id.number', '=', 0)], context={'show_period_0': 1})
+                if self._table == 'account_move_line' and args == [('period_id.number', '!=', 0), ('move_id.state', '=', 'posted')]:
+                    exclude += self.search_count(cr, user, [('move_id.state', '=', 'draft')], context=context)
+                if self._table == 'account_analytic_line':
+                    exclude = self.search_count(cr, user, [('account_id.category', '!=', 'FUNDING')], context=context)
+                    print exclude
+                return int(approximative_result) - exclude, True
         return self.search_count(cr, user, args, context=context), False
 
 
@@ -4839,6 +4848,10 @@
             for order_part in m2o_order.split(","):
                 m2o_order_list.append(order_part.strip().split(" ",1)[0].strip())
             m2o_order = m2o_order_list
+            if m2o_order == ['id']:
+                # default order on m2o table is "id", not need to join table
+                return qualified_field
+
 
         # Join the dest m2o table if it's not joined yet. We use [LEFT] OUTER join here
         # as we don't want to exclude results that have NULL values for the m2o