From ebb62966d3ae298f5c4cd620f64991db52ac85ce Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Wed, 3 Dec 2025 13:10:22 +0000 Subject: [PATCH 1/4] fix: add return status for delivery note (cherry picked from commit dec67eecad981993bc53ed96e4f930ccf624605f) # Conflicts: # erpnext/stock/doctype/delivery_note/delivery_note.py --- erpnext/controllers/status_updater.py | 1 + erpnext/stock/doctype/delivery_note/delivery_note.json | 4 ++-- erpnext/stock/doctype/delivery_note/delivery_note.py | 6 ++++++ erpnext/stock/doctype/delivery_note/delivery_note_list.js | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 0e94cfd95de..a7924288058 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -86,6 +86,7 @@ status_map = { ["To Bill", "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"], + ["Return", "eval:self.is_return == 1 and self.per_billed == 0 and self.docstatus == 1"], ["Cancelled", "eval:self.docstatus==2"], ["Closed", "eval:self.status=='Closed' and self.docstatus != 2"], ], diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index bdfbbb93916..97873234dcf 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -1091,7 +1091,7 @@ "no_copy": 1, "oldfieldname": "status", "oldfieldtype": "Select", - "options": "\nDraft\nTo Bill\nCompleted\nReturn Issued\nCancelled\nClosed", + "options": "\nDraft\nTo Bill\nCompleted\nReturn\nReturn Issued\nCancelled\nClosed", "print_hide": 1, "print_width": "150px", "read_only": 1, @@ -1404,7 +1404,7 @@ "idx": 146, "is_submittable": 1, "links": [], - "modified": "2025-08-04 19:20:47.724218", + "modified": "2025-12-02 23:55:25.415443", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note", diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index 4a0d4048b78..9bfef8a81a4 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -125,8 +125,14 @@ class DeliveryNote(SellingController): shipping_address: DF.SmallText | None shipping_address_name: DF.Link | None shipping_rule: DF.Link | None +<<<<<<< HEAD source: DF.Link | None status: DF.Literal["", "Draft", "To Bill", "Completed", "Return Issued", "Cancelled", "Closed"] +======= + status: DF.Literal[ + "", "Draft", "To Bill", "Completed", "Return", "Return Issued", "Cancelled", "Closed" + ] +>>>>>>> dec67eecad (fix: add return status for delivery note) tax_category: DF.Link | None tax_id: DF.Data | None taxes: DF.Table[SalesTaxesandCharges] diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_list.js b/erpnext/stock/doctype/delivery_note/delivery_note_list.js index af40fd6a8a2..ebbeb971422 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note_list.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note_list.js @@ -12,7 +12,7 @@ frappe.listview_settings["Delivery Note"] = { "currency", ], get_indicator: function (doc) { - if (cint(doc.is_return) == 1) { + if (cint(doc.is_return) == 1 && doc.status == "Return") { return [__("Return"), "gray", "is_return,=,Yes"]; } else if (doc.status === "Closed") { return [__("Closed"), "green", "status,=,Closed"]; From 52e26b6da8b6be95ce1a73d35a536159b70805db Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Wed, 3 Dec 2025 13:14:39 +0000 Subject: [PATCH 2/4] fix: change is_return value in filter from Yes to 1 (cherry picked from commit af212f520d1de1a7bdd6c307b5c7362b73a96e72) --- erpnext/stock/doctype/delivery_note/delivery_note_list.js | 2 +- erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_list.js b/erpnext/stock/doctype/delivery_note/delivery_note_list.js index ebbeb971422..0f045bf405d 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note_list.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note_list.js @@ -13,7 +13,7 @@ frappe.listview_settings["Delivery Note"] = { ], get_indicator: function (doc) { if (cint(doc.is_return) == 1 && doc.status == "Return") { - return [__("Return"), "gray", "is_return,=,Yes"]; + return [__("Return"), "gray", "is_return,=,1"]; } else if (doc.status === "Closed") { return [__("Closed"), "green", "status,=,Closed"]; } else if (doc.status === "Return Issued") { diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js index 30562e23de8..27b7cfec557 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js @@ -12,7 +12,7 @@ frappe.listview_settings["Purchase Receipt"] = { ], get_indicator: function (doc) { if (cint(doc.is_return) == 1 && doc.status == "Return") { - return [__("Return"), "gray", "is_return,=,Yes"]; + return [__("Return"), "gray", "is_return,=,1"]; } else if (doc.status === "Closed") { return [__("Closed"), "green", "status,=,Closed"]; } else if (flt(doc.per_returned, 2) === 100) { From 422aec12cb58727d5b3eeeb2b35951ea2d85fe04 Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Wed, 3 Dec 2025 13:19:59 +0000 Subject: [PATCH 3/4] test: add test for return status in delivery note (cherry picked from commit 445a255a7f48b57a170637ffd269c8d86c6da038) --- erpnext/stock/doctype/delivery_note/test_delivery_note.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py index 450c2243620..5e28362c509 100644 --- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py @@ -2581,6 +2581,7 @@ class TestDeliveryNote(FrappeTestCase): dn = make_delivery_note(so.name) dn.submit() self.assertEqual(dn.per_billed, 0) + self.assertEqual(dn.status, "To Bill") si = make_sales_invoice(dn.name) si.location = "Test Location" @@ -2595,6 +2596,7 @@ class TestDeliveryNote(FrappeTestCase): dn.load_from_db() self.assertEqual(dn.per_billed, 100) self.assertEqual(dn.per_returned, 100) + self.assertEqual(returned.status, "Return") def test_sales_return_for_product_bundle(self): from erpnext.selling.doctype.product_bundle.test_product_bundle import make_product_bundle From 4de1af498bbe046a78a6858c81e4e8b96dbcc1d7 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 9 Dec 2025 19:51:26 +0530 Subject: [PATCH 4/4] chore: resolve conflicts --- erpnext/stock/doctype/delivery_note/delivery_note.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index 9bfef8a81a4..f2c6be169be 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -125,14 +125,10 @@ class DeliveryNote(SellingController): shipping_address: DF.SmallText | None shipping_address_name: DF.Link | None shipping_rule: DF.Link | None -<<<<<<< HEAD source: DF.Link | None - status: DF.Literal["", "Draft", "To Bill", "Completed", "Return Issued", "Cancelled", "Closed"] -======= status: DF.Literal[ "", "Draft", "To Bill", "Completed", "Return", "Return Issued", "Cancelled", "Closed" ] ->>>>>>> dec67eecad (fix: add return status for delivery note) tax_category: DF.Link | None tax_id: DF.Data | None taxes: DF.Table[SalesTaxesandCharges]