nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 12:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved merge conflicts

Browse Source
This commit is contained in:
mbauskar
2017-08-04 11:07:07 +05:30
parent 326acc3ecb 139db5ffe7
commit f3be738b68
13 changed files with 76 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/shopping_cart/product.py
View File

@@ -85,7 +85,7 @@ def get_price(item_code, template_item_code, price_list, qty=1):
if pricing_rule:
if pricing_rule.pricing_rule_for == "Discount Percentage":
price[0].price_list_rate = flt(price[0].price_list_rate * (1.0 - (pricing_rule.discount_percentage / 100.0)))
price[0].price_list_rate = flt(price[0].price_list_rate * (1.0 - (flt(pricing_rule.discount_percentage) / 100.0)))
if pricing_rule.pricing_rule_for == "Price":
price[0].price_list_rate = pricing_rule.price_list_rate