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

[jftempo]

=== modified file 'bin/addons/base/rng/view.rng'
--- bin/addons/base/rng/view.rng	2020-02-28 11:04:39 +0000
+++ bin/addons/base/rng/view.rng	2020-08-05 12:54:43 +0000
@@ -596,6 +596,7 @@
             <rng:optional><rng:attribute name="help"/></rng:optional>
             <rng:optional><rng:attribute name="default_focus"/></rng:optional>
             <rng:optional><rng:attribute name="header"/></rng:optional>
+            <rng:optional><rng:attribute name="set_ids"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="form" />
 
=== modified file 'bin/addons/delivery_mechanism/delivery_mechanism.py'
--- bin/addons/delivery_mechanism/delivery_mechanism.py	2020-03-20 14:08:02 +0000
+++ bin/addons/delivery_mechanism/delivery_mechanism.py	2020-08-05 12:54:43 +0000
@@ -711,11 +711,13 @@
 
         return res
 
-    def do_incoming_shipment(self, cr, uid, wizard_ids, context=None):
+    def do_incoming_shipment(self, cr, uid, wizard_ids, shipment_ref=False, context=None, with_ppl=False):
         """
         Take the data in wizard_ids and lines of stock.incoming.processor and
         do the split of stock.move according to the data.
         """
+
+
         # Objects
         inc_proc_obj = self.pool.get('stock.incoming.processor')
         move_proc_obj = self.pool.get('stock.move.in.processor')
@@ -802,7 +804,7 @@
                 line = False
                 for line in move_proc_obj.browse(cr, uid, proc_ids, context=context):
                     values = self._get_values_from_line(cr, uid, move, line, db_data_dict, context=context)
-                    if context.get('do_not_process_incoming') and line.pack_info_id:
+                    if (sync_in or context.get('do_not_process_incoming')) and line.pack_info_id:
                         # we are processing auto import IN, we must register pack_info data
                         values['pack_info_id'] = line.pack_info_id.id
 
@@ -851,7 +853,7 @@
                     if out_values.get('location_dest_id', False):
                         out_values.pop('location_dest_id')
 
-                    if line.pack_info_id:
+                    if with_ppl and line.pack_info_id:
                         all_pack_info[line.pack_info_id.id] = True
                     remaining_out_qty = line.quantity
                     out_move = None
@@ -981,7 +983,16 @@
                             processed_out_moves_by_exp.setdefault(line.prodlot_id and line.prodlot_id.life_date or False, []).append(out_move.id)
                         else:
                             # Just update the data of the initial out move
-                            processed_qty = lst_out_move is out_moves[-1] and uom_partial_qty - minus_qty or out_move.product_qty
+                            if lst_out_move is out_moves[-1]:
+                                processed_qty = uom_partial_qty - minus_qty
+                                if processed_qty <= 0:
+                                    processed_qty = out_move.product_qty
+                                elif context.get('auto_import_ok'):
+                                    # IN pre-processing : do not add extra qty in OUT, it will be added later on IN processing
+                                    processed_qty = out_move.product_qty
+                            else:
+                                processed_qty = out_move.product_qty
+
                             out_values.update({
                                 'product_qty': processed_qty,
                                 'product_uom': line.uom_id.id,
@@ -1053,6 +1064,7 @@
                     })
 
                 backorder_id = False
+                backorder_ids = False
                 if context.get('for_dpo', False) and picking_dict['purchase_id']:
                     # Look for an available IN for the same purchase order in case of DPO
                     backorder_ids = self.search(cr, uid, [
@@ -1060,8 +1072,15 @@
                         ('in_dpo', '=', True),
                         ('state', '=', 'assigned'),
                     ], limit=1, context=context)
-                    if backorder_ids:
-                        backorder_id = backorder_ids[0]
+                elif sync_in and picking_dict['purchase_id'] and shipment_ref:
+                    backorder_ids = self.search(cr, uid, [
+                        ('purchase_id', '=', picking_dict['purchase_id'][0]),
+                        ('shipment_ref', '=', shipment_ref),
+                        ('state', '=', 'shipped'),
+                    ], limit=1, context=context)
+
+                if backorder_ids:
+                    backorder_id = backorder_ids[0]
 
                 backorder_name = picking_dict['name']
                 if not backorder_id:
 
=== modified file 'bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2020-07-02 15:09:34 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2020-08-05 12:54:43 +0000
@@ -245,7 +245,7 @@
             'context': context,
         }
 
-    def launch_import(self, cr, uid, ids, context=None):
+    def launch_import(self, cr, uid, ids, context=None, with_ppl=False):
         '''
         '''
         if context is None:
@@ -254,10 +254,10 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
-        return self._import(cr, uid, ids, context=context)
+        return self._import(cr, uid, ids, context=context, with_ppl=with_ppl)
 
     def launch_import_pack(self, cr, uid, ids, context=None):
-        return self.launch_import(cr, uid, ids, context)
+        return self.launch_import(cr, uid, ids, context, with_ppl=True)
 
     def populate(self, cr, uid, import_id, picking_id, context=None):
         if context is None:
@@ -519,6 +519,50 @@
 
         return values, nb_line, error
 
+    def error_pick_already_processed(self, cr, uid, sol_id_sum, sol_id_to_wiz_line, context):
+        if not sol_id_sum:
+            return ''
+        cr.execute('''
+                select m.sale_line_id, sum(m.product_qty)
+                from stock_move m, stock_picking p
+                where
+                    m.picking_id = p.id and
+                    p.type = 'out' and
+                    p.subtype = 'picking' and
+                    p.state = 'draft' and
+                    m.state in ('assigned', 'confirmed') and
+                    m.sale_line_id in %s
+                group by
+                    m.sale_line_id
+            ''', (tuple(sol_id_sum.keys()),))
+        extra_qty = {}
+        for x in cr.fetchall():
+            if x[1] < sol_id_sum[x[0]]:
+                extra_qty[x[0]] = sol_id_sum[x[0]] -  x[1]
+
+        already_process = {}
+        if extra_qty:
+            cr.execute('''
+                    select m.sale_line_id, sum(m.product_qty)
+                    from stock_move m, stock_picking p
+                    where
+                        m.picking_id = p.id and
+                        p.type = 'out' and
+                        p.state not in  ('draft', 'cancel') and
+                        m.sale_line_id in %s
+                    group by
+                        m.sale_line_id
+                ''', (tuple(extra_qty.keys()),))
+            for x in cr.fetchall():
+                already_process[x[0]] = x[1]
+
+        if already_process:
+            details = []
+            for sol in self.pool.get('sale.order.line').browse(cr, uid, already_process.keys(), fields_to_fetch=['product_id'], context=context):
+                details.append('Line number: %s, [%s] %s' % (sol_id_to_wiz_line.get(sol.id),sol.product_id.default_code, sol.product_id.name))
+            return _('Warning the following product lines have already been processed in linked OUT/Pick document, so cannot be processed here. Please remove these lines before trying to processs the movement\n%s') % ("\n".join(details))
+        return ''
+
     # Simulation routing
     def simulate(self, dbname, uid, ids, context=None):
         '''
@@ -966,6 +1010,27 @@
                                 err = _('Line %s of the Excel file: %s') % (file_line[0], err)
                                 values_line_errors.append(err)
 
+                if wiz.with_pack and not context.get('auto_import_ok'):
+                    # check if an out line has been forced
+                    cr.execute('''
+                        select wiz_line.line_number, pol.linked_sol_id, sum(wiz_line.imp_product_qty)
+                        from wizard_import_in_line_simulation_screen wiz_line
+                        left join wizard_import_in_simulation_screen wiz on wiz.id = wiz_line.simu_id
+                        left join stock_move move_in on move_in.picking_id = wiz.picking_id and move_in.line_number = wiz_line.line_number
+                        left join purchase_order_line pol on pol.id = move_in.purchase_line_id
+                        where
+                            (wiz_line.type_change in ('', 'split') or wiz_line.type_change is NULL) and
+                            wiz.id = %s
+                        group by wiz_line.line_number, pol.linked_sol_id
+                    ''', (wiz.id,))
+                    sol_id_to_wiz_line = {}
+                    sol_id_sum = {}
+                    for x in cr.fetchall():
+                        sol_id_to_wiz_line[x[1]] = x[0]
+                        sol_id_sum[x[1]] = x[2]
+                    error_pick = self.error_pick_already_processed(cr, uid, sol_id_sum, sol_id_to_wiz_line, context)
+                    if error_pick:
+                        values_line_errors.append(error_pick)
 
                 # Create new lines
                 for in_line in new_in_lines:
@@ -1049,7 +1114,7 @@
 
         return {'type': 'ir.actions.act_window_close'}
 
-    def _import_with_thread(self, cr, uid, partial_id, simu_id, context=None):
+    def _import_with_thread(self, cr, uid, partial_id, simu_id, context=None, with_ppl=False):
         inc_proc_obj = self.pool.get('stock.incoming.processor')
         in_proc_obj = self.pool.get('stock.move.in.processor')
         picking_obj = self.pool.get('stock.picking')
@@ -1063,7 +1128,7 @@
                         prodlot_id = self.pool.get('stock.production.lot')._get_prodlot_from_expiry_date(new_cr, uid, line.expiry_date, line.product_id.id, context=context)
                         in_proc_obj.write(new_cr, uid, [line.id], {'prodlot_id': prodlot_id}, context=context)
 
-            new_picking = picking_obj.do_incoming_shipment(new_cr, uid, partial_id, context=context)
+            new_picking = picking_obj.do_incoming_shipment(new_cr, uid, partial_id, context=context, with_ppl=with_ppl)
             if isinstance(new_picking, (int,long)):
                 context['new_picking'] = new_picking
             new_cr.commit()
@@ -1087,7 +1152,7 @@
         return True
 
 
-    def _import(self, cr, uid, ids, context=None):
+    def _import(self, cr, uid, ids, context=None, with_ppl=False):
         '''
         Create memeory moves and return to the standard incoming processing wizard
         '''
@@ -1122,9 +1187,9 @@
             cr.commit()
             if context.get('do_not_import_with_thread'):
                 # Auto VI IN import: do not process IN
-                self._import_with_thread(cr, uid, [partial_id], simu_id.id, context=context)
+                self._import_with_thread(cr, uid, [partial_id], simu_id.id, context=context, with_ppl=with_ppl)
             else:
-                new_thread = threading.Thread(target=self._import_with_thread, args=(cr, uid, [partial_id], simu_id.id, context))
+                new_thread = threading.Thread(target=self._import_with_thread, args=(cr, uid, [partial_id], simu_id.id, context, with_ppl))
                 new_thread.start()
                 new_thread.join(20)
                 if new_thread.isAlive():
@@ -1157,18 +1222,35 @@
     _name = 'wizard.import.in.pack.simulation.screen'
     _rec_name = 'parcel_from'
 
+    def _get_real_total(self, cr, uid, ids, f, a, context=None):
+        res = {}
+        for pack in self.browse(cr, uid, ids, context=context):
+            res[pack.id] = {'real_total_volume': False, 'real_total_weight': False}
+
+            if pack.parcel_to and pack.parcel_from:
+                nb_pack = pack.parcel_to - pack.parcel_from + 1
+                if pack.total_weight:
+                    res[pack.id]['real_total_weight'] = int(round(nb_pack * pack.total_weight, 0))
+                if pack.total_height and pack.total_length and pack.total_width:
+                    res[pack.id]['real_total_volume'] = int(round(pack.total_height * pack.total_length * pack.total_width * nb_pack / 1000, 0))
+        return res
+
     _columns = {
         'wizard_id': fields.many2one('wizard.import.in.simulation.screen', 'Simu Wizard'),
-        'parcel_from': fields.integer('Parcel From'),
-        'parcel_to': fields.integer('Parcel To'),
-        'parcel_qty': fields.integer('Parcel Qty'),
-        'total_weight': fields.float('Weight', digits=(16,2)),
-        'total_volume': fields.float('Volume', digits=(16,2)),
-        'total_height': fields.float('Height', digits=(16,2)),
-        'total_length': fields.float('Length', digits=(16,2)),
-        'total_width': fields.float('Width', digits=(16,2)),
+        'parcel_from': fields.integer_null('Parcel From'),
+        'parcel_to': fields.integer_null('Parcel To'),
+        'parcel_qty': fields.integer_null('Parcel Qty'),
+        # on IN VI import file the fields are named total_xxx but the figures are p.p
+        'total_weight': fields.float_null('Weight', digits=(16,2)),
+        'total_volume': fields.float_null('Volume', digits=(16,2)),
+        'total_height': fields.float_null('Height', digits=(16,2)),
+        'total_length': fields.float_null('Length', digits=(16,2)),
+        'total_width': fields.float_null('Width', digits=(16,2)),
         'packing_list': fields.char('Supplier Packing List', size=30),
+        'ppl_name': fields.char('Supplier Packing List', size=128),
         'integrity_status': fields.selection(string='Integrity Status', selection=PACK_INTEGRITY_STATUS_SELECTION, readonly=True),
+        'real_total_volume': fields.function(_get_real_total, method=True, type='integer_null', string='Total volume for all packs', multi='real_total'),
+        'real_total_weight': fields.function(_get_real_total, method=True, type='integer_null', string='Total weight for all packs', multi='real_total'),
     }
 
     _defaults = {
 
=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py'
--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2019-08-28 08:33:22 +0000
+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2020-08-05 12:54:43 +0000
@@ -125,10 +125,11 @@
             context = {}
 
         res = {}
-        for wiz in self.browse(cr, uid, ids, context=context):
+        for wiz in self.browse(cr, uid, ids, fields_to_fetch=['linked_to_out', 'picking_id'], context=context):
             res[wiz.id] = False
-            if wiz.picking_id and wiz.picking_id.state == 'updated' and wiz.linked_to_out:
-                res[wiz.id] = True
+            if wiz.picking_id and wiz.linked_to_out:
+                if not self.pool.get('stock.move.in.processor').search_exist(cr, uid, [('wizard_id', '=', wiz.id),('pack_info_id', '=', False)], context=context):
+                    res[wiz.id] = wiz.linked_to_out
 
         return res
 
@@ -158,7 +159,6 @@
 
         return res
 
-
     _columns = {
         'move_ids': fields.one2many(
             'stock.move.in.processor',
@@ -194,7 +194,7 @@
         ),
         'draft': fields.boolean('Draft'),
         'already_processed': fields.boolean('Already processed'),
-        'linked_to_out': fields.boolean('Is this IN linked to a single Pick (same FO) ?'),
+        'linked_to_out': fields.char('If the IN is linked to a single Pick (same FO) give the type of delivery doc (standard / picking)', size=16),
         'register_a_claim': fields.boolean(
             string='Register a Claim to Supplier',
         ),
@@ -218,8 +218,10 @@
         'claim_description': fields.text(
             string='Claim Description',
         ),
-        'display_process_to_ship_button': fields.function(_get_display_process_to_ship_button, method=True, type='boolean', string='Process to ship'),
+        'display_process_to_ship_button': fields.function(_get_display_process_to_ship_button, method=True, type='char', string='Process to ship'),
         'location_dest_active_ok': fields.function(_get_location_dest_active_ok, method=True, type='boolean', string='Dest location is inactive ?', store=False),
+        'fields_as_ro': fields.boolean('Set Cost/Split .. as RO', internal=True),
+        'sequence_issue': fields.boolean('Issue with To ship'),
     }
 
     _defaults = {
@@ -248,17 +250,33 @@
         picking = picking_obj.browse(cr, uid, vals.get('picking_id'), context=context)
 
         cr.execute("""
-            select so.id from
+            select so.id, array_agg(distinct(out.name)), count(distinct(so.procurement_request)) from
             stock_move m
             left join stock_picking p on m.picking_id = p.id
             left join purchase_order_line pol on m.purchase_line_id = pol.id
             left join sale_order_line sol on sol.id = pol.linked_sol_id
             left join sale_order so on so.id = sol.order_id
-            where m.picking_id = %s and so.procurement_request = 'f' and coalesce(p.claim, 'f') = 'f'
+            left join stock_picking out on out.sale_id = so.id and out.type = 'out' and (out.subtype = 'picking' and out.state='draft' or out.subtype = 'standard' and out.state in ('draft', 'confirmed', 'assigned'))
+            where
+                m.picking_id = %s and
+                coalesce(p.claim, 'f') = 'f'
             group by so.id
             """, (vals.get('picking_id'), ))
         if cr.rowcount == 1:
-            vals['linked_to_out'] = True
+            fetch_data = cr.fetchone()
+            if fetch_data[2] > 1:
+                # IN mixed with FO/IR
+                vals['linked_to_out'] = False
+
+            out_names = fetch_data[1]
+            out_type = False
+            for out_name in out_names:
+                if out_name and out_name.startswith('OUT/'):
+                    out_type = out_name
+                    break
+            if not out_type:
+                out_type = out_names and len(out_names) == 1 and out_names[0] and out_names[0].startswith('PICK/') and 'picking' or False
+            vals['linked_to_out'] = out_type
         else:
             vals['linked_to_out'] = False
 
@@ -623,8 +641,18 @@
 
 
     def launch_simulation_pack(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        if not context.get('auto_import_ok'):
+            out = self.read(cr, uid, ids[0], ['linked_to_out'], context=context)
+            if out['linked_to_out'] != 'picking':
+                raise osv.except_osv(_('Warning'), _('This type of import cannot be used because related PICK document has been converted to %s') % out['linked_to_out'])
+
         data = self.launch_simulation(cr, uid, ids, context)
         self.pool.get('wizard.import.in.simulation.screen').write(cr, uid, data['res_id'], {'with_pack': True})
+
+
         data['name'] = _('Incoming shipment simulation screen (pick and pack mode)')
 
         file_attached = self.check_if_has_import_file_in_attachment(cr, uid, ids, context=context)
@@ -634,7 +662,8 @@
                 'filetype': self.pool.get('stock.picking').get_import_filetype(cr, uid, file_attached['name'], context=context),
             }, context=context)
             self.pool.get('wizard.import.in.simulation.screen').launch_simulate(cr, uid, data['res_id'], context=context)
-            self.pool.get('wizard.import.in.simulation.screen').launch_import_pack(cr, uid, data['res_id'], context=context)
+            # the following line process the IN but display the simu screen
+            #self.pool.get('wizard.import.in.simulation.screen').launch_import_pack(cr, uid, data['res_id'], context=context)
         return data
 
 
@@ -657,11 +686,6 @@
                 if num_of_packs:
                     if not self.pool.get('ppl.processor')._check_rounding(cr, uid, move.uom_id, num_of_packs, move.quantity, context=context):
                         rounding_issues.append(move.line_number)
-            if move.integrity_status and move.integrity_status != 'empty':
-                raise osv.except_osv(
-                    _('Error'),
-                    _('Please correct red lines before processing')
-                )
 
         if not total_qty:
             raise osv.except_osv(
@@ -731,10 +755,35 @@
         if isinstance(ids, (int,long)):
             ids = [ids]
 
+        out = self.read(cr, uid, ids[0], ['linked_to_out'], context=context)
+        if out['linked_to_out'] != 'picking':
+            raise osv.except_osv(_('Warning'), _('This type of import cannot be used because related PICK document has been converted to %s') % out['linked_to_out'])
+
         rounding_issues, sequence_ok = self.check_before_creating_pack_lines(cr, uid, ids, context=context)
+        cr.execute('''
+            select wiz_line.line_number, pol.linked_sol_id, sum(wiz_line.quantity)
+            from stock_move_in_processor wiz_line
+            left join stock_incoming_processor wiz on wiz.id = wiz_line.wizard_id
+            left join stock_move move_in on move_in.picking_id = wiz.picking_id and move_in.line_number = wiz_line.line_number
+            left join purchase_order_line pol on pol.id = move_in.purchase_line_id
+            where
+                wiz.id = %s
+            group by wiz_line.line_number, pol.linked_sol_id
+        ''', (ids[0],))
+        sol_id_to_wiz_line = {}
+        sol_id_sum = {}
+        for x in cr.fetchall():
+            sol_id_to_wiz_line[x[1]] = x[0]
+            sol_id_sum[x[1]] = x[2]
+
+        error_pick = self.pool.get('wizard.import.in.simulation.screen').error_pick_already_processed(cr, uid, sol_id_sum, sol_id_to_wiz_line, context)
+        if error_pick:
+            raise osv.except_osv(_('Error'), error_pick)
 
         if not sequence_ok:
             view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'msf_outgoing', 'stock_incoming_processor_form_view')[1]
+            self.write(cr, uid, ids, {'sequence_issue': True}, context=context)
+
             return {
                 'name': _('Products to Process'),
                 'type': 'ir.actions.act_window',
@@ -765,7 +814,8 @@
                 'context': context,
             }
 
-        return self.do_process_to_ship(cr, uid, ids, context=context)
+        self.pool.get('stock.picking').do_incoming_shipment(cr, uid, ids, context=context, with_ppl=True)
+        return {'type': 'ir.actions.act_window_close'}
 
 
     def do_process_to_ship(self, cr, uid, ids, context=None):
@@ -851,6 +901,7 @@
     _name = 'stock.move.in.processor'
     _inherit = 'stock.move.processor'
     _description = 'Wizard lines for incoming shipment processing'
+    _order = 'line_number, from_pack, id'
 
     def _get_move_info(self, cr, uid, ids, field_name, args, context=None):
         return super(stock_move_in_processor, self)._get_move_info(cr, uid, ids, field_name, args, context=context)
@@ -958,6 +1009,31 @@
             cr.execute(sql, (value, ml_id))
         return True
 
+    def _get_pack_info(self, cr, uid, ids, field_name, args, context=None):
+        if context is None:
+            context = {}
+        if isinstance(ids, (int,long)):
+            ids = [ids]
+
+        res = {}
+        for wiz in self.browse(cr, uid, ids, fields_to_fetch=['from_pack', 'to_pack'], context=context):
+            if wiz['from_pack']:
+                res[wiz.id] = '%s-%s' % (wiz['from_pack'], wiz['to_pack'])
+            else:
+                res[wiz.id] = False
+        return res
+
+    def _search_pack_info(self, cr, uid, obj, name, args, context):
+        dom = []
+        for arg in args:
+            if arg[2]:
+                d_p = arg[2].split('-')
+                if d_p and d_p[0] and d_p[0].strip():
+                    dom = [('from_pack', '=', d_p[0].strip())]
+                if d_p and len(d_p)>1 and d_p[1] and d_p[1].strip():
+                    dom.append(('to_pack', '=', d_p[1].strip()))
+        return dom
+
     _columns = {
         # Parent wizard
         'wizard_id': fields.many2one(
@@ -1184,17 +1260,21 @@
             help="Ticked if the product is a Controlled Substance",
         ),
         'pack_info_id': fields.many2one('wizard.import.in.pack.simulation.screen', 'Pack Info'),
-        'from_pack': fields.integer(string='From p.'),
-        'to_pack': fields.integer(string='To p.'),
-        'weight': fields.float('Weight', digits=(16,2)),
-        'volume': fields.float('Volume', digits=(16,2)),
-        'height': fields.float('Height', digits=(16,2)),
-        'length': fields.float('Length', digits=(16,2)),
-        'width': fields.float('Width', digits=(16,2)),
+        'from_pack': fields.integer_null(string='From p.'),
+        'to_pack': fields.integer_null(string='To p.'),
+        'weight': fields.float_null('Weight', digits=(16,2)),
+        'volume': fields.float_null('Volume', digits=(16,2)),
+        'height': fields.float_null('Height', digits=(16,2)),
+        'total_volume': fields.float_null(u'Total Volume [dm³]', digits=(16,0)),
+        'total_weight': fields.float_null(u'Total Weight [kg]', digits=(16,0)),
+        'length': fields.float_null('Length', digits=(16,2)),
+        'width': fields.float_null('Width', digits=(16,2)),
         'pack_id': fields.many2one('in.family.processor', string='Pack', ondelete='set null'),
         'packing_list': fields.char('Supplier Packing List', size=30),
+        'ppl_name': fields.char('Packing List', size=128),
         'sequence_issue': fields.selection(PACK_INTEGRITY_STATUS_SELECTION, 'Sequence issue', readonly=True),
         'split_move_ok': fields.boolean(string='Is split move ?'),
+        'filter_pack': fields.function(_get_pack_info, method=True, type='char', string='Pack', fnct_search=_search_pack_info),
     }
 
 
@@ -1217,13 +1297,21 @@
         if context is None:
             context = {}
 
+        if not vals.get('cost'):
+            # issue on IN processor from sync if new line created (because of a split in coordo)
+            # then the price_unit should not come from product standard_price but from the original stock.move (i.e: from POL)
+            # before this the unit price was temporary set to the standard_price, but changed on IN processing, this was too late
+            if vals.get('move_id'):
+                move_data = self.pool.get('stock.move').browse(cr, uid, vals['move_id'], fields_to_fetch=['price_unit', 'currency_id'], context=context)
+                vals['cost'] = move_data.price_unit
+                vals['currency'] = move_data.currency_id.id
+
         if vals.get('product_id', False):
             if not vals.get('cost', False):
                 price = product_obj.browse(cr, uid, vals['product_id'], context=context).standard_price
                 vals['cost'] = price
             if not vals.get('currency', False):
                 vals['currency'] = user_obj.browse(cr, uid, uid, context=context).company_id.currency_id.id
-
         return super(stock_move_in_processor, self).create(cr, uid, vals, context=context)
 
 
 
=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml'
--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml	2019-08-28 08:33:22 +0000
+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml	2020-08-05 12:54:43 +0000
@@ -12,11 +12,13 @@
                     <field name="linked_to_out"  invisible="1"/>
                     <field name="picking_id" invisible="1" />
                     <field name="display_process_to_ship_button" invisible="1" />
-                    <button name="copy_all" type="object" icon="gtk-jump-to" colspan="2" string="Copy all" />
-                    <button name="uncopy_all" type="object" icon="gtk-undo" colspan="2" string="Clear all" />
+                    <field name="sequence_issue" invisible="1" />
+                    <field name="fields_as_ro" invisible="1" />
+                    <button name="copy_all" type="object" icon="gtk-jump-to" colspan="2" string="Copy all" set_ids="move_ids"/>
+                    <button name="uncopy_all" type="object" icon="gtk-undo" colspan="2" string="Clear all" set_ids="move_ids"/>
                     <group name="import_file_lines" string="Import Lines" colspan="4">
                         <button name="launch_simulation" string="Import IN" icon="gtk-execute" colspan="1" type="object" />
-                        <button name="launch_simulation_pack" string="Import IN, process IN &amp; pick and pack" icon="gtk-execute" colspan="1" type="object" attrs="{'invisible': [('linked_to_out', '!=', True)]}"/>
+                        <button name="launch_simulation_pack" string="Import IN, process IN &amp; pick and pack" icon="gtk-execute" colspan="1" type="object" attrs="{'invisible': [('linked_to_out', '=', False)]}"/>
                     </group>
                     <field name="contains_dg" invisible="1" />
                     <field name="contains_kc" invisible="1" />
@@ -49,6 +51,15 @@
                             </p>
                         </html>
                     </group>
+                    <group colspan="4" attrs="{'invisible': [('sequence_issue', '=', False)]}">
+                        <html>
+                            <p style="text-align: center; v-align: middle;color:#f27d0c; font-weight:bold; font-size:1.2em">
+                                    <img src="/openerp/static/images/stock/gtk-dialog-warning.png" height="12" width="12" />
+                                        <span><translate>Please correct red lines before processing or do not process to ship</translate></span>
+                                    <img src="/openerp/static/images/stock/gtk-dialog-warning.png" height="12" width="12" />
+                            </p>
+                        </html>
+                    </group>
                     <separator colspan="4" string="Move lines" />
                     <field name="move_ids" mode="tree" context="{'display_process_to_ship_button': display_process_to_ship_button}"
                         colspan="4" nolabel="1" />
@@ -88,7 +99,7 @@
                         <button name="do_incoming_shipment" type="object" string="Process" icon="gtk-go-forward" attrs="{'invisible': [('location_dest_active_ok', '!=', True)]}" />
                         <button name="do_incoming_shipment" type="object" string="Process" icon="gtk-go-forward" attrs="{'invisible': [('location_dest_active_ok', '!=', False)]}"
                             confirm="Warning the final destination location of these goods is no longer active, IN will be processed as normal but please check and process the Internal move created after manually. Continue ?" />
-                        <button name="process_to_ship" attrs="{'invisible': [('display_process_to_ship_button', '!=', True)]}" type="object" string="Process to ship" icon="gtk-goto-last" />
+                        <button name="process_to_ship" attrs="{'invisible': ['|', ('display_process_to_ship_button', '=', False), ('register_a_claim', '=', True)]}" type="object" string="Process to ship" icon="gtk-goto-last" />
                     </group>
                 </form>
             </field>
@@ -129,6 +140,7 @@
                     hide_delete_button="1"
                     hide_new_button="1"
                     colors="red:integrity_status!='empty'"
+                    editable_style="new"
                     >
                     <!-- Invisible fields -->
                     <field name="type_check" invisible="1" />
@@ -146,6 +158,7 @@
                         type="object"
                         icon="gtk-convert"
                         string="Change Product"
+                        attrs="{'invisible': [('fields_as_ro', '=', True)]}"
                         />
                     <field name="asset_id"
                         domain="[('product_id', '=', product_id)]"
@@ -164,14 +177,20 @@
                     <field name="uom_id"
                         domain="[('category_id', '=', ordered_uom_category)]"
                         on_change="onchange_uom_qty(uom_id, quantity)"
+                        attrs="{'readonly': [('fields_as_ro', '=', True)]}"
                         />
-                    <field name="from_pack" on_change="onchange_from_pack_to_pack()" invisible="not context.get('display_process_to_ship_button')" />
-                    <field name="to_pack" on_change="onchange_from_pack_to_pack()" invisible="not context.get('display_process_to_ship_button')" />
-                    <field name="packing_list" on_change="onchange_from_pack_to_pack()" invisible="not context.get('display_process_to_ship_button')" />
+                    <field name="from_pack" readonly="1" />
+                    <field name="to_pack" readonly="1" />
+                    <field name="filter_pack" filter_selector="1" invisible="1" />
+                    <field name="total_volume" readonly="1" />
+                    <field name="total_weight" readonly="1" />
+                    <field name="ppl_name" readonly="1" filter_selector="1" />
+                    <field name="packing_list" readonly="1" filter_selector="1" />
                     <button name="open_split_wizard"
                         type="object"
                         icon="terp-stock_effects-object-colorize"
                         string="Split"
+                        attrs="{'invisible': [('fields_as_ro', '=', True)]}"
                         />
                     <field name="prodlot_id"
                         domain="[('product_id', '=', product_id), ('check_type', '=', True)]"
@@ -187,7 +206,7 @@
                     <field name="kc_check" widget="null_boolean" />
                     <field name="dg_check" widget="null_boolean" />
                     <field name="np_check" widget="null_boolean" />
-                    <field name="cost" />
+                    <field name="cost" attrs="{'readonly': [('fields_as_ro', '=', True)]}" />
                     <field name="currency" />
                     <field name="integrity_status" string="" />
                 </tree>
 
=== modified file 'bin/addons/msf_outgoing/wizard/picking_processor.py'
--- bin/addons/msf_outgoing/wizard/picking_processor.py	2018-11-07 14:53:50 +0000
+++ bin/addons/msf_outgoing/wizard/picking_processor.py	2020-08-05 12:54:43 +0000
@@ -144,6 +144,21 @@
                 _('No wizard found !'),
             )
 
+        if self._name == 'stock.incoming.processor':
+            line_obj = self.pool.get('stock.move.in.processor')
+            dom = context.get('selected_domain', [])
+            if dom:
+                dom = ['&', ('wizard_id', '=', ids[0])] + dom
+            else:
+                dom = [('wizard_id', '=', ids[0])]
+            lines_ids = line_obj.search(cr, uid, dom, context=context)
+            for move in line_obj.browse(cr, uid, lines_ids, context=context):
+                line_obj.write(cr, uid, [move.id], {'quantity': move.ordered_quantity}, context=context)
+            return {
+                'type': 'ir.actions.refresh_o2m',
+                'o2m_refresh': 'move_ids'
+            }
+
         for wizard in self.browse(cr, uid, ids, context=context):
             for move in wizard.move_ids:
                 self.pool.get(move._name).write(cr, uid, [move.id], {'quantity': move.ordered_quantity}, context=context)
@@ -173,6 +188,21 @@
                 _('No wizard found !'),
             )
 
+        if self._name == 'stock.incoming.processor':
+            line_obj = self.pool.get('stock.move.in.processor')
+            dom = context.get('selected_domain', [])
+            if dom:
+                dom = ['&', ('wizard_id', '=', ids[0])] + dom
+            else:
+                dom = [('wizard_id', '=', ids[0])]
+            lines_ids = line_obj.search(cr, uid, dom, context=context)
+            for move in line_obj.browse(cr, uid, lines_ids, context=context):
+                line_obj.write(cr, uid, [move.id], {'quantity': 0}, context=context)
+            return {
+                'type': 'ir.actions.refresh_o2m',
+                'o2m_refresh': 'move_ids'
+            }
+
         for wizard in self.browse(cr, uid, ids, context=context):
             move_obj = wizard.move_ids[0]._name
             move_ids = [x.id for x in wizard.move_ids]
@@ -218,13 +248,17 @@
                         'from_pack': move.pack_info_id.parcel_from,
                         'to_pack': move.pack_info_id.parcel_to,
                         'weight': move.pack_info_id.total_weight,
+                        'total_weight': move.pack_info_id.real_total_weight,
                         'volume': move.pack_info_id.total_volume,
+                        'total_volume': move.pack_info_id.real_total_volume,
                         'height': move.pack_info_id.total_height,
                         'length': move.pack_info_id.total_length,
                         'width': move.pack_info_id.total_width,
                         'packing_list': move.pack_info_id.packing_list,
+                        'ppl_name': move.pack_info_id.ppl_name,
                         'cost': move.price_unit,
                         'currency': move.currency_id.id,
+                        'pack_info_id': move.pack_info_id.id,
                     })
                 line_obj.create(cr, uid, line_data, context=context)
 
@@ -1060,6 +1094,7 @@
             'nodestroy': True,
             'target': 'new',
             'res_id': split_wiz_id,
+            'keep_open': 1,
             'context': context,
         }
 
 
=== modified file 'bin/addons/msf_outgoing/wizard/split_move_processor.py'
--- bin/addons/msf_outgoing/wizard/split_move_processor.py	2019-04-09 08:05:03 +0000
+++ bin/addons/msf_outgoing/wizard/split_move_processor.py	2020-08-05 12:54:43 +0000
@@ -83,6 +83,11 @@
                 return {
                     'type': 'ir.actions.act_window_close'
                 }
+            elif wiz['processor_type'] == 'stock.move.in.processor':
+                return {
+                    'type': 'ir.actions.refresh_popupo2m',
+                    'o2m_refresh': 'move_ids'
+                }
             line_model = self.pool.get(wiz['processor_type'])
             line = line_model.browse(cr, uid, wiz['processor_line_id'], context=context)
             res_model = line_model._columns['wizard_id']._obj
 
=== modified file 'bin/addons/msf_printed_documents/report/report_reception.py'
--- bin/addons/msf_printed_documents/report/report_reception.py	2020-07-29 16:14:59 +0000
+++ bin/addons/msf_printed_documents/report/report_reception.py	2020-08-05 12:54:43 +0000
@@ -32,7 +32,7 @@
             'time': time,
             'getState': self.getState,
             'enumerate': enumerate,
-            'get_lines': self.get_lines,
+            'get_lines_by_packing': self.get_lines_by_packing,
             'getDateCreation': self.getDateCreation,
             'getNbItem': self.getNbItem,
             'check': self.check,
@@ -215,10 +215,16 @@
             actual_receipt_date = time.strftime('%d/%m/%Y', time.strptime(o.date_done, '%Y-%m-%d %H:%M:%S'))
         return actual_receipt_date
 
-    def get_lines(self, o):
-        return o.move_lines
-
-
+    def get_lines_by_packing(self, o):
+        pack_info = {}
+        for line in o.move_lines:
+            pack_info.setdefault(line.pack_info_id or False, []).append(line)
+
+<<<<<<< TREE
+
+=======
+        return sorted(pack_info.items(), key=lambda x: x[0] and (x[0].ppl_name, x[0].packing_list, x[0].parcel_from))
+>>>>>>> MERGE-SOURCE
 report_sxw.report_sxw('report.msf.report_reception_in', 'stock.picking', 'addons/msf_printed_documents/report/report_reception.rml', parser=report_reception, header=False)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'bin/addons/msf_printed_documents/report/report_reception.rml'
--- bin/addons/msf_printed_documents/report/report_reception.rml	2020-06-18 15:56:24 +0000
+++ bin/addons/msf_printed_documents/report/report_reception.rml	2020-08-05 12:54:43 +0000
@@ -106,7 +106,7 @@
         <blockTableStyle id="OrderInformations2">
             <blockAlignment value="CENTER" />
             <blockVAlign value="CENTER" />
-            <blockBackground colorName="silver" start="0,6" stop="0,6" />
+            <blockBackground colorName="silver" start="0,7" stop="0,7" />
             <lineStyle kind="GRID" colorName="#000000" start="0,6" stop="-1,-1" thickness="0.5"/>
             <blockTopPadding value="0"   />
             <blockBottomPadding value="0" />
@@ -121,6 +121,20 @@
             <lineStyle kind="LINEBEFORE" colorName="black"  start="2,0" thickness="0.5" />
         </blockTableStyle>
 
+        <blockTableStyle id="PackingList">
+            <blockAlignment value="CENTER" />
+            <blockValign value="MIDDLE" />
+            <blockTopPadding value="10" />
+            <blockBottomPadding value="0" />
+            <blockBackground colorName="silver" start="0,0" stop="0,0" />
+            <blockBackground colorName="silver" start="2,0" stop="2,0" />
+            <blockBackground colorName="silver" start="4,0" stop="4,0" />
+            <blockBackground colorName="silver" start="6,0" stop="6,0" />
+            <blockBackground colorName="silver" start="8,0" stop="8,0" />
+            <blockBackground colorName="silver" start="10,0" stop="10,0" />
+            <lineStyle kind="LINEBEFORE" colorName="black"  start="0,0" thickness="0.5" />
+        </blockTableStyle>
+
         <blockTableStyle id="OrderInformations4">
             <blockValign value="MIDDLE" />
             <lineStyle kind="INNERGRID" colorName="#000000" thickness="0.5" />
@@ -410,7 +424,9 @@
             <tr><td></td></tr>
         </blockTable>
 
-        <blockTable colWidths="800.0" style="OrderInformations2" repeatRows="7">
+<section>
+  [[ repeatIn(get_lines_by_packing(objects[0]), 'pack') ]]
+        <blockTable colWidths="800.0" style="OrderInformations2" repeatRows="8">
 
             <tr><td></td></tr>
             <tr>
@@ -476,23 +492,72 @@
 
                 </td>
             </tr>
+            <tr>
+                <td>
+                    <blockTable colWidths="60,80,100,70,60,30,50,40,90,75,91,54" style="PackingList">
+                        <tr>
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">Packing List</para>
+                                </td>
+
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">[[ pack[0].ppl_name ]]</para>
+
+                                </td>
+
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">Supplier Packing List</para>
+                                </td>
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">[[ pack[0].packing_list ]]</para>
+                                </td>
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">From parcel</para>
+                                </td>
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">[[ pack[0].parcel_from or '' ]]</para>
+                                </td>
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">To parcel</para>
+                                </td>
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">[[ pack[0].parcel_to or '' ]]</para>
+                                </td>
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">Total volume</para>
+                                </td>
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">[[ pack[0].real_total_volume and u'%s dm³'%pack[0].real_total_volume or '' ]]</para>
+                                </td>
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">Total weight</para>
+                                </td>
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">[[ pack[0].real_total_weight and '%s kg'%pack[0].real_total_weight or '' ]]</para>
+                                </td>
+                        </tr>
+                    </blockTable>
+
+
+                </td>
+            </tr>
 
             <tr>
                 <td>
                     <blockTable colWidths="30,370,50,40,50,40,75,53,20,18,18,18,18" style="OrderInformations3">
                         <tr>
                                 <td>
-                                    <para style="TextInformation4" alignment="CENTER">Item</para>
+                                    <para style="TextInformation4" alignment="CENTER">Item</para> <!-- 30 -->
                                 </td>
 
                                 <td>
                                 <blockTable colWidths="110,260" style="OrderInformations4">
                                     <tr>
                                         <td>
-                                            <para style="TextInformation" alignment="LEFT">Code</para>
+                                            <para style="TextInformation" alignment="LEFT">Code</para> <!-- 110 -->
                                         </td>
                                         <td>
-                                            <para style="TextInformation" alignment="LEFT">Description</para>
+                                            <para style="TextInformation" alignment="LEFT">Description</para> <!-- 260 -->
                                         </td>
                                     </tr>
                                     <tr>
@@ -508,37 +573,37 @@
                                 </td>
 
                                 <td>
-                                    <para style="TextInformation5" alignment="CENTER">Qty confirmed</para>
-                                </td>
-                                <td>
-                                    <para style="TextInformation5" alignment="CENTER">Unit of Measure</para>
-                                </td>
-                                <td>
-                                    <para style="TextInformation5" alignment="CENTER">Qty backorder</para>
-                                </td>
-                                <td>
-                                    <para style="TextInformation5" alignment="CENTER">Qty received</para>
-                                </td>
-                                <td>
-                                    <para style="TextInformation5" alignment="CENTER">Batch / Serial number</para>
-                                </td>
-                                <td>
-                                    <para style="TextInformation5" alignment="CENTER">Expiry date</para>
-                                </td>
-                                <td>
-                                    <para style="TextInformation4" alignment="CENTER">ED</para>
-                                </td>
-                                <td>
-                                    <para style="TextInformation4" alignment="CENTER">BM</para>
-                                </td>
-                                <td>
-                                    <para style="TextInformation4" alignment="CENTER">KC</para>
-                                </td>
-                                <td>
-                                    <para style="TextInformation4" alignment="CENTER">DG</para>
-                                </td>
-                                <td>
-                                    <para style="TextInformation4" alignment="CENTER">CS</para>
+                                    <para style="TextInformation5" alignment="CENTER">Qty confirmed</para> <!-- 50 -->
+                                </td>
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">Unit of Measure</para> <!-- 40 -->
+                                </td>
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">Qty backorder</para> <!-- 50 -->
+                                </td>
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">Qty received</para> <!-- 40 -->
+                                </td>
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">Batch / Serial number</para> <!-- 75 -->
+                                </td>
+                                <td>
+                                    <para style="TextInformation5" alignment="CENTER">Expiry date</para> <!-- 53 -->
+                                </td>
+                                <td>
+                                    <para style="TextInformation4" alignment="CENTER">ED</para> <!-- 20 -->
+                                </td>
+                                <td>
+                                    <para style="TextInformation4" alignment="CENTER">BM</para> <!-- 18 -->
+                                </td>
+                                <td>
+                                    <para style="TextInformation4" alignment="CENTER">KC</para> <!-- 18 -->
+                                </td>
+                                <td>
+                                    <para style="TextInformation4" alignment="CENTER">DG</para> <!-- 18 -->
+                                </td>
+                                <td>
+                                    <para style="TextInformation4" alignment="CENTER">CS</para> <!-- 18 -->
                                 </td>
                         </tr>
                     </blockTable>
@@ -552,7 +617,7 @@
 
 
             <tr>
-            [[ repeatIn(get_lines(objects[0]), 'line') ]]
+            [[ repeatIn(pack[1], 'line') ]]
                 <td>
                     <blockTable colWidths="30,370,50,40,50,40,75,53,20,18,18,18,18" style="OrderInformations3">
                         <tr>
@@ -622,6 +687,7 @@
             </tr>
 
         </blockTable>
+</section>
 
         <blockTable colWidths="800.0" style="OrderInformationsRien" >
             <tr>
 
=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2020-06-09 09:58:28 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2020-08-05 12:54:43 +0000
@@ -8,7 +8,11 @@
 msf_sync_data_server.pol_create_sol,TRUE,TRUE,"['sync_local_id', 'order_id/name','product_id/id', 'product_id/name', 'name', 'state', 'product_qty', 'product_uom', 'price_unit', 'analytic_distribution_id/id','comment','have_analytic_distribution_from_header','line_number', 'nomen_manda_0/id','nomen_manda_1/id','nomen_manda_2/id','nomen_manda_3/id', 'nomenclature_description','notes','default_name','default_code','is_line_split','date_planned', 'stock_take_date', 'ir_name_for_sync']","[('sync_linked_sol', '=', False), ('order_id.partner_type', 'not in',['external','esc']), ('state', 'in', ['validated', 'confirmed', 'done']), ('order_id.state', 'not in', ['draft', 'draft_p', 'cancel'])]",partner_id,MISSION,sale.order.line.create_so_line,purchase.order.line,PO line creates FO line,11,,Valid
 msf_sync_data_server.sol_updates_pol,TRUE,TRUE,"['resourced_original_line/id', 'resourced_original_remote_line','sync_sourced_origin', 'sync_local_id', 'sync_linked_pol', 'order_id/name', 'product_id/id', 'product_id/name', 'name', 'state','product_uom_qty', 'product_uom', 'price_unit', 'in_name_goods_return', 'analytic_distribution_id/id','comment','have_analytic_distribution_from_header','line_number', 'nomen_manda_0/id','nomen_manda_1/id','nomen_manda_2/id','nomen_manda_3/id', 'nomenclature_description','notes','default_name','default_code','date_planned','is_line_split', 'original_line_id/id', 'confirmed_delivery_date', 'stock_take_date', 'cancel_split_ok', 'modification_comment', 'from_cancel_out', 'pol_external_ref']","[('order_id.partner_type', '!=', 'external'), ('state', '!=', 'draft'), ('product_uom_qty', '!=', 0.0), '!', '&', ('order_id.fo_created_by_po_sync', '=', False), ('order_id.state', '=', 'draft')]",partner_id,MISSION,purchase.order.line.sol_update_original_pol,sale.order.line,FO line updates PO line,12,"[('order_id.state', 'in', ['draft', 'draft_p']), ('order_id.partner_type', 'not in', ['external', 'esc']), ('order_id.client_order_ref', '=', False)]",Valid
 msf_sync_data_server.pol_update_date_expected,TRUE,TRUE,"['sync_local_id', 'sync_linked_pol']","[('id', '=', 0)]",partner_id,MISSION,purchase.order.line.update_date_expected,sale.order.line,Update IN expected date,55,,Valid
+<<<<<<< TREE
 msf_sync_data_server.partial_shipped_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'claim', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_id/default_code', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/prodlot_id/type', 'move_lines/prodlot_id/comment', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/usage', 'move_lines/comment', 'move_lines/sale_line_id/id', 'move_lines/sale_line_id/in_name_goods_return', 'sale_id/claim_name_goods_return', 'sale_id/client_order_ref']","['&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['standard', 'packing']), ('state', 'in', ['done', 'delivered']), ('already_shipped', '=', True), ('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19,,Valid
+=======
+msf_sync_data_server.partial_shipped_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'previous_step_id/name', 'state', 'origin', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'claim', 'packing_list', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_id/default_code', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/prodlot_id/type', 'move_lines/prodlot_id/comment', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/usage', 'move_lines/comment', 'move_lines/sale_line_id/id', 'move_lines/sale_line_id/in_name_goods_return', 'move_lines/from_pack', 'move_lines/to_pack', 'move_lines/weight', 'move_lines/height', 'move_lines/length', 'move_lines/width',  'sale_id/claim_name_goods_return', 'sale_id/client_order_ref']","['&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['standard', 'packing']), ('state', '=', 'done'), ('already_shipped', '=', True), ('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19,,Valid
+>>>>>>> MERGE-SOURCE
 msf_sync_data_server.moves_from_dpo_closed_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'subtype', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_id/default_code', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/prodlot_id/type', 'move_lines/prodlot_id/comment', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/dpo_line_id', 'move_lines/comment']","['&', '&', '&', ('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['picking', 'standard']), ('dpo_out', '=', True)]",partner_id,MISSION,stock.picking.partial_shippped_dpo_updates_in_po,stock.picking,Moves from DPO closed at Coordo updates IN at Project,20,,Valid
 msf_sync_data_server.dpo_service_lines_update_in_at_project,FALSE,TRUE,"['order_id/name', 'order_id/delivery_confirmed_date', 'sync_local_id', 'origin', 'confirmed_delivery_date', 'name', 'product_uom/id', 'product_uom/name', 'link_sol_id/line_number', 'notes', 'product_qty', 'product_id/name', 'product_id/id', 'product_id/default_code', 'comment']","[('dest_partner_id.partner_type', '=', 'internal'), ('order_id.order_type', '=', 'direct'), ('order_id.state', 'in', ['approved', 'done']), ('product_id.type', 'in', ['service', 'service_recep'])]",dest_partner_id,MISSION,purchase.order.line.confirmed_dpo_service_lines_update_in_po,purchase.order.line,DPO service lines update IN at Project,21,,Valid
 msf_sync_data_server.closed_in_validates_delivery_out_ship,TRUE,TRUE,"['name', 'state', 'shipment_ref']","['&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'in'),('subtype', 'in', ['standard']), ('state', '=', 'done'), ('shipment_ref', '!=', False), ('dpo_incoming', '=', False)]",partner_id,MISSION,stock.picking.closed_in_validates_delivery_out_ship,stock.picking,Closed IN validates delivery of OUT-SHIP,26,,Valid
 
=== modified file 'bin/addons/order_types/stock.py'
--- bin/addons/order_types/stock.py	2019-09-18 14:06:52 +0000
+++ bin/addons/order_types/stock.py	2020-08-05 12:54:43 +0000
@@ -210,8 +210,10 @@
         self._check_restriction_line(cr, uid, ids, context=context)
 
         certif = False
+        from_esc = False
         for pick in self.browse(cr, uid, ids, context=context):
             if pick.type in ['in', 'out']:
+                from_esc = pick.partner_id.partner_type == 'esc' and pick.state == 'updated'
                 if not context.get('yesorno', False) :
                     for move in pick.move_lines:
                         if move.order_type in ['donation_exp', 'donation_st', 'in_kind']:
@@ -256,7 +258,10 @@
                 if wiz_ids:
                     proc_id = wiz_ids[0]
                 else:
-                    proc_id = wizard_obj.create(cr, uid, {'picking_id': pick.id})
+                    write_data = {'picking_id': pick.id}
+                    if from_esc:
+                        write_data['fields_as_ro'] = True
+                    proc_id = wizard_obj.create(cr, uid, write_data)
                 wizard_obj.create_lines(cr, uid, proc_id, context=context)
 
                 res = {
 
=== modified file 'bin/addons/sync_client/message.py'
--- bin/addons/sync_client/message.py	2019-12-02 17:32:44 +0000
+++ bin/addons/sync_client/message.py	2020-08-05 12:54:43 +0000
@@ -261,21 +261,32 @@
         ignored_ids = list(set(obj_ids_temp) - set(obj_ids))
         dest = self.pool.get(rule.model).get_destination_name(cr, uid, obj_ids, rule.destination_name, context=context)
         args = {}
-        for obj_id in obj_ids:
-            if initial == False: # default action
-                args[obj_id] = self.pool.get(rule.model).get_message_arguments(cr, uid, obj_id, rule, context=context)
-            else: # UF-2483: fake RW sync on creation of the RW instance
-                args[obj_id] = "Initial RW Sync - Ignore"
-
         generated_ids = []
-        for id in obj_ids:
-            for destination in (dest[id] if hasattr(dest[id], '__iter__') else [dest[id]]):
-                # UF-2531: allow this when creating usb msg for the INT from scratch from RW to CP
-                if destination is False:
-                    destination = 'fake'
-                # UF-2483: By default the "sent" parameter is False
-                self.create_message(cr, uid, identifiers[id], rule.remote_call, args[id], destination, initial, context)
-            generated_ids.append(id)
+
+
+        if obj_ids and rule.model == 'stock.picking' and rule.remote_call in ('stock.picking.partial_shipped_fo_updates_in_po', 'stock.picking.partial_shippped_dpo_updates_in_po'):
+            cr.execute("select array_agg(id) from stock_picking where id in %s group by subtype, partner_id, origin, claim, coalesce(shipment_id, id)", (tuple(obj_ids),))
+            for picks in cr.fetchall():
+                arg = self.pool.get('stock.picking').get_message_arguments(cr, uid, picks[0], rule, context=context)
+                first_id = picks[0][0]
+                self.create_message(cr, uid, identifiers[first_id], rule.remote_call, arg, dest[first_id], initial, context)
+                generated_ids += picks[0]
+        else:
+            for obj_id in obj_ids:
+                if initial == False: # default action
+                    args[obj_id] = self.pool.get(rule.model).get_message_arguments(cr, uid, obj_id, rule, context=context)
+                else: # UF-2483: fake RW sync on creation of the RW instance
+                    args[obj_id] = "Initial RW Sync - Ignore"
+
+
+            for id in obj_ids:
+                for destination in (dest[id] if hasattr(dest[id], '__iter__') else [dest[id]]):
+                    # UF-2531: allow this when creating usb msg for the INT from scratch from RW to CP
+                    if destination is False:
+                        destination = 'fake'
+                    # UF-2483: By default the "sent" parameter is False
+                    self.create_message(cr, uid, identifiers[id], rule.remote_call, args[id], destination, initial, context)
+                generated_ids.append(id)
 
         return generated_ids, ignored_ids
 
 
=== modified file 'bin/addons/sync_client/orm.py'
--- bin/addons/sync_client/orm.py	2020-01-03 13:16:16 +0000
+++ bin/addons/sync_client/orm.py	2020-08-05 12:54:43 +0000
@@ -804,7 +804,9 @@
         """
         rule_dest_field = rule.destination_name
         fields = eval(rule.arguments)
-        res =  self.export_data_json(cr, uid, [res_id], fields, destination=destination, rule_dest_field=rule_dest_field, context=context)
+        if isinstance(res_id, (int, long)):
+            res_id = [res_id]
+        res =  self.export_data_json(cr, uid, res_id, fields, destination=destination, rule_dest_field=rule_dest_field, context=context)
         return res['datas']
 
     def export_data_json(self, cr, uid, ids, fields_to_export, destination=False, rule_dest_field=False, context=None):
 
=== modified file 'bin/addons/sync_so/picking.py'
--- bin/addons/sync_so/picking.py	2019-10-29 09:27:27 +0000
+++ bin/addons/sync_so/picking.py	2020-08-05 12:54:43 +0000
@@ -27,6 +27,7 @@
 
 from sync_common import xmlid_to_sdref
 from sync_client import get_sale_purchase_logger
+from sync_client.message import dict_to_obj
 
 from tools.translate import _
 
@@ -155,68 +156,79 @@
         dpo_line_id = data.get('dpo_line_id', False)
 
         # build a dic which can be used directly to update the stock move
-        result = {'line_number': data['line_number'],
-                  'product_id': product_id,
-                  'product_uom': uom_id,
-                  'product_uos': uom_id,
-                  'uom_id': uom_id,
-                  'date': data['date'],
-                  'date_expected': data['date_expected'],
-                  'state': state,
-
-                  'original_qty_partial': data['original_qty_partial'],  # UTP-972
-
-                  'prodlot_id': batch_id,
-                  'expired_date': expired_date,
-
-                  'dpo_line_id': dpo_line_id,
-                  'sync_dpo': dpo_line_id and True or False,
-
-                  'asset_id': asset_id,
-                  'change_reason': data['change_reason'] or None,
-                  'name': data['name'],
-                  'quantity': data['product_qty'] or 0.0,
-                  'note': data['note'],
-                  'comment': data.get('comment'),
-                  'sale_line_id': data.get('sale_line_id', False) and data['sale_line_id'].get('id', False) or False,
-                  }
+        result = {
+            'line_number': data['line_number'],
+            'product_id': product_id,
+            'product_uom': uom_id,
+            'product_uos': uom_id,
+            'uom_id': uom_id,
+            'date': data['date'],
+            'date_expected': data['date_expected'],
+            'state': state,
+
+            'original_qty_partial': data['original_qty_partial'],  # UTP-972
+
+            'prodlot_id': batch_id,
+            'expired_date': expired_date,
+
+            'dpo_line_id': dpo_line_id,
+            'sync_dpo': dpo_line_id and True or False,
+
+            'asset_id': asset_id,
+            'change_reason': data['change_reason'] or None,
+            'name': data['name'],
+            'quantity': data['product_qty'] or 0.0,
+            'note': data['note'],
+            'comment': data.get('comment'),
+            'sale_line_id': data.get('sale_line_id', False) and data['sale_line_id'].get('id', False) or False,
+
+        }
+        for k in ['from_pack', 'to_pack', 'weight', 'height', 'length', 'width']:
+            result[k] = data.get(k)
         return result
 
-    def package_data_update_in(self, cr, uid, source, out_info, context=None):
+    def package_data_update_in(self, cr, uid, source, pick_dict, context=None):
         '''
         package the data to get info concerning already processed or not
         '''
         result = {}
-        if out_info.get('move_lines', False):
-            for line in out_info['move_lines']:
-                # Don't get the returned pack lines
-                if line.get('location_dest_id', {}).get('usage', 'customer') == 'customer':
-                    # aggregate according to line number
-                    line_dic = result.setdefault(line.get('line_number'), {})
-                    # set the data
-                    line_dic.setdefault('data', []).append(self.format_data(cr, uid, line, source, context=context))
-                    # set the flag to know if the data has already been processed (partially or completely) in Out side
-                    line_dic.update({'out_processed':  line_dic.setdefault('out_processed', False) or line['processed_stock_move']})
+        for out_info_dict_to_obj in pick_dict:
+            out_info = out_info_dict_to_obj.to_dict()
+            if out_info.get('move_lines', False):
+                for line in out_info['move_lines']:
+                    # Don't get the returned pack lines
+                    if line.get('location_dest_id', {}).get('usage', 'customer') == 'customer':
+                        # aggregate according to line number
+                        line_dic = result.setdefault(line.get('line_number'), {})
+                        # set the data
+                        line_dic.setdefault('data', []).append(self.format_data(cr, uid, line, source, context=context))
+                        # set the flag to know if the data has already been processed (partially or completely) in Out side
+                        line_dic.update({'out_processed':  line_dic.setdefault('out_processed', False) or line['processed_stock_move']})
+                        line_dic['data'][-1].update({'packing_list': out_info.get('packing_list'), 'ppl_name': out_info.get('previous_step_id') and out_info.get('previous_step_id').get('name') or out_info.get('name')})
 
 
         return result
 
-    def picking_data_update_in(self, cr, uid, source, out_info, context=None):
+    def picking_data_update_in(self, cr, uid, source, pick_info, context=None):
         '''
         If data come from a stock move (DPO), re-arrange data to match with partial_shipped_fo_updates_in_po method
         '''
-        result = {}
-
-        for key in out_info.keys():
-            if key != 'move_lines':
-                result[key] = out_info.get(key)
-
-        if out_info.get('subtype', False) in ('standard', 'picking') and out_info.get('move_lines', False):
-            for line in out_info['move_lines']:
-                # Don't get the lines without dpo_line_id
-                if line.get('dpo_line_id', False):
-                    result.setdefault('move_lines', [])
-                    result['move_lines'].append(line)
+        result = []
+
+        for data in pick_info:
+            out_info = data.to_dict()
+            res = {}
+            for key in out_info.keys():
+                if key != 'move_lines':
+                    res[key] = out_info.get(key)
+
+            if out_info.get('subtype', False) in ('standard', 'picking') and out_info.get('move_lines', False):
+                for line in out_info['move_lines']:
+                    # Don't get the lines without dpo_line_id
+                    if line.get('dpo_line_id', False):
+                        res.setdefault('move_lines', [])
+                        res['move_lines'].append(line)
+            result.append(dict_to_obj(res))
 
         return result
 
@@ -241,12 +253,14 @@
         if not found:
             already_shipped_moves.append({move_id: quantity})
 
-    def partial_shipped_fo_updates_in_po(self, cr, uid, source, out_info, context=None):
+    def partial_shipped_fo_updates_in_po(self, cr, uid, source, *pick_info, **kwargs):
         '''
         ' This sync method is used for updating the IN of Project side when the OUT/PICK at Coordo side became done.
         ' In partial shipment/OUT, when the last shipment/OUT is made, the original IN will become Available Shipped, no new IN will
         ' be created, as the whole quantiy of the IN is delivered (but not yet received at Project side)
         '''
+
+        context = kwargs.get('context')
         move_proc = self.pool.get('stock.move.in.processor')
         if context is None:
             context = {}
@@ -256,13 +270,13 @@
         # Load common data (mainly for reason type) into context
         self.pool.get('data.tools').load_common_data(cr, uid, [], context=context)
 
-        if not isinstance(out_info, dict):
-            pick_dict = out_info.to_dict()
-        else:
-            pick_dict = out_info
+        #if not isinstance(out_info, dict):
+        #    pick_dict = out_info.to_dict()
+        #else:
+        #    pick_dict = out_info
 
         if context.get('for_dpo'):
-            pick_dict = self.picking_data_update_in(cr, uid, source, pick_dict, context=context)
+            self.picking_data_update_in(cr, uid, source, pick_info, context=context)
             #US-1352: Reset this flag immediately, otherwise it will impact on other normal shipments!
             context.update({'for_dpo': False})
 
@@ -275,8 +289,9 @@
         warehouse_obj = self.pool.get('stock.warehouse')
 
         # package data
-        pack_data = self.package_data_update_in(cr, uid, source, pick_dict, context=context)
+        pack_data = self.package_data_update_in(cr, uid, source, pick_info, context=context)
         # Look for the PO name, which has the reference to the FO on Coordo as source.out_info.origin
+        pick_dict = pick_info[0].to_dict()
         so_ref = source + "." + pick_dict['origin']
         po_id = so_po_common.get_po_id_by_so_ref(cr, uid, so_ref, context)
         # prepare the shipment/OUT reference to update to IN
@@ -295,6 +310,7 @@
                 if po_ids:
                     po_id = po_ids[0]
 
+
         if not po_id and not pick_dict.get('claim', False):
             # UF-1830: Check if the PO exist, if not, and in restore mode, send a warning and create a message to remove the ref on the partner document
             if context.get('restore_flag'):
@@ -362,6 +378,9 @@
 
             in_id = self.create(cr, uid, in_claim_dict, context=context)
 
+        pack_info_obj = self.pool.get('wizard.import.in.pack.simulation.screen')
+        pack_info_created = {}
+
         if in_id:
             in_name = self.read(cr, uid, in_id, ['name'], context=context)['name']
             in_processor = self.pool.get('stock.incoming.processor').create(cr, uid, {'picking_id': in_id}, context=context)
@@ -377,6 +396,20 @@
                 already_shipped_moves = []
                 # get the corresponding picking line ids
                 for data in line_data['data']:
+                    if data.get('from_pack') and data.get('to_pack'):
+                        pack_key = '%s-%s-%s' % (data.get('from_pack'), data.get('to_pack'), data.get('ppl_name'))
+                        if pack_key not in pack_info_created:
+                            pack_info_created[pack_key] = pack_info_obj.create(cr, uid, {
+                                'parcel_from': data['from_pack'],
+                                'parcel_to': data['to_pack'],
+                                'total_weight': data['weight'],
+                                'total_height': data['height'],
+                                'total_length': data['length'],
+                                'total_width': data['width'],
+                                'packing_list': data.get('packing_list'),
+                                'ppl_name': data.get('ppl_name'),
+                            })
+                        data['pack_info_id'] = pack_info_created[pack_key]
                     ln = data.get('line_number')
                     # UF-2148: if the line contains 0 qty, just ignore it!
                     qty = data.get('quantity', 0)
@@ -453,7 +486,7 @@
                                 self._logger.info(message)
                                 raise Exception(message)
 
-                    move_id = False # REF-99: declare the variable before using it, otherwise if it go to else, then line 268 "if not move_id" -> problem!
+                    move_id = False
                     if move_ids and len(move_ids) == 1:  # if there is only one move, take it for process
                         move_id = move_ids[0]
                     else:  # if there are more than 1 moves, then pick the next one not existing in the partial_datas[in_id]
@@ -525,7 +558,7 @@
                     self._add_to_shipped_moves(already_shipped_moves, move_id, data['quantity'])
 
             # for the last Shipment of an FO, no new INcoming shipment will be created --> same value as in_id
-            new_picking = self.do_incoming_shipment(cr, uid, in_processor, context)
+            new_picking = self.do_incoming_shipment(cr, uid, in_processor, shipment_ref=shipment_ref, context=context)
 
             # Set the backorder reference to the IN !!!! THIS NEEDS TO BE CHECKED WITH SUPPLY PM!
             if new_picking != in_id:
 
=== modified file 'bin/report/report_sxw.py'
--- bin/report/report_sxw.py	2020-06-18 15:56:24 +0000
+++ bin/report/report_sxw.py	2020-08-05 12:54:43 +0000
@@ -176,8 +176,10 @@
 
 _fields_process = {
     'float': _float_format,
+    'float_null': _float_format,
     'date': _date_format,
     'integer': _int_format,
+    'integer_null': _int_format,
     'datetime' : _dttime_format
 }