nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 03:29:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: multiple price rules margin.

Browse Source
This commit is contained in:
Devin Slauenwhite
2021-03-10 18:46:18 -05:00
parent aa90dc6aa3
commit 266f24bb74
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -330,13 +330,16 @@ def get_pricing_rule_details(args, pricing_rule):
def apply_price_discount_rule(pricing_rule, item_details, args): def apply_price_discount_rule(pricing_rule, item_details, args):
item_details.pricing_rule_for = pricing_rule.rate_or_discount item_details.pricing_rule_for = pricing_rule.rate_or_discount
if ((pricing_rule.margin_type == 'Amount' and pricing_rule.currency == args.currency) for apply_on in ['Percentage', 'Amount']:
or (pricing_rule.margin_type == 'Percentage')): if pricing_rule.margin_type != apply_on: continue
item_details.margin_type = pricing_rule.margin_type
item_details.margin_rate_or_amount = pricing_rule.margin_rate_or_amount field = 'margin_rate_or_amount'
else: if field not in item_details:
item_details.margin_type = None item_details.setdefault(field, 0)
item_details.margin_rate_or_amount = 0.0 item_details.setdefault('margin_type', apply_on)
item_details[field] += (pricing_rule.get(field, 0)
if pricing_rule else args.get(field, 0))
if pricing_rule.rate_or_discount == 'Rate': if pricing_rule.rate_or_discount == 'Rate':
pricing_rule_rate = 0.0 pricing_rule_rate = 0.0