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

Merge pull request #41741 from frappe/mergify/bp/version-15-hotfix/pr-41655

Browse Source 
fix: completed DC will not appear in a delivery trip (backport #41655)
This commit is contained in:
ruthra kumar
2024-07-10 10:33:11 +05:30
committed by GitHub
parent 7d0d1cfd18 b3715b2b82
commit b9c0f3f402
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,7 +223,7 @@ erpnext.stock.DeliveryNoteController = class DeliveryNoteController extends (
); );
} }
if (doc.docstatus == 1 && frappe.model.can_create("Delivery Trip")) { if (doc.docstatus == 1 && doc.status != "Completed" && frappe.model.can_create("Delivery Trip")) {
this.frm.add_custom_button( this.frm.add_custom_button(
__("Delivery Trip"), __("Delivery Trip"),
function () { function () {

2
erpnext/stock/doctype/delivery_trip/delivery_trip.js
View File

@@ -58,10 +58,12 @@ frappe.ui.form.on("Delivery Trip", {
date_field: "posting_date", date_field: "posting_date",
setters: { setters: {
company: frm.doc.company, company: frm.doc.company,
customer: null,
}, },
get_query_filters: { get_query_filters: {
docstatus: 1, docstatus: 1,
company: frm.doc.company, company: frm.doc.company,
status: ["Not In", ["Completed", "Cancelled"]],
}, },
}); });
}, },