From ab3736820c55459ed3d05c20a94647b46b6a9566 Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Wed, 5 May 2010 13:40:20 +0200 Subject: [PATCH 1/4] [IMP] stock: import statement was twice in the same __init__ file bzr revid: qdp-launchpad@tinyerp.com-20100505114020-94ojibtj4qkzx0b2 --- addons/stock/report/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py index 8fd64d9f112..a0a4bcb8ea5 100644 --- a/addons/stock/report/__init__.py +++ b/addons/stock/report/__init__.py @@ -29,7 +29,6 @@ import lot_overview_all import report_stock import report_stock_move import report_stock_picking -import report_stock_move # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 1ef96229cc00b93b0cfada2c6c92e7f18bb0df61 Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Wed, 5 May 2010 13:58:15 +0200 Subject: [PATCH 2/4] [IMP] stock: improve field name: 'scrap location' instead of 'scraped' on stock.location bzr revid: qdp-launchpad@tinyerp.com-20100505115815-eoqa80ydw00i0bql --- addons/stock/stock.py | 4 ++-- addons/stock/wizard/stock_move_view.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 4cee95a16c2..111ae31ded4 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -182,7 +182,7 @@ class stock_location(osv.osv): 'stock_real_value': fields.function(_product_value, method=True, type='float', string='Real Stock Value', multi="stock"), 'stock_virtual_value': fields.function(_product_value, method=True, type='float', string='Virtual Stock Value', multi="stock"), 'company_id': fields.many2one('res.company', 'Company', required=True,select=1), - 'scraped': fields.boolean('Scraped'), + 'scrap_location': fields.boolean('Scrap Location', help='Check this box if the current location is a place for destroyed items'), } _defaults = { 'active': lambda *a: 1, @@ -195,7 +195,7 @@ class stock_location(osv.osv): 'posy': lambda *a: 0, 'posz': lambda *a: 0, 'icon': lambda *a: False, - 'scraped': lambda *a: False, + 'scrap_location': lambda *a: False, } def chained_location_get(self, cr, uid, location, partner=None, product=None, context={}): diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml index 310702392f3..481722f8d7f 100644 --- a/addons/stock/wizard/stock_move_view.xml +++ b/addons/stock/wizard/stock_move_view.xml @@ -73,7 +73,7 @@