Merge lp:~mallorymarcot/unifield-server/us-4659 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2018-06-06 15:18:03 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2018-06-13 08:06:55 +0000
@@ -1715,6 +1715,7 @@
                     'expiry_date': line.imp_exp_date,
                     'line_number': line.line_number,
                     'move_id': move.id,
+                    'split_move_ok': line.type_change == 'split',
                     'prodlot_id': batch_id,
                     'product_id': line.imp_product_id.id,
                     'uom_id': line.imp_uom_id.id,
 
=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2018-06-07 15:44:40 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2018-06-13 08:06:55 +0000
@@ -1671,7 +1671,7 @@
                             'confirmed_delivery_date': line.imp_dcd or False,
                             'esc_confirmed': True if line.imp_dcd else False,
                         })
-                        if context.get('auto_import_ok'):
+                        if context.get('auto_import_ok') and line.parent_line_id.po_line_id.analytic_distribution_id:
                             line_vals.update({
                                 'analytic_distribution_id': self.pool.get('analytic.distribution').copy(cr, uid, line.parent_line_id.po_line_id.analytic_distribution_id.id, {}, context=context),
                             })
 
=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py'
--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2018-05-29 13:24:45 +0000
+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2018-06-13 08:06:55 +0000
@@ -743,16 +743,13 @@
                 total_length = 0.0
                 total_width = 0.0
                 for move in self.pool.get('stock.move.in.processor').browse(cr, uid, move_ids, context=context):
-                    total_weight += move.weight
-                    total_height += move.height
-                    total_length += move.length
-                    total_width += move.width
-                family_data.update({
-                    'weight': total_weight,
-                    'height': total_height,
-                    'length': total_length,
-                    'width': total_width,
-                })
+                    family_data.update({
+                        'weight': move.weight,
+                        'height': move.height,
+                        'length': move.length,
+                        'width': move.width,
+                    })
+                    break
 
                 fam_id = self.pool.get('in.family.processor').create(cr, uid, family_data, context=context)
                 if move_ids:
@@ -1197,7 +1194,14 @@
         'width': fields.float('Width', digits=(16,2)),
         'pack_id': fields.many2one('in.family.processor', string='Pack', ondelete='set null'),
         'sequence_issue': fields.selection(INTEGRITY_STATUS_SELECTION, 'Sequence issue', readonly=True),
-    }
+        'split_move_ok': fields.boolean(string='Is split move ?'),
+    }
+
+
+    _defaults = {
+        'split_move_ok': lambda *a: False,
+    }
+
 
     """
     Model methods
 
=== modified file 'bin/addons/msf_outgoing/wizard/picking_processor.py'
--- bin/addons/msf_outgoing/wizard/picking_processor.py	2018-05-22 12:37:31 +0000
+++ bin/addons/msf_outgoing/wizard/picking_processor.py	2018-06-13 08:06:55 +0000
@@ -212,6 +212,43 @@
                 if line_obj._name == 'stock.move.in.processor':
                     # search for simulation done for this move, and if has pack info attached
                     sm_in_proc = line_obj.search(cr, uid, [('move_id', '=', move.id)], order='id desc', context=context)
+
+                    link_data = {}
+                    if not sm_in_proc:
+                        # search stock.incoming.processor for the move.picking_id
+                        if move.purchase_line_id.id:
+                            stock_move_ids = self.pool.get('stock.move').search(cr, uid, [('purchase_line_id', '=', move.purchase_line_id.id)], context=context)
+                            picking_ids = [data['picking_id'][0] for data in self.pool.get('stock.move').read(cr, uid, stock_move_ids, ['picking_id']) if data['picking_id']]
+                            picking_ids = list(set(picking_ids))
+
+                            for in_proc_id in self.pool.get('stock.incoming.processor').search(cr, uid, [('picking_id', 'in', picking_ids)], order='id desc', context=context):
+                                # search for stock.move.in.processor with same wizard_id and line_number and with split_move_ok flag on
+                                sm_in_proc = line_obj.search(cr, uid, [
+                                    ('wizard_id', '=', in_proc_id), 
+                                    ('line_number', '=', move.line_number),
+                                    ('split_move_ok', '=', False),
+                                    ('pack_info_id', '!=', False),
+                                ], order='id asc', context=context)
+                                if sm_in_proc and context.get('picking_type') == 'incoming_shipment':
+                                    link_data = {'move_id': move.id}
+                                    break
+
+                        if not sm_in_proc and context.get('picking_type') == 'incoming_shipment' and move.picking_id and move.picking_id.origin:
+                            # search backorder
+                            picking_ids = self.pool.get('stock.picking').search(cr, uid, [('origin', '=', move.picking_id.origin), ('id', '!=', move.picking_id.id)])
+
+                            for in_proc_id in self.pool.get('stock.incoming.processor').search(cr, uid, [('picking_id', 'in', picking_ids)], order='id desc', context=context):
+                                # search for stock.move.in.processor with same wizard_id and line_number and with split_move_ok flag on
+                                sm_in_proc = line_obj.search(cr, uid, [
+                                    ('wizard_id', '=', in_proc_id), 
+                                    ('line_number', '=', move.line_number),
+                                    ('split_move_ok', '=', False),
+                                    ('pack_info_id', '!=', False),
+                                ], order='id asc', context=context)
+                                if sm_in_proc and context.get('picking_type') == 'incoming_shipment':
+                                    link_data = {'move_id': move.id}
+                                    break
+
                     for sm_in_proc in line_obj.browse(cr, uid, sm_in_proc, context=context):
                         if sm_in_proc.pack_info_id:
                             line_data.update({
@@ -222,7 +259,10 @@
                                 'height': sm_in_proc.pack_info_id.total_height,
                                 'length': sm_in_proc.pack_info_id.total_length,
                                 'width': sm_in_proc.pack_info_id.total_width,
+                                'cost': sm_in_proc.cost,
                             })
+                            if link_data:
+                                line_obj.write(cr, uid, [sm_in_proc.id], link_data, context=context)
                             break
                 line_obj.create(cr, uid, line_data, context=context)