← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-commiter/openobject-addons/sus-dev-addons-product into lp:~openerp-dev/openobject-addons/trunk-dev-addons2

 

sus(OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/sus-dev-addons-product into lp:~openerp-dev/openobject-addons/trunk-dev-addons2.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #637243 [product] Can't use pricelist versions in pricelists linked with 'Other Pricelist' (5.0)
  https://bugs.launchpad.net/bugs/637243


[FIX] bug https://bugs.launchpad.net/openobject-addons/+bug/637243
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/sus-dev-addons-product/+merge/41459
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/sus-dev-addons-product into lp:~openerp-dev/openobject-addons/trunk-dev-addons2.
=== modified file 'product/pricelist.py'
--- product/pricelist.py	2010-10-28 13:49:35 +0000
+++ product/pricelist.py	2010-11-22 13:32:12 +0000
@@ -234,7 +234,7 @@
                             else:
                                 price_tmp = self.price_get(cr, uid,
                                         [res['base_pricelist_id']], product_id,
-                                        qty)[res['base_pricelist_id']]
+                                        qty, context=context)[res['base_pricelist_id']]
                                 ptype_src = self.browse(cr, uid, res['base_pricelist_id']).currency_id.id
                                 price = currency_obj.compute(cr, uid, ptype_src, res['currency_id'], price_tmp, round=False)
                         elif res['base'] == -2:


Follow ups