From 3d71723ada44186b56ad041d43e569cbe29de4a2 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Mon, 2 Jul 2012 15:11:47 +0530 Subject: [PATCH 1/3] [FIX]Add weight,weight_net on stock.picking.in(incoming shipment) and stock.picking.out (delivery order) In Delivery module lp bug: https://launchpad.net/bugs/1016378 fixed bzr revid: fka@tinyerp.com-20120702094147-qnrbc84k7fdfycrk --- addons/delivery/delivery_view.xml | 44 +++++++++++++++++++++---------- addons/delivery/stock.py | 28 ++++++++++++++++++++ addons/stock/stock.py | 2 +- 3 files changed, 59 insertions(+), 15 deletions(-) diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index 5e54f74f7f1..3cbe3f1f2c7 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -183,6 +183,14 @@ + + + + + + + + @@ -196,6 +204,10 @@ + + + + @@ -211,19 +223,6 @@ - - stock.picking_withweight.internal.move.form.view - form - stock.picking - - - - - - - - - stock.move.form.weight form @@ -280,6 +279,23 @@ - + + + delivery.stock.picking_withcarrier.in.form.view + form + stock.picking.in + + + + + + + + + + + + + diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py index 64ebf0ff9fa..a50226cb583 100644 --- a/addons/delivery/stock.py +++ b/addons/delivery/stock.py @@ -202,5 +202,33 @@ class stock_picking_out(osv.osv): 'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32), 'number_of_packages': fields.integer('Number of Packages'), } +stock_picking_out() + +class stock_picking_in(osv.osv): + _inherit = 'stock.picking.in' + + 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), + }), + '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), + }), + + } +stock_picking_in() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/stock.py b/addons/stock/stock.py index a279b8bea6c..077d1b0719f 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -2841,7 +2841,7 @@ class stock_picking_in(osv.osv): _name = "stock.picking.in" _inherit = "stock.picking" _table = "stock_picking" - _description = "Incomming Shipments" + _description = "Incoming Shipments" def check_access_rights(self, cr, uid, operation, raise_exception=True): #override in order to redirect the check of acces rights on the stock.picking object From 10c19dc3504845bace0ad1d3adfd912beee8c653 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 22 Aug 2012 16:46:44 +0530 Subject: [PATCH 2/3] [IMP]:delivery:assigned no one group to weight net bzr revid: apa@tinyerp.com-20120822111644-tcsdsfv53z02lnyp --- addons/delivery/delivery_view.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index 02eb543dd96..cb0964c2abd 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -232,11 +232,11 @@ - + - + @@ -252,7 +252,7 @@ - + @@ -335,11 +335,11 @@ - + - + From 0e116ffb566d532c97a37a2ed8936fa5a4d90f70 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 22 Aug 2012 17:03:36 +0530 Subject: [PATCH 3/3] [IMP]:delivery:indentation bzr revid: apa@tinyerp.com-20120822113336-d9wl1lhdi25n7jvg --- addons/delivery/delivery_view.xml | 1 - addons/delivery/stock.py | 19 ++++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) 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()