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

Merge pull request #16460 from nabinhait/pricing-rule-issue

Browse Source 
fix: Enforce pricing rule based on rate on server side
This commit is contained in:
Nabin Hait 2019-01-23 12:09:12 +05:30 committed by GitHub
commit d2e2ca31ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/accounts_controller.py
View File

@ -248,7 +248,6 @@ class AccountsController(TransactionBase):
if self.get("is_subcontracted"): if self.get("is_subcontracted"):
args["is_subcontracted"] = self.is_subcontracted args["is_subcontracted"] = self.is_subcontracted
ret = get_item_details(args) ret = get_item_details(args)
for fieldname, value in ret.items(): for fieldname, value in ret.items():
if item.meta.get_field(fieldname) and value is not None: if item.meta.get_field(fieldname) and value is not None:
if (item.get(fieldname) is None or fieldname in force_item_fields): if (item.get(fieldname) is None or fieldname in force_item_fields):
@ -267,9 +266,10 @@ class AccountsController(TransactionBase):
if ret.get("pricing_rule"): if ret.get("pricing_rule"):
# if user changed the discount percentage then set user's discount percentage ? # if user changed the discount percentage then set user's discount percentage ?
item.set("pricing_rule", ret.get("pricing_rule"))
item.set("discount_percentage", ret.get("discount_percentage")) item.set("discount_percentage", ret.get("discount_percentage"))
if ret.get("pricing_rule_for") == "Price": if ret.get("pricing_rule_for") == "Rate":
item.set("pricing_list_rate", ret.get("pricing_list_rate")) item.set("price_list_rate", ret.get("price_list_rate"))
if item.price_list_rate: if item.price_list_rate:
item.rate = flt(item.price_list_rate * item.rate = flt(item.price_list_rate *