CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-22 11:44:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: completed DC will not appear in a delivery trip (#41655)

Browse Source 
* fix: completed DC will not appear in a delivery trip

* fix: completed DC will not appear in a delivery trip

(cherry picked from commit 4f0214d00e)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.js
This commit is contained in:
Nihantra C. Patel
2024-06-03 17:26:14 +05:30
committed by Mergify
parent 638c94451e
commit a3444a07b7
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,7 +205,11 @@ erpnext.stock.DeliveryNoteController = class DeliveryNoteController extends (
); );
} }
<<<<<<< HEAD
if (doc.docstatus == 1) { if (doc.docstatus == 1) {
=======
if (doc.docstatus == 1 && doc.status != "Completed" && frappe.model.can_create("Delivery Trip")) {
>>>>>>> 4f0214d00e (fix: completed DC will not appear in a delivery trip (#41655))
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"]],
}, },
}); });
}, },