Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5071 from neilLasrado/pricing-rule-fix

Browse Source 
Fixed Issues in Pricing rule
This commit is contained in:
Rushabh Mehta 2016-03-29 10:18:03 +05:30
commit dab3cdc106
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,6 +242,8 @@ def filter_pricing_rules(args, pricing_rules):
for p in pricing_rules: for p in pricing_rules:
if p.item_code and args.variant_of: if p.item_code and args.variant_of:
p.variant_of = args.variant_of p.variant_of = args.variant_of
else:
p.variant_of = None
# find pricing rule with highest priority # find pricing rule with highest priority
if pricing_rules: if pricing_rules:
@ -251,7 +253,7 @@ def filter_pricing_rules(args, pricing_rules):
# apply internal priority # apply internal priority
all_fields = ["item_code", "item_group", "brand", "customer", "customer_group", "territory", all_fields = ["item_code", "item_group", "brand", "customer", "customer_group", "territory",
"supplier", "supplier_type", "campaign", "sales_partner"] "supplier", "supplier_type", "campaign", "sales_partner", "variant_of"]
if len(pricing_rules) > 1: if len(pricing_rules) > 1:
for field_set in [["item_code", "variant_of", "item_group", "brand"], for field_set in [["item_code", "variant_of", "item_group", "brand"],