Merge lp:~openerp-dev/openobject-addons/6.0-bug-857067-rha into lp:openobject-addons/6.0

[Rifakat Husen (OpenERP)]

Hello,

Incorrect values for weight and net weight for backorder and delivery order while doing partial delivery.

Fix solves problem.

Regards.

[Raphael Collet (OpenERP) (rco-openerp)]

This is the wrong approach. Don't override do_partial().

The values of weight and weight_net are probably wrong because their stored value is not recomputed after some data change. Please fix the 'store' argument in the function fields! What is the change in the data that requires those fields to be recomputed?

review: Needs Fixing

[Rifakat Husen (OpenERP) (rha-openerp)]

When ever we try to process the delivery order, weight should be calculated with respect to remaining quantity.

I have corrected functional fields and its fixed without overriding do_partial()

Thanks.

review: Needs Resubmitting

[Raphael Collet (OpenERP) (rco-openerp)]

Excellent!

review: Approve

=== modified file 'delivery/stock.py'
--- delivery/stock.py	2011-01-14 00:11:01 +0000
+++ delivery/stock.py	2011-09-27 06:13:24 +0000
@@ -43,7 +43,7 @@
                                 'weight_net': total_weight_net,
                               }
         return res
-
+    
 
     def _get_picking_line(self, cr, uid, ids, context=None):
         result = {}
@@ -54,15 +54,15 @@
     _columns = {
         'carrier_id':fields.many2one("delivery.carrier","Carrier"),
         'volume': fields.float('Volume'),
-        'weight': fields.function(_cal_weight, method=True, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+        'weight': fields.function(_cal_weight, method=True, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight', 
                   store={
                  'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
-                 'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
+                 'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty','picking_id'], 20),
                  }),
-        'weight_net': fields.function(_cal_weight, method=True, type='float', string='Net Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+        'weight_net': fields.function(_cal_weight, method=True, type='float', string='Net Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight', 
                   store={
                  'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
-                 'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
+                 'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty','picking_id'], 20),
                  }),
         'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
         'number_of_packages': fields.integer('Number of Packages'),