nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-15 01:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: pricing rule not working for production discount

Browse Source
This commit is contained in:
Rohit Waghchaure
2019-12-13 16:18:38 +05:30
parent a41d464198
commit 4e8e466a98
6 changed files with 76 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/accounts_controller.py
View File

@@ -319,8 +319,8 @@ class AccountsController(TransactionBase):
if item.get('discount_amount'):
item.rate = item.price_list_rate - item.discount_amount
elif pricing_rule_args.get('free_item'):
apply_pricing_rule_for_free_items(self, pricing_rule_args)
elif pricing_rule_args.get('free_item_data'):
apply_pricing_rule_for_free_items(self, pricing_rule_args.get('free_item_data'))
elif pricing_rule_args.get("validate_applied_rule"):
for pricing_rule in get_applied_pricing_rules(item):

8
erpnext/controllers/buying_controller.py
View File

@@ -735,10 +735,6 @@ class BuyingController(StockController):
if not self.get("items"):
return
earliest_schedule_date = min([d.schedule_date for d in self.get("items")])
if earliest_schedule_date:
self.schedule_date = earliest_schedule_date
if self.schedule_date:
for d in self.get('items'):
if not d.schedule_date:
@@ -750,6 +746,10 @@ class BuyingController(StockController):
else:
frappe.throw(_("Please enter Reqd by Date"))
earliest_schedule_date = min([d.schedule_date for d in self.get("items")])
if earliest_schedule_date:
self.schedule_date = earliest_schedule_date
def validate_items(self):
# validate items to see if they have is_purchase_item or is_subcontracted_item enabled
if self.doctype=="Material Request": return