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

[fix] Reset price list rate based on Pricing Rule type

Browse Source
This commit is contained in:
Nabin Hait 2015-08-13 13:25:43 +05:30
parent cb4784c940
commit 0da11f1b10
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,6 +147,7 @@ def get_pricing_rule_for_item(args):
if pricing_rule: if pricing_rule:
item_details.pricing_rule = pricing_rule.name item_details.pricing_rule = pricing_rule.name
item_details.pricing_rule_for = pricing_rule.price_or_discount
if pricing_rule.price_or_discount == "Price": if pricing_rule.price_or_discount == "Price":
item_details.update({ item_details.update({
"price_list_rate": pricing_rule.price/flt(args.conversion_rate) \ "price_list_rate": pricing_rule.price/flt(args.conversion_rate) \

7
erpnext/controllers/accounts_controller.py
View File

@ -153,9 +153,10 @@ class AccountsController(TransactionBase):
item.set(fieldname, value) item.set(fieldname, value)
if ret.get("pricing_rule"): if ret.get("pricing_rule"):
for field in ["base_price_list_rate", "price_list_rate", item.set("discount_percentage", ret.get("discount_percentage"))
"discount_percentage", "base_rate", "rate"]: if ret.get("pricing_rule_for") == "Price":
item.set(field, ret.get(field)) item.set("pricing_list_rate", ret.get("pricing_list_rate"))
def set_taxes(self): def set_taxes(self):
if not self.meta.get_field("taxes"): if not self.meta.get_field("taxes"):