Merge lp:~jfb-tempo-consulting/unifield-server/us-7620 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account_reconciliation/account_move_line.py'
--- bin/addons/account_reconciliation/account_move_line.py	2020-01-06 17:20:47 +0000
+++ bin/addons/account_reconciliation/account_move_line.py	2020-06-30 15:41:33 +0000
@@ -605,7 +605,7 @@
             if p or t:
                 sql_params = [name, tuple(p+t)]
                 new_field = ""
-                if prev is not None and not context.get('sync_update_execution'):
+                if prev is not None:
                     self.pool.get('account.move.line').log_reconcile(cr, uid, r, previous=prev, rec_name=name, context=context)
                 if context.get('sync_update_execution') and t:
                     if action_date:
@@ -634,6 +634,7 @@
         prev = {}
         aml_ids = []
 
+        new_vals = {}
         # use one2many codification (x,values) to get account.move.line tied to this new rec
         # x=5 to delete existing links is ignored as we are in create mode
         for rec_type in ['line_id', 'line_partial_ids']:
@@ -641,8 +642,15 @@
                 for x in vals.get(rec_type):
                     if x[0] in (1, 2, 3, 4):
                         aml_ids.append(x[1])
+                        if context.get('sync_update_execution'):
+                            new_vals.setdefault(rec_type, []).append(x)
                     elif x[0] == 6:
                         aml_ids += x[2]
+                        if context.get('sync_update_execution') and x[2]:
+                            new_vals.setdefault(rec_type, []).append((7, x[2]))
+
+        if new_vals:
+            vals.update(new_vals)
 
         # get previous reconcile from _txt
         already_reconciled = []
@@ -663,6 +671,9 @@
             if isinstance(res, (int, long)):
                 tmp_res = [tmp_res]
             self.common_create_write(cr, uid, tmp_res, vals.get('action_date'), prev=prev, context=context)
+
+        if context.get('sync_update_execution'):
+            self.pool.get('account.move.line').reconciliation_update(cr, uid, [res], context=context)
         return res
 
     def write(self, cr, uid, ids, vals, context=None):

=== modified file 'bin/osv/fields.py'
--- bin/osv/fields.py	2020-05-04 08:13:23 +0000
+++ bin/osv/fields.py	2020-06-30 15:41:33 +0000
@@ -554,20 +554,16 @@
             elif act[0] == 5:
                 cr.execute('update '+_table+' set '+self._fields_id+'=null where '+self._fields_id+'=%s', (id,))  # not_a_user_entry
             elif act[0] == 6:
-                if self._obj == 'account.move.line' and self._fields_id == 'reconcile_id':
-                    # FXA may be created during write on account.move.line
-                    # but reconcile_id on the FXA must not be deleted by the last line ({self._fields_id:False})
-                    ids2 = act[2] or [0]
-                    cr.execute('select id from '+_table+' where '+self._fields_id+'=%s and id <> ALL (%s)', (id,ids2))  # not_a_user_entry
-                    ids3 = map(lambda x:x[0], cr.fetchall())
-                    obj.write(cr, user, act[2], {self._fields_id:id}, context=context or {})
-                    obj.write(cr, user, ids3, {self._fields_id:False}, context=context or {})
-                else:
-                    obj.write(cr, user, act[2], {self._fields_id:id}, context=context or {})
-                    ids2 = act[2] or [0]
-                    cr.execute('select id from '+_table+' where '+self._fields_id+'=%s and id <> ALL (%s)', (id,ids2))  # not_a_user_entry
-                    ids3 = map(lambda x:x[0], cr.fetchall())
-                    obj.write(cr, user, ids3, {self._fields_id:False}, context=context or {})
+                obj.write(cr, user, act[2], {self._fields_id:id}, context=context or {})
+                ids2 = act[2] or [0]
+                cr.execute('select id from '+_table+' where '+self._fields_id+'=%s and id <> ALL (%s)', (id,ids2))  # not_a_user_entry
+                ids3 = map(lambda x:x[0], cr.fetchall())
+                obj.write(cr, user, ids3, {self._fields_id:False}, context=context or {})
+            elif act[0] == 7:
+                # same a (4, id1), (4, id2), (4, id3) ... but with a single SQL query
+                if isinstance(act[1], (int, long)):
+                    act[1] = [act[1]]
+                cr.execute('update '+_table+' set '+self._fields_id+'=%s where id in %s', (id, tuple(act[1])))  # not_a_user_entry
 
         return result