nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 15:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14076 from chdecultot/pricing_rule

Browse Source 
Missing parentheses in price list rate determination
This commit is contained in:
Manas Solanki
2018-05-16 14:55:32 +05:30
committed by GitHub
parent 4f40b2dca5 2f822476dd
commit b81ece9ddf
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/pricing_rule/pricing_rule.py
View File

@@ -180,7 +180,7 @@ def get_pricing_rule_for_item(args):
item_details.margin_rate_or_amount = pricing_rule.margin_rate_or_amount
if pricing_rule.price_or_discount == "Price":
item_details.update({
"price_list_rate": (pricing_rule.price/flt(args.conversion_rate)) * args.conversion_factor or 1.0 \
"price_list_rate": (pricing_rule.price/flt(args.conversion_rate)) * (args.conversion_factor or 1.0) \
if args.conversion_rate else 0.0,
"discount_percentage": 0.0
})