From 23ac3d3c8ef102aa7edd13d2bc49faa7fe553dae Mon Sep 17 00:00:00 2001 From: "Jay Vora (OpenERP)" Date: Tue, 29 Mar 2011 18:45:43 +0530 Subject: [PATCH] [FIX] Stock : While configuring physical inventory, manufacturing lots field should be set mandatory if the product has this attribute True lp bug: https://launchpad.net/bugs/700928 fixed bzr revid: jvo@tinyerp.com-20110329131543-sulhfsoqzb0zh34o --- addons/stock/stock.py | 10 +++++----- addons/stock/stock_view.xml | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index dd7861a8520..4419608ffdb 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -2636,6 +2636,7 @@ class stock_inventory_line(osv.osv): 'company_id': fields.related('inventory_id','company_id',type='many2one',relation='res.company',string='Company',store=True, select=True, readonly=True), 'prod_lot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"), 'state': fields.related('inventory_id','state',type='char',string='State',readonly=True), + 'tracking': fields.dummy(string='Tracking', type='boolean'), } def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False, to_date=False): @@ -2646,12 +2647,11 @@ class stock_inventory_line(osv.osv): @return: Dictionary of changed values """ if not product: - return {} - if not uom: - prod = self.pool.get('product.product').browse(cr, uid, [product], {'uom': uom})[0] - uom = prod.uom_id.id + return {'product_qty': 0.0, 'product_uom': False, 'tracking': False} + obj_product = self.pool.get('product.product').browse(cr, uid, product) + uom = uom or obj_product.uom_id.id amount = self.pool.get('stock.location')._product_get(cr, uid, location_id, [product], {'uom': uom, 'to_date': to_date})[product] - result = {'product_qty': amount, 'product_uom': uom} + result = {'product_qty': amount, 'product_uom': uom, 'tracking': obj_product.track_production} return {'value': result} stock_inventory_line() diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 0a2d3a8728d..f6e3f5b39d9 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -58,6 +58,7 @@
+ @@ -118,6 +119,7 @@ + @@ -130,6 +132,7 @@ +