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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-01-31 12:09:50 +05:30
committed by GitHub
parent f6b49845e2
commit bd8e4eeddc
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);