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

Pricing Rule: If rule for price applied, discount rule against price list should not be applied #565

Browse Source
This commit is contained in:
Nabin Hait 2014-05-05 15:04:55 +05:30
parent 53dab55703
commit f2db87a766
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/get_item_details.py
View File

@ -246,9 +246,14 @@ def apply_pricing_rule(out, args):
args_dict.update(out) args_dict.update(out)
all_pricing_rules = get_pricing_rules(args_dict) all_pricing_rules = get_pricing_rules(args_dict)
rule_for_price = False
for rule_for in ["price", "discount_percentage"]: for rule_for in ["price", "discount_percentage"]:
pricing_rules = filter(lambda x: x[rule_for] > 0.0, all_pricing_rules) pricing_rules = filter(lambda x: x[rule_for] > 0.0, all_pricing_rules)
if rule_for_price:
pricing_rules = filter(lambda x: not x["for_price_list"], pricing_rules)
pricing_rule = filter_pricing_rules(args_dict, pricing_rules) pricing_rule = filter_pricing_rules(args_dict, pricing_rules)
if pricing_rule: if pricing_rule:
if rule_for == "discount_percentage": if rule_for == "discount_percentage":
out["discount_percentage"] = pricing_rule["discount_percentage"] out["discount_percentage"] = pricing_rule["discount_percentage"]
@ -258,6 +263,7 @@ def apply_pricing_rule(out, args):
out["price_list_rate"] = pricing_rule["price"] * \ out["price_list_rate"] = pricing_rule["price"] * \
flt(args_dict.plc_conversion_rate) / flt(args_dict.conversion_rate) flt(args_dict.plc_conversion_rate) / flt(args_dict.conversion_rate)
out["pricing_rule_for_price"] = pricing_rule["name"] out["pricing_rule_for_price"] = pricing_rule["name"]
rule_for_price = True
def get_pricing_rules(args_dict): def get_pricing_rules(args_dict):
def _get_tree_conditions(doctype, allow_blank=True): def _get_tree_conditions(doctype, allow_blank=True):