nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-21 02:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add return status for delivery note

Browse Source 
(cherry picked from commit dec67eecad)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.py
This commit is contained in:
Pugazhendhi Velu
2025-12-03 13:10:22 +00:00
committed by Mergify
parent a4ab198042
commit ebb62966d3
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/controllers/status_updater.py
View File

@@ -86,6 +86,7 @@ status_map = {
["To Bill", "eval:self.per_billed < 100 and self.docstatus == 1"], ["To Bill", "eval:self.per_billed < 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"], ["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"], ["Cancelled", "eval:self.docstatus==2"],
["Closed", "eval:self.status=='Closed' and self.docstatus != 2"], ["Closed", "eval:self.status=='Closed' and self.docstatus != 2"],
], ],

4
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@@ -1091,7 +1091,7 @@
"no_copy": 1, "no_copy": 1,
"oldfieldname": "status", "oldfieldname": "status",
"oldfieldtype": "Select", "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_hide": 1,
"print_width": "150px", "print_width": "150px",
"read_only": 1, "read_only": 1,
@@ -1404,7 +1404,7 @@
"idx": 146, "idx": 146,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2025-08-04 19:20:47.724218", "modified": "2025-12-02 23:55:25.415443",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note", "name": "Delivery Note",

6
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@@ -125,8 +125,14 @@ class DeliveryNote(SellingController):
shipping_address: DF.SmallText | None shipping_address: DF.SmallText | None
shipping_address_name: DF.Link | None shipping_address_name: DF.Link | None
shipping_rule: DF.Link | None shipping_rule: DF.Link | None
<<<<<<< HEAD
source: DF.Link | None source: DF.Link | None
status: DF.Literal["", "Draft", "To Bill", "Completed", "Return Issued", "Cancelled", "Closed"] 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_category: DF.Link | None
tax_id: DF.Data | None tax_id: DF.Data | None
taxes: DF.Table[SalesTaxesandCharges] taxes: DF.Table[SalesTaxesandCharges]

2
erpnext/stock/doctype/delivery_note/delivery_note_list.js
View File

@@ -12,7 +12,7 @@ frappe.listview_settings["Delivery Note"] = {
"currency", "currency",
], ],
get_indicator: function (doc) { 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"]; return [__("Return"), "gray", "is_return,=,Yes"];
} else if (doc.status === "Closed") { } else if (doc.status === "Closed") {
return [__("Closed"), "green", "status,=,Closed"]; return [__("Closed"), "green", "status,=,Closed"];