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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-01-21 15:24:14 +05:30
committed by GitHub
parent 184fa889c3
commit d3440cf545
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -111,23 +111,16 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends (
} }
if (cint(doc.update_stock) != 1) { if (cint(doc.update_stock) != 1) {
<<<<<<< HEAD
// show Make Delivery Note button only if Sales Invoice is not created from Delivery Note // show Make Delivery Note button only if Sales Invoice is not created from Delivery Note
var from_delivery_note = false; var from_delivery_note = false;
from_delivery_note = cur_frm.doc.items.some(function (item) { from_delivery_note = cur_frm.doc.items.some(function (item) {
return item.delivery_note ? true : false; 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) { if (!is_delivered_by_supplier) {
this.frm.add_custom_button( this.frm.add_custom_button(
__("Delivery Note"), __("Delivery Note"),
this.frm.cscript["Make Delivery Note"], this.frm.cscript["Make Delivery Note"],
>>>>>>> b691de0147 (fix: allow creation of DN in SI for items not having DN reference)
__("Create") __("Create")
); );
} }