[MERGE] stock: improve code of get_product_available

bzr revid: rco@openerp.com-20120111083852-wc1g2qcwdc0cv3j6

diff --cc addons/stock/product.py
index a6198ef,7938b89..304fa8d
--- 1/addons/stock/product.py
--- 2/addons/stock/product.py
+++ b/addons/stock/product.py
@@@ -193,18 -194,16 +194,15 @@@ class product_product(osv.osv)
          if not ids:
              return res
  
-     # TODO: write in more ORM way, less queries, more pg84 magic
 -    # CHECK: sale.shop object is called but is present installing sale module, its not in deps
          if context.get('shop', False):
-             cr.execute('select warehouse_id from sale_shop where id=%s', (int(context['shop']),))
-             res2 = cr.fetchone()
-             if res2:
-                 context['warehouse'] = res2[0]
+             warehouse_id = shop_obj.read(cr, uid, int(context['shop']), ['warehouse_id'])['warehouse_id'][0]
+             if warehouse_id:
+                 context['warehouse'] = warehouse_id
  
          if context.get('warehouse', False):
-             cr.execute('select lot_stock_id from stock_warehouse where id=%s', (int(context['warehouse']),))
-             res2 = cr.fetchone()
-             if res2:
-                 context['location'] = res2[0]
+             lot_id = warehouse_obj.read(cr, uid, int(context['warehouse']), ['lot_stock_id'])['lot_stock_id'][0]
+             if lot_id:
+                 context['location'] = lot_id
  
          if context.get('location', False):
              if type(context['location']) == type(1):