odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] unit_price should be on other_pricelist 

bzr revid: rmu@tinyerp.com-20131014100746-inm1snk2hgdc7i98
This commit is contained in:
Ravish (Open ERP) 2013-10-14 15:37:46 +05:30
parent 7cfca3db40
commit a98bd87122
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
addons/product_visible_discount/product_visible_discount.py
View File

@ -87,12 +87,14 @@ class sale_order_line(osv.osv):
pricelists = pricelist_obj.read(cr,uid,[pricelist],['visible_discount'])
new_list_price = get_real_price(list_price, product.id, qty, uom, pricelist)
if(len(pricelists)>0 and pricelists[0]['visible_discount'] and list_price[pricelist] != 0):
discount = (new_list_price - price) / new_list_price * 100
result['price_unit'] = new_list_price
result['discount'] = discount
else:
if (price/new_list_price > 0):
result['discount'] = 0.0
result['price_unit'] = price
else:
if(len(pricelists)>0 and pricelists[0]['visible_discount'] and list_price[pricelist] != 0):
discount= (price/new_list_price)
result['price_unit'] = new_list_price
result['discount'] = discount
return res
sale_order_line()
@ -153,12 +155,14 @@ class account_invoice_line(osv.osv):
real_price = get_real_price(price_unit_res, product.id, qty, uom_id, pricelist)
if pricelist:
pricelists=pricelist_obj.read(cr,uid,[pricelist],['visible_discount'])
if(len(pricelists)>0 and pricelists[0]['visible_discount'] and real_price != 0):
discount=(real_price-price_unit) / real_price * 100
result['price_unit'] = real_price
result['discount'] = discount
if (price_unit/real_price > 0):
result['discount'] = 0.0
result['price_unit'] = price_unit
else:
result['discount']=0.0
if(len(pricelists)>0 and pricelists[0]['visible_discount'] and real_price != 0):
discount= (price_unit/real_price)
result['price_unit'] = real_price
result['discount'] = discount
return res
account_invoice_line()