[MERGE] forward port of branch 7.0 up to 5035c76

[odoo/odoo.git] / addons / product / product.py

diff --git a/addons/product/product.py b/addons/product/product.py
index 0c08dbb..2110f24 100644 (file)
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -821,6 +821,7 @@ class product_product(osv.osv):
             price_type_currency_id = pricetype_obj.browse(cr,uid,price_type_id).currency_id.id
 
         res = {}
+        company_id = self.pool['res.users'].read(cr, uid, uid, ['company_id'], context=context)['company_id'][0]
         # standard_price field can only be seen by users in base.group_user
         # Thus, in order to compute the sale price from the cost price for users not in this group
         # We fetch the standard price as the superuser
@@ -828,7 +829,7 @@ class product_product(osv.osv):
             if ptype != 'standard_price':
                 res[product.id] = product[ptype] or 0.0
             else: 
-                res[product.id] = self.read(cr, SUPERUSER_ID, product.id, [ptype], context=context)[ptype] or 0.0
+                res[product.id] = self.read(cr, SUPERUSER_ID, product.id, [ptype], context=dict(context, force_company=company_id))[ptype] or 0.0
 
         product_uom_obj = self.pool.get('product.uom')
         for product in products: