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

fix: completed DC will not appear in a delivery trip

Browse Source
This commit is contained in:
Nihantra C. Patel
2024-06-17 15:09:31 +05:30
committed by GitHub
parent a3444a07b7
commit 0bab609a6f
1 changed files with 0 additions and 4 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,11 +205,7 @@ erpnext.stock.DeliveryNoteController = class DeliveryNoteController extends (
); );
} }
<<<<<<< HEAD
if (doc.docstatus == 1) {
=======
if (doc.docstatus == 1 && doc.status != "Completed" && frappe.model.can_create("Delivery Trip")) { 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 () {