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

[jftempo]

=== modified file 'bin/addons/msf_config_locations/stock_configuration.py'
--- bin/addons/msf_config_locations/stock_configuration.py	2018-11-22 15:40:32 +0000
+++ bin/addons/msf_config_locations/stock_configuration.py	2018-11-30 11:24:44 +0000
@@ -839,26 +839,34 @@
         Returns all stock.picking containing a stock move not done from/to the location
         '''
         location = False
-        picking_ids = []
+        picking_ids = set()
 
         for wizard in self.browse(cr, uid, ids, context=context):
             location = wizard.location_id
 
+        sys_int_po_ids = set()
         move_ids = self.pool.get('stock.move').search(cr, uid, [('state', 'not in', ['done', 'cancel']), '|', ('location_id', '=', location.id), ('location_dest_id', '=', location.id)])
         for move in self.pool.get('stock.move').browse(cr, uid, move_ids, context=context):
-            if move.picking_id and move.picking_id.id not in picking_ids:
-                picking_ids.append(move.picking_id.id)
-
-        view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'vpicktree')[1]
+            if move.picking_id.subtype == 'sysint' and move.picking_id.purchase_id:
+                sys_int_po_ids.add(move.picking_id.purchase_id.id)
+            elif move.picking_id and move.picking_id.id not in picking_ids:
+                picking_ids.add(move.picking_id.id)
+
+        if sys_int_po_ids:
+            in_ids = self.pool.get('stock.picking').search(cr, uid, [('purchase_id', 'in', list(sys_int_po_ids)), ('state', 'not in', ['done', 'cancel']), ('type', '=', 'in')], context=context)
+            picking_ids.update(in_ids)
+
+        view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'genericpick')[1]
         if location.usage == 'customer':
             view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'view_picking_out_tree')[1]
 
         return {'type': 'ir.actions.act_window',
                 'res_model': 'stock.picking',
-                'domain': [('id', 'in', picking_ids)],
+                'domain': [('id', 'in', list(picking_ids))],
                 'view_id': [view_id],
                 'view_type': 'form',
-                'view_mode': 'tree,form',
+                'view_mode': 'tree',
+                'name': _('Moves'),
                 'target': 'current',
                 }
 

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-11-26 17:05:18 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-11-30 11:24:44 +0000
@@ -67908,6 +67908,7 @@
 #: field:stock.incoming.processor,move_ids:0
 #: field:stock.picking.processor,move_ids:0
 #: view:stock.reserved.products:0
+#: view:stock.picking:0
 msgid "Moves"
 msgstr "Mouvements"
 

=== modified file 'bin/addons/stock/stock.py'
--- bin/addons/stock/stock.py	2018-11-09 14:06:04 +0000
+++ bin/addons/stock/stock.py	2018-11-30 11:24:44 +0000
@@ -748,8 +748,17 @@
             'claim_name': '',
             'from_manage_expired': False,
         })
-        picking_obj = self.read(cr, uid, id, ['name', 'type'], context=context)
+
+        fields_to_read = ['name', 'type']
+
+        if not context.get('keep_prodlot'):
+            fields_to_read += ['move_lines']
+
+        picking_obj = self.read(cr, uid, id, fields_to_read, context=context)
         move_obj = self.pool.get('stock.move')
+
+        if not context.get('keep_prodlot') and picking_obj.get('move_lines') and not context.get('allow_copy'):
+            move_obj._check_locations_active(cr, uid, picking_obj['move_lines'], context=context)
         if ('name' not in default) or (picking_obj['name'] == '/'):
             seq_obj_name =  ''.join(('stock.picking.', picking_obj['type']))
             default['name'] = self.pool.get('ir.sequence').get(cr, uid, seq_obj_name)

=== modified file 'bin/addons/stock/stock_view.xml'
--- bin/addons/stock/stock_view.xml	2018-11-07 14:06:24 +0000
+++ bin/addons/stock/stock_view.xml	2018-11-30 11:24:44 +0000
@@ -693,6 +693,23 @@
                 </calendar>
             </field>
         </record>
+        <record id="genericpick" model="ir.ui.view">
+            <field name="name">stock.picking.tree</field>
+            <field name="model">stock.picking</field>
+            <field name="type">tree</field>
+            <field eval="50" name="priority"/>
+            <field name="arch" type="xml">
+                <tree string="Moves">
+                    <field name="name"/>
+                    <field name="backorder_id" />
+                    <field name="origin"/>
+                    <field name="reason_type_id"/>
+                    <field name="date"/>
+                    <field name="min_date"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
         <record id="vpicktree" model="ir.ui.view">
             <field name="name">stock.picking.tree</field>
             <field name="model">stock.picking</field>

=== modified file 'bin/addons/stock_override/stock.py'
--- bin/addons/stock_override/stock.py	2018-11-21 10:31:26 +0000
+++ bin/addons/stock_override/stock.py	2018-11-30 11:24:44 +0000
@@ -1635,10 +1635,7 @@
             other_type_id = data_obj.get_object_reference(cr, uid, 'reason_types_moves', 'reason_type_other')[1]
             pick_obj.write(cr, uid, [picking['id']], {'reason_type_id': other_type_id}, context=context)
 
-        new_id = super(stock_move, self).create(cr, uid, vals, context=context)
-
-        self._check_locations_active(cr, uid, [new_id], context=context)
-        return new_id
+        return super(stock_move, self).create(cr, uid, vals, context=context)
 
     def _check_locations_active(self, cr, uid, ids, context=None):
         if isinstance(ids, (int, long)):