Merge lp:~unifield-team/unifield-server/us-1359 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2017-01-31 10:50:12 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2017-02-06 11:06:51 +0000
@@ -4717,6 +4717,37 @@
 
         return res
 
+    def _get_pick_shipment_id(self, cr, uid, ids, field_name, args, context=None):
+        """
+        Link the shipment where a stock move is to this stock move
+        """
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        if context is None:
+            context = {}
+
+        res = {}
+        for move in self.browse(cr, uid, ids, context=context):
+            res[move.id] = False
+            if move.picking_id and move.picking_id.shipment_id:
+                res[move.id] = move.picking_id.shipment_id.id
+
+        return res
+
+    def _get_picking(self, cr, uid, ids, context=None):
+        """
+        Return the list of stock.move to update
+        """
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        if context is None:
+            context = {}
+
+        picking_ids = self.pool.get('stock.picking').search(cr, uid, [('id', 'in', ids), ('shipment_id', '!=', False)], order='NO_ORDER', context=context)
+        return self.pool.get('stock.move').search(cr, uid, [('picking_id', '=', picking_ids)], order='NO_ORDER', context=context)
+
     _columns = {'from_pack': fields.integer(string='From p.'),
                 'to_pack': fields.integer(string='To p.'),
                 'pack_type': fields.many2one('pack.type', string='Pack Type'),
@@ -4743,6 +4774,17 @@
                 'sale_order_line_number': fields.function(_vals_get,
                                                           method=True, type='integer', string='Sale Order Line Number',
                                                           multi='get_vals_integer',),  # old_multi get_vals
+                'pick_shipment_id': fields.function(
+                    _get_pick_shipment_id,
+                    method=True,
+                    type='many2one',
+                    relation='shipment',
+                    string='Shipment',
+                    store={
+                        'stock.move': (lambda obj, cr, uid, ids, c={}: ids, ['picking_id'], 10),
+                        'stock.picking': (_get_picking, ['shipment_id'], 10),
+                    }
+                ),  
                 # Fields used for domain
                 'location_virtual_id': fields.many2one('stock.location', string='Virtual location'),
                 'location_output_id': fields.many2one('stock.location', string='Output location'),

=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
--- bin/addons/msf_outgoing/msf_outgoing_view.xml	2017-01-16 14:20:41 +0000
+++ bin/addons/msf_outgoing/msf_outgoing_view.xml	2017-02-06 11:06:51 +0000
@@ -1397,6 +1397,7 @@
 						<separator orientation="vertical"/>
 						<field name="name"/>
 						<field name="partner_id2" />
+                                                <field name="picking_ids" />
 					</group>
 					<newline/>
 					<group expand="0" string="Group By..." colspan="4" col="8">
@@ -1450,6 +1451,7 @@
                 <tree string="Closed shipped lines" editable="top" noteditable="1" hide_delete_button="1" hide_new_button="1" colors="red: not_shipped">
                     <field name="origin"/>
                     <field name="picking_id" string="Pack"/>
+                    <field name="pick_shipment_id" string="Shipment" />
                     <field name="line_number"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
@@ -1472,6 +1474,7 @@
 				<search string="Shipment">
                     <field name="name"/>
                     <field name="picking_id" string="Pack" domain="[('already_shipped','=',True), ('shipment_id','!=',False)]"/>
+                    <field name="pick_shipment_id" string="Shipment" />
                     <field name="origin"/>
                     <field name="prodlot_id"/>
                     <field name="asset_id"/>

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2017-01-31 16:17:06 +0000
+++ bin/addons/msf_profile/data/patches.xml	2017-02-06 11:06:51 +0000
@@ -158,5 +158,9 @@
         <record id="us_1721_dates_on_products" model="patch.scripts">
             <field name="method">us_1721_dates_on_products</field>
         </record>
+
+        <record id="us_1359_update_move_shipment" model="patch.scripts">
+            <field name="method">us_1359_update_move_shipment</field>
+        </record>
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-01-31 16:17:06 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-02-06 11:06:51 +0000
@@ -3367,10 +3367,18 @@
 #: model:stock.location,name:msf_outgoing.stock_location_dispatch
 #: field:stock.picking,shipment_id:0
 #: view:sale.order.line.followup:0
+#: field:return.pack.shipment.processor,shipment_id:0
+#: field:return.shipment.processor,shipment_id:0
+#: view:shipment:0
+#: field:shipment.additionalitems,shipment_id:0
+#: field:shipment.processor,shipment_id:0
+#: view:stock.move:0
+#: field:stock.move,pick_shipment_id:0
 #, python-format
 msgid "Shipment"
 msgstr "Expédition"
 
+
 #. module: product
 #: help:product.packaging,weight_ul:0
 msgid "The weight of the empty UL"

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2017-01-31 16:17:06 +0000
+++ bin/addons/msf_profile/msf_profile.py	2017-02-06 11:06:51 +0000
@@ -1116,6 +1116,12 @@
         cr.execute("""UPDATE product_product SET uf_write_date = write_date, uf_create_date = create_date""")
         return True
 
+    def us_1359_update_move_shipment(self, cr, uid, *a, **b):
+        """
+        Fill the 'pick_shipment_id' value for stock move in a shipment
+        """
+        cr.execute("""UPDATE stock_move sm SET pick_shipment_id = sp.shipment_id FROM stock_picking sp WHERE sm.picking_id = sp.id AND sp.shipment_id IS NOT NULL""")
+        return True
 
 patch_scripts()