Merge lp:~camptocamp/openobject-addons/6.1-fix-1025703_delivery_chained_pickings-AFE into lp:openobject-addons/6.1

[Alexandre Fayolle - camptocamp]

propagate delivery-specific fields on chained moves

add a test for this.

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

tests are green on runbot

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

l33-37 Just about coding style, a dict update of values wouldn't be cleaner?

Otherwise LGTM

review: Approve

Unmerged revisions

7232. By Alexandre Fayolle - camptocamp on 2013-06-25

[FIX] delivery: propagate additional fields in chained pickings

7231. By Alexandre Fayolle - camptocamp on 2013-06-25

[TEST] add test illustrating the issue

=== modified file 'delivery/__openerp__.py'
--- delivery/__openerp__.py	2012-01-31 13:36:57 +0000
+++ delivery/__openerp__.py	2013-06-25 09:37:33 +0000
@@ -46,6 +46,7 @@
     'demo_xml': ['delivery_demo.xml'],
     'test': [
         'test/delivery_cost.yml',
+        'test/delivery_chained_pickings.yml',
     ],
     'installable': True,
     'auto_install': False,

=== modified file 'delivery/stock.py'
--- delivery/stock.py	2011-12-21 18:11:49 +0000
+++ delivery/stock.py	2013-06-25 09:37:33 +0000
@@ -75,7 +75,7 @@
             :param browse_record picking: the stock picking being invoiced
             :param browse_record invoice: the stock picking's invoice
             :return: dict containing the values to create the invoice line,
-                     or None to create nothing
+            or None to create nothing
         """
         carrier_obj = self.pool.get('delivery.carrier')
         grid_obj = self.pool.get('delivery.grid')
@@ -160,6 +160,17 @@
                             }
         return res
 
+    def _prepare_chained_picking(self, cr, uid, picking_name, picking, picking_type, moves_todo, context=None):
+        values = super(stock_move, self)._prepare_chained_picking(cr, uid, picking_name, picking, picking_type, moves_todo, context=context)
+        if picking.carrier_id:
+            values['carrier_id'] = picking.carrier_id.id
+        values['volume'] = picking.volume
+        values['weight'] = picking.weight
+        values['weight_net'] = picking.weight_net
+        values['carrier_tracking_ref'] = picking.carrier_tracking_ref
+        values['number_of_packages'] = picking.number_of_packages
+        return values
+
     _columns = {
         'weight': fields.function(_cal_move_weight, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_move_weight',
                   store={

=== added file 'delivery/test/delivery_chained_pickings.yml'
--- delivery/test/delivery_chained_pickings.yml	1970-01-01 00:00:00 +0000
+++ delivery/test/delivery_chained_pickings.yml	2013-06-25 09:37:33 +0000
@@ -0,0 +1,37 @@
+-
+ I create a picking to stock.location_convenience_shop, which is chained with stock.location_refrigerator
+-
+  !record {model: stock.picking, id: shipment_with_delivery}:
+    type: internal
+    carrier_id: delivery.delivery_carrier
+    volume: 42
+    carrier_tracking_ref: FDX123
+    number_of_packages: 7
+-
+  I add a move in the picking
+-
+  !record {model: stock.move, id: icecream_move}:
+    picking_id: shipment_with_delivery
+    product_id: stock.product_icecream
+    product_uom: product.product_uom_kgm
+    product_qty: 130.0
+    location_id: stock.stock_location_suppliers
+    location_dest_id: stock.location_convenience_shop
+-
+ I confirm the picking
+-
+   !workflow {model: stock.picking, action: button_confirm, ref: shipment_with_delivery}
+-
+ I check that the delivery fields have been propagated to the chained picking
+-
+  !python {model: stock.move}: |
+     original_move = self.browse(cr, uid, ref('icecream_move'), context=context)
+     original_picking = original_move.picking_id
+     chained_move = original_move.move_dest_id
+     chained_picking = chained_move.picking_id
+     assert chained_picking.carrier_tracking_ref == original_picking.carrier_tracking_ref, 'no propagation of carrier_tracking_ref'
+     assert chained_picking.carrier_id == original_picking.carrier_id, 'no propagation of carrier_id'
+     assert chained_picking.volume == original_picking.volume, 'no propagation of volume'
+     assert chained_picking.weight == original_picking.weight, 'no propagation of weight'
+     assert chained_picking.weight_net == original_picking.weight_net, 'no propagation of weight'
+