From 8ee7e61b8b02c27879a4fee9537d0f5f2c2bc69c Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Tue, 10 Aug 2010 17:58:52 +0530 Subject: [PATCH] [Add] stock: stock_return_picking and stock_picking_make wizard bzr revid: sbh@tinyerp.com-20100810122852-tfftucd8hbqirysj --- addons/stock/__openerp__.py | 2 + addons/stock/stock.py | 1 + addons/stock/stock_view.xml | 16 ++ addons/stock/wizard/__init__.py | 3 + addons/stock/wizard/stock_picking_make.py | 80 +++++++ .../stock/wizard/stock_picking_make_view.xml | 31 +++ addons/stock/wizard/stock_return_picking.py | 218 ++++++++++++++++++ .../wizard/stock_return_picking_view.xml | 24 ++ 8 files changed, 375 insertions(+) create mode 100644 addons/stock/wizard/stock_picking_make.py create mode 100644 addons/stock/wizard/stock_picking_make_view.xml create mode 100644 addons/stock/wizard/stock_return_picking.py create mode 100644 addons/stock/wizard/stock_return_picking_view.xml diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index e4fa7c18080..3fb9e2c741a 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -58,6 +58,8 @@ Thanks to the double entry management, the inventory controlling is powerful and "wizard/stock_inventory_line_split_view.xml", "wizard/stock_change_standard_price_view.xml", "wizard/stock_traceability_view.xml", + 'wizard/stock_picking_make_view.xml', + 'wizard/stock_return_picking_view.xml', "stock_workflow.xml", "stock_incoterms.xml", "stock_view.xml", diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 9230270feeb..812cd0fb492 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1374,6 +1374,7 @@ class stock_move(osv.osv): 'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order"), 'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin",store=True), 'scraped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scraped'), + 'move_stock_return_history': fields.many2many('stock.move', 'stock_move_return_history', 'move_id', 'return_move_id', 'Move Return History',readonly=True), } _constraints = [ (_check_tracking, diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 772726743be..52db4ca56c7 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -655,6 +655,9 @@