diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index cb0964c2abd..87dbcd2514c 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -343,6 +343,5 @@ - diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py index 27e24385cb2..c3ce236dc2e 100644 --- a/addons/delivery/stock.py +++ b/addons/delivery/stock.py @@ -210,23 +210,20 @@ class stock_picking_in(osv.osv): def _cal_weight(self, cr, uid, ids, name, args, context=None): return self.pool.get('stock.picking')._cal_weight(cr, uid, ids, name, args, context=context) - def _get_picking_line(self, cr, uid, ids, context=None): return self.pool.get('stock.picking')._get_picking_line(cr, uid, ids, context=context) _columns = { - 'weight': fields.function(_cal_weight, 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), - }), + 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), + }), 'weight_net': fields.function(_cal_weight, 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), - }), - + 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_picking_in()