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

[jftempo]

=== modified file 'bin/addons/msf_homere_interface/hr.py'
--- bin/addons/msf_homere_interface/hr.py	2017-10-27 12:04:12 +0000
+++ bin/addons/msf_homere_interface/hr.py	2018-04-19 14:23:11 +0000
@@ -116,6 +116,27 @@
         'ex_allow_edition': lambda *a: True,
     }
 
+    def _set_sync_update_as_run(self, cr, uid, data, sdref, context=None):
+        if not data.get('identification_id') or not data.get('name'):
+            return False
+
+        employee_name = data['name'].strip()
+        existing_id = self.find_sd_ref(cr, uid, sdref)
+        if not existing_id:
+            # never run, but exists with the same id and name => ignore
+            if self.search_exist(cr, uid, [('identification_id', '=', data['identification_id']), ('name', '=', employee_name)]):
+                return True
+
+        else:
+            same_ids = self.search(cr, uid, [('identification_id', '=', data['identification_id']), ('name', '=', employee_name)])
+            if same_ids and existing_id not in same_ids:
+                # Run on the instance but has a different Employee ID (identification_id) than on the one run on the instance
+                return True
+
+        return False
+
+
+
     def _check_unicity(self, cr, uid, ids, context=None):
         """
         Check that identification_id is not used yet.
 
=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2018-04-03 12:31:40 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2018-04-19 14:23:11 +0000
@@ -3365,6 +3365,7 @@
             picking = wizard.picking_id
             new_picking_id = False
             processed_moves = []
+            new_split_move = {}
             move_data = {}
             for line in wizard.move_ids:
                 move = line.move_id
@@ -3376,6 +3377,7 @@
                     move_data.setdefault(move.id, {
                         'original_qty': move.product_qty,
                         'processed_qty': 0.00,
+                        'total_qty': move.product_qty,
                     })
 
                 if line.quantity <= 0.00:
@@ -3421,10 +3423,15 @@
                     # Create a new move
                     new_move_id = move_obj.copy(cr, uid, move.id, values, context=context)
                     processed_moves.append(new_move_id)
+                    new_split_move[new_move_id] = True
+
                     # Update the original move
+
+                    # here we can't use move.product_qty bc this value is bowser_record cached on not flush with the following write
+                    move_data[move.id]['total_qty'] -= quantity
                     wr_vals = {
-                        'product_qty': move.product_qty - quantity,
-                        'product_uos_qty': move.product_qty - quantity,
+                        'product_qty': move_data[move.id]['total_qty'],
+                        'product_uos_qty': move_data[move.id]['total_qty'],
                     }
                     move_obj.write(cr, uid, [move.id], wr_vals, context=context)
                 else:
@@ -3447,7 +3454,7 @@
             # If not, create a backorder
             need_new_picking = False
             for move in picking.move_lines:
-                if move.state not in ('done', 'cancel') and (not move_data.get(move.id, False) or \
+                if not new_split_move.get(move.id) and move.state not in ('done', 'cancel') and (not move_data.get(move.id, False) or \
                                                              move_data[move.id]['original_qty'] != move_data[move.id]['processed_qty']):
                     need_new_picking = True
                     break
 
=== modified file 'bin/addons/sync_client/update.py'
--- bin/addons/sync_client/update.py	2017-09-19 12:24:09 +0000
+++ bin/addons/sync_client/update.py	2018-04-19 14:23:11 +0000
@@ -572,16 +572,24 @@
                     row = [row[i] for i in range(len(import_fields)) if i not in bad_fields]
 
                 if result['res']: #US-852: if everything is Ok, then do import as normal
-                    values.append(row)
-                    update_ids.append(update.id)
-                    versions.append( (update.sdref, update.version) )
+                    if obj._name == 'hr.employee' and obj._set_sync_update_as_run(cr, uid, dict(zip(import_fields, row)), update.sdref, context=context):
+                        self.write(cr, uid, update.id, {
+                            'run': True,
+                            'editable': False,
+                            'execution_date': datetime.now(),
+                            'log': 'Set as Run because this employee already exists in the instance',
+                        })
+                    else:
+                        values.append(row)
+                        update_ids.append(update.id)
+                        versions.append( (update.sdref, update.version) )
 
-                    #1 conflict detection
-                    if self._conflict(cr, uid, update.sdref, update.version, context=context):
-                        #2 if conflict => manage conflict according rules : report conflict and how it's solve
-                        index_id = eval(update.fields).index('id')
-                        sd_ref = eval(update.values)[index_id]
-                        logs[update.id] = "Warning: Conflict detected! in content: (%s, %r)" % (update.id, sd_ref)
+                        #1 conflict detection
+                        if self._conflict(cr, uid, update.sdref, update.version, context=context):
+                            #2 if conflict => manage conflict according rules : report conflict and how it's solve
+                            index_id = eval(update.fields).index('id')
+                            sd_ref = eval(update.values)[index_id]
+                            logs[update.id] = "Warning: Conflict detected! in content: (%s, %r)" % (update.id, sd_ref)
                 else: #US-852: if account_move_line is missing then ignore the import, and set it as not run
                     self._set_not_run(cr, uid, [update.id],
                                       log=result['error_message'],
@@ -911,7 +919,7 @@
                 except ValueError:
                     try:
                         #US-852: if account_move_line is given, then cannot use the fallback value, but exit the import!
-                        # THIS FIX COULD ALSO OPEN FOR OTHER BUG, BUT CHECK IF THE RULES THAT CONTAIN THE OBJECT (HERE account_move_line) 
+                        # THIS FIX COULD ALSO OPEN FOR OTHER BUG, BUT CHECK IF THE RULES THAT CONTAIN THE OBJECT (HERE account_move_line)
                         if 'account_move_line' in xmlid:
                             m, sep, sdref = xmlid.partition('.')
                             if self.search(cr, uid, [('sdref', '=', sdref), ('run', '=', False)], order='NO_ORDER', context=context):