[CORRECTION] Corrected previous commits which were supposed to be after merge approval

bzr revid: jvo@tinyerp.com-20110329154524-dp1j5zq12v966zmj
2011-03-29 21:15:24 +05:30
parent f4146cfc70 1419a853a5
commit 3fc4b078b9
1 changed files with 3 additions and 4 deletions
@@ -2641,10 +2641,9 @@ 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 {'value': {'product_qty': 0.0, 'product_uom': 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}
        return {'value': result}