From 95e9d3f00933e9ac25f7a30a817219647a020b55 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Mon, 14 Mar 2011 18:41:51 +0530 Subject: [PATCH 1/2] [FIX]: Passed correct item_id in price_get() lp bug: https://launchpad.net/bugs/733143 fixed bzr revid: rpa@tinyerp.com-20110314131151-9boylr4mb0dde141 --- addons/product/pricelist.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py index f71bb9edb27..99ce543a207 100644 --- a/addons/product/pricelist.py +++ b/addons/product/pricelist.py @@ -284,6 +284,7 @@ class product_pricelist(osv.osv): price = False if price: + results['item_id'] = res['id'] if 'uom' in context and not uom_price_already_computed: product = products_dict[product_id] uom = product.uos_id or product.uom_id @@ -299,7 +300,7 @@ class product_pricelist(osv.osv): def price_get(self, cr, uid, ids, prod_id, qty, partner=None, context=None): res_multi = self.price_get_multi(cr, uid, pricelist_ids=ids, products_by_qty_by_partner=[(prod_id, qty, partner)], context=context) res = res_multi[prod_id] - res.update({'item_id': {ids[-1]: ids[-1]}}) + res.update({'item_id': {ids[-1]: res_multi['item_id']}}) return res def price_get_old(self, cr, uid, ids, prod_id, qty, partner=None, context=None): From 07f7a971716773b850efdc01125be7a9159d3a10 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Tue, 15 Mar 2011 14:20:08 +0530 Subject: [PATCH 2/2] [FIX]: product: Fixed problem when there is no item_id bzr revid: rpa@tinyerp.com-20110315085008-wfhbzyq7nqp7epti --- addons/product/pricelist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py index 99ce543a207..72dc7187bd8 100644 --- a/addons/product/pricelist.py +++ b/addons/product/pricelist.py @@ -300,7 +300,7 @@ class product_pricelist(osv.osv): def price_get(self, cr, uid, ids, prod_id, qty, partner=None, context=None): res_multi = self.price_get_multi(cr, uid, pricelist_ids=ids, products_by_qty_by_partner=[(prod_id, qty, partner)], context=context) res = res_multi[prod_id] - res.update({'item_id': {ids[-1]: res_multi['item_id']}}) + res.update({'item_id': {ids[-1]: res_multi.get('item_id', ids[-1])}}) return res def price_get_old(self, cr, uid, ids, prod_id, qty, partner=None, context=None):