Merge lp:~unifield-team/unifield-addons/modification-of-stock-for-shipment into lp:unifield-addons

[Patrick Amstutz]

modification for shipment wm

[lp:~unifield-team/unifield-addons/modification-of-stock-for-shipment]

4483. By jf <jf@tempo4> on 2011-08-18

[FIX] OEB-28: purchase_double_validation and unit test

4484. By jf <jf@tempo4> on 2011-08-25

Hook UF-368: Specific Stock Locations

=== modified file 'stock/stock.py'
--- stock/stock.py	2011-07-26 16:00:58 +0000
+++ stock/stock.py	2011-08-17 13:16:27 +0000
@@ -676,6 +676,15 @@
             'domain': '[]',
             'context': dict(context, active_ids=ids)
         }
+        
+    def _keep_prodlot_hook(self, cr, uid, id, context, *args, **kwargs):
+        '''
+        hook to keep the production lot when a stock move is copied
+        '''
+        res = kwargs.get('res')
+        assert res is not None, 'missing res'
+        
+        return res
 
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
@@ -688,8 +697,9 @@
             default['name'] = self.pool.get('ir.sequence').get(cr, uid, seq_obj_name)
             default['origin'] = ''
             default['backorder_id'] = False
+
         res = super(stock_picking, self).copy(cr, uid, id, default, context)
-        if res:
+        if self._keep_prodlot_hook(cr, uid, id, context, res=res):
             picking_obj = self.browse(cr, uid, res, context=context)
             for move in picking_obj.move_lines:
                 move_obj.write(cr, uid, [move.id], {'tracking_id': False,'prodlot_id':False})

=== modified file 'stock/stock_data.xml'
--- stock/stock_data.xml	2011-01-14 00:11:01 +0000
+++ stock/stock_data.xml	2011-08-17 13:16:27 +0000
@@ -102,6 +102,18 @@
             <field name="name">Stock</field>
             <field name="location_id" ref="stock_location_company"/>
         </record>
+        <record id="stock_location_packing" model="stock.location">
+            <field name="name">Packing</field>
+            <field name="location_id" ref="stock_location_company"/>
+        </record>
+        <record id="stock_location_dispatch" model="stock.location">
+            <field name="name">Dispatch</field>
+            <field name="location_id" ref="stock_location_company"/>
+        </record>
+        <record id="stock_location_distribution" model="stock.location">
+            <field name="name">Distribution</field>
+            <field name="location_id" ref="stock_location_company"/>
+        </record>
 
         <!--
     Properties
@@ -151,6 +163,9 @@
             <field name="lot_input_id" ref="stock_location_stock"/>
             <field name="lot_stock_id" ref="stock_location_stock"/>
             <field name="lot_output_id" ref="stock_location_output"/>
+            <field name="lot_packing_id" ref="stock_location_packing"/>
+            <field name="lot_dispatch_id" ref="stock_location_dispatch"/>
+            <field name="lot_distribution_id" ref="stock_location_distribution"/>
         </record>
     </data>
 </openerp>

=== modified file 'stock/stock_demo.xml'
--- stock/stock_demo.xml	2011-01-14 00:11:01 +0000
+++ stock/stock_demo.xml	2011-08-17 13:16:27 +0000
@@ -248,6 +248,9 @@
             <field name="partner_address_id" ref="res_partner_address_fabien0"/>
             <field name="company_id" ref="res_company_shop0"/>
             <field name="lot_input_id" ref="stock_location_shop0"/>
+            <field name="lot_packing_id" ref="stock_location_packing"/>
+            <field name="lot_dispatch_id" ref="stock_location_dispatch"/>
+            <field name="lot_distribution_id" ref="stock_location_distribution"/>
         </record>
         <record id="stock_warehouse_shop1" model="stock.warehouse">
             <field name="lot_output_id" ref="stock.stock_location_output"/>
@@ -256,6 +259,9 @@
             <field name="partner_address_id" ref="res_partner_address_eric0"/>
             <field name="company_id" ref="res_company_tinyshop0"/>
             <field name="lot_input_id" ref="stock_location_shop1"/>
+            <field name="lot_packing_id" ref="stock_location_packing"/>
+            <field name="lot_dispatch_id" ref="stock_location_dispatch"/>
+            <field name="lot_distribution_id" ref="stock_location_distribution"/>
         </record>
 
         <record forcecreate="True" id="property_stock_variation" model="ir.property">