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

[minor-fix] pricing rule test-case fix

Browse Source
This commit is contained in:
mbauskar 2016-01-29 15:44:56 +05:30 committed by rohitwaghchaure
parent 75b6fbb6a7
commit c1331d0e8e
1 changed files with 2 additions and 2 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

@ -171,8 +171,8 @@ def get_pricing_rule_for_item(args):
}) })
else: else:
# if user changed the discount percentage then set discount_percentage of user # if user changed the discount percentage then set discount_percentage of user
item_details.discount_percentage = pricing_rule.discount_percentage if args.discount_percentage == pricing_rule.discount_percentage\ item_details.discount_percentage = args.discount_percentage if args.discount_percentage != pricing_rule.discount_percentage\
else args.discount_percentage and args.discount_percentage > 0 else pricing_rule.discount_percentage
return item_details return item_details
def get_pricing_rules(args): def get_pricing_rules(args):