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

fix: Item Rate within Update Items in Sales order (#19172)

Browse Source 
Blocked negative discount percentage, which affected the item rate every time Update Items action was taken
This commit is contained in:
Marica 2019-09-25 17:17:36 +05:30 committed by Anurag Mishra
parent 132323462c
commit 23d7b09389
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/controllers/accounts_controller.py
View File

@ -143,7 +143,7 @@ class AccountsController(TransactionBase):
if not self.cash_bank_account: if not self.cash_bank_account:
# show message that the amount is not paid # show message that the amount is not paid
frappe.throw(_("Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified")) frappe.throw(_("Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"))
if cint(self.is_return) and self.grand_total > self.paid_amount: if cint(self.is_return) and self.grand_total > self.paid_amount:
self.paid_amount = flt(flt(self.grand_total), self.precision("paid_amount")) self.paid_amount = flt(flt(self.grand_total), self.precision("paid_amount"))
@ -1195,8 +1195,10 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
child_item.rate = flt(d.get("rate")) child_item.rate = flt(d.get("rate"))
if flt(child_item.price_list_rate): if flt(child_item.price_list_rate):
child_item.discount_percentage = flt((1 - flt(child_item.rate) / flt(child_item.price_list_rate)) * 100.0, \ discount = flt((1 - flt(child_item.rate) / flt(child_item.price_list_rate)) * 100.0,
child_item.precision("discount_percentage")) child_item.precision("discount_percentage"))
if discount > 0:
child_item.discount_percentage = discount
child_item.flags.ignore_validate_update_after_submit = True child_item.flags.ignore_validate_update_after_submit = True
if new_child_flag: if new_child_flag:
@ -1220,7 +1222,6 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
parent.update_status_updater() parent.update_status_updater()
else: else:
parent.check_credit_limit() parent.check_credit_limit()
parent.save() parent.save()
if parent_doctype == 'Purchase Order': if parent_doctype == 'Purchase Order':