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 @@