pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] lp:733143

Browse Source 
bzr revid: qdp-launchpad@openerp.com-20110324113945-h4x01s3pz2n75gyk
This commit is contained in:
Quentin (OpenERP)
2011-03-24 12:39:45 +01:00
parent 01243bdc16 07f7a97171
commit 8c0e4fffad
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/product/pricelist.py
+2 -1
View File
@@ -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.get('item_id', ids[-1])}})
return res
def price_get_old(self, cr, uid, ids, prod_id, qty, partner=None, context=None):