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

fix sider errors.

Browse Source
This commit is contained in:
Devin Slauenwhite
2021-03-23 16:28:54 -04:00
committed by GitHub
parent b135569ca6
commit a0cfe449df
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,12 +331,13 @@ 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
for apply_on in ['Percentage', 'Amount']: for apply_on in ['Percentage', 'Amount']:
if pricing_rule.margin_type != apply_on: continue if pricing_rule.margin_type != apply_on:
continue
field = 'margin_rate_or_amount' field = 'margin_rate_or_amount'
if field not in item_details: if field not in item_details:
item_details.setdefault(field, 0) item_details.setdefault(field, 0)
item_details.setdefault('margin_type', apply_on) item_details.setdefault('margin_type', apply_on)
item_details[field] += (pricing_rule.get(field, 0) item_details[field] += (pricing_rule.get(field, 0)
if pricing_rule else args.get(field, 0)) if pricing_rule else args.get(field, 0))