[MERGE] Merged the branch for the fix of lp:710521

bzr revid: jvo@tinyerp.com-20110411182229-j4w3d46c7tfsr25g
This commit is contained in:
Jay Vora (OpenERP)
2011-04-11 23:52:29 +05:30
+1 -1
View File
@@ -264,7 +264,7 @@ class product_pricelist(osv.osv):
product_obj.price_get(cr, uid, [product_id],
price_type.field,context=context)[product_id], round=False, context=context)
if price:
if price is not False:
price_limit = price
price = price * (1.0+(res['price_discount'] or 0.0))