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

fix: keep per_billed 100 for billed delivery note after return

Browse Source 
(cherry picked from commit 8290a83591)
This commit is contained in:
Sugesh393
2025-04-21 16:22:14 +05:30
committed by Mergify
parent bbbbb4da55
commit 680c221f05
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/status_updater.py
View File

@@ -84,8 +84,8 @@ status_map = {
"Delivery Note": [ "Delivery Note": [
["Draft", None], ["Draft", None],
["To Bill", "eval:self.per_billed < 100 and self.docstatus == 1"], ["To Bill", "eval:self.per_billed < 100 and self.docstatus == 1"],
["Return Issued", "eval:self.per_returned == 100 and self.docstatus == 1"],
["Completed", "eval:self.per_billed == 100 and self.docstatus == 1"], ["Completed", "eval:self.per_billed == 100 and self.docstatus == 1"],
["Return Issued", "eval:self.per_returned == 100 and self.docstatus == 1"],
["Cancelled", "eval:self.docstatus==2"], ["Cancelled", "eval:self.docstatus==2"],
["Closed", "eval:self.status=='Closed' and self.docstatus != 2"], ["Closed", "eval:self.status=='Closed' and self.docstatus != 2"],
], ],

8
erpnext/controllers/stock_controller.py
View File

@@ -988,7 +988,13 @@ class StockController(AccountsController):
def update_billing_percentage(self, update_modified=True): def update_billing_percentage(self, update_modified=True):
target_ref_field = "amount" target_ref_field = "amount"
if self.doctype == "Delivery Note": if self.doctype == "Delivery Note":
target_ref_field = "amount - (returned_qty * rate)" total_amount = total_returned = 0
for item in self.items:
total_amount += flt(item.amount)
total_returned += flt(item.returned_qty * item.rate)
if total_returned < total_amount:
target_ref_field = "(amount - (returned_qty * rate))"
self._update_percent_field( self._update_percent_field(
{ {