Merge lp:~yann-papouin/ocb-addons/6.1-bug-899470-stock-product-available-optimization into lp:ocb-addons/6.1

[Yann Papouin]

Backport from existing functionality in 6.0/7.0/trunk

[Holger Brunn (Therp) (hbrunn)]

verified that this is functionally equivalent to what 7.0-ocb does.

Side note: When you want to give people credit, better do a bzr log -r -1 on the branch you merge, there you'll see the author's email address. Use that as --author, this way launchpad can connect the commit to the launchpad account in question.

review: Approve (code review)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

The fix is different on https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-50947-ado/+merge/123889

I don't know which one is better. Can you check?

Thanks

review: Needs Information

[Yann Papouin (yann-papouin)]

My proposal don't use the temporary variable uoms_ids = {} since it contains exactly the same data than product2uom.values()

[Omar (Pexego) (omar7r)]

LGTM

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

Guewen, does Yann's answer satisfy you? For my part, it's correct.

Regards.

review: Approve (code review)

[Ana Juaristi Olalde (ajuaristio)]

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

I proceed with the merge, because Guewen's question has been answered.

Regards.

=== modified file 'stock/product.py'
--- stock/product.py	2012-07-05 08:27:08 +0000
+++ stock/product.py	2014-02-06 16:00:18 +0000
@@ -185,6 +185,7 @@
         location_obj = self.pool.get('stock.location')
         warehouse_obj = self.pool.get('stock.warehouse')
         shop_obj = self.pool.get('sale.shop')
+        uom_obj = self.pool.get('product.uom')
         
         states = context.get('states',[])
         what = context.get('what',())
@@ -222,13 +223,15 @@
             child_location_ids = location_obj.search(cr, uid, [('location_id', 'child_of', location_ids)])
             location_ids = child_location_ids or location_ids
         
-        # this will be a dictionary of the UoM resources we need for conversion purposes, by UoM id
+        # Extract UoM id from product ids 
+        product2uom = {}
+        for product in self.read(cr, uid, ids, ['uom_id'], context=context):
+            product2uom[product['id']] = product['uom_id'][0]
+            
+        # Create a dict of the UoM resources by id that we need for conversion purposes
         uoms_o = {}
-        # this will be a dictionary of the product UoM by product id
-        product2uom = {}
-        for product in self.browse(cr, uid, ids, context=context):
-            product2uom[product.id] = product.uom_id.id
-            uoms_o[product.uom_id.id] = product.uom_id
+        for uom in uom_obj.browse(cr, uid, product2uom.values(), context=context):
+            uoms_o[uom.id] = uom
 
         results = []
         results2 = []