From d3440cf5450bfbb030aa31a3686f7012e6a5c104 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Wed, 21 Jan 2026 15:24:14 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/accounts/doctype/sales_invoice/sales_invoice.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 217c42c1a14..be876727314 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -111,23 +111,16 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends ( } if (cint(doc.update_stock) != 1) { -<<<<<<< HEAD // show Make Delivery Note button only if Sales Invoice is not created from Delivery Note var from_delivery_note = false; from_delivery_note = cur_frm.doc.items.some(function (item) { return item.delivery_note ? true : false; }); - if (!from_delivery_note && !is_delivered_by_supplier) { - cur_frm.add_custom_button( - __("Delivery"), - cur_frm.cscript["Make Delivery Note"], -======= if (!is_delivered_by_supplier) { this.frm.add_custom_button( __("Delivery Note"), this.frm.cscript["Make Delivery Note"], ->>>>>>> b691de0147 (fix: allow creation of DN in SI for items not having DN reference) __("Create") ); }