From bd8e4eeddc38518333edb91d53ced1e05cf85fee Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Fri, 31 Jan 2025 12:09:50 +0530
Subject: [PATCH] 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);