From f6b49845e29c7edf31cf06140dfa09e54650b958 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Fri, 31 Jan 2025 11:26:01 +0530 Subject: [PATCH 1/2] fix: attribute 'msgbox' not found in sales invoice.js (cherry picked from commit 5643385c22d77d55f7b374820d29375bb70bb3f5) # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.js --- erpnext/accounts/doctype/sales_invoice/sales_invoice.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index da2e362cf27..861aa22b03c 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -65,7 +65,11 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends ( refresh(doc, dt, dn) { const me = this; super.refresh(); +<<<<<<< HEAD if (cur_frm.msgbox && cur_frm.msgbox.$wrapper.is(":visible")) { +======= + if (this.frm?.msgbox && this.frm.msgbox.$wrapper.is(":visible")) { +>>>>>>> 5643385c22 (fix: attribute 'msgbox' not found in sales invoice.js) // hide new msgbox cur_frm.msgbox.hide(); } From bd8e4eeddc38518333edb91d53ced1e05cf85fee Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 31 Jan 2025 12:09:50 +0530 Subject: [PATCH 2/2] chore: fix conflicts --- erpnext/accounts/doctype/sales_invoice/sales_invoice.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 861aa22b03c..a074c9b1c0a 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -65,13 +65,10 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends ( refresh(doc, dt, dn) { const me = this; super.refresh(); -<<<<<<< HEAD - if (cur_frm.msgbox && cur_frm.msgbox.$wrapper.is(":visible")) { -======= + if (this.frm?.msgbox && this.frm.msgbox.$wrapper.is(":visible")) { ->>>>>>> 5643385c22 (fix: attribute 'msgbox' not found in sales invoice.js) // hide new msgbox - cur_frm.msgbox.hide(); + this.frm.msgbox.hide(); } this.frm.toggle_reqd("due_date", !this.frm.doc.is_return);