commit 81b9a5ee4776613ad8720e7004267a82037715f4
author Saqib Ansari <nextchamp.saqib@gmail.com> Thu Jun 03 12:59:09 2021 +0530
committer Saqib Ansari <nextchamp.saqib@gmail.com> Thu Jun 03 12:59:09 2021 +0530
tree b8692dc25663bf194db4fb6fc6abd030cf85b8b9
parent 311b378328ec3d8ea774749f69188210eef237cd

fix(pos): cannot cancel consolidated sales invoice

erpnext/accounts/doctype/sales_invoice/sales_invoice.js

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 1808005..f813425 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -17,7 +17,7 @@
 		var me = this;
 		this._super();
 
-		this.frm.ignore_doctypes_on_cancel_all = ['POS Invoice', 'Timesheet'];
+		this.frm.ignore_doctypes_on_cancel_all = ['POS Invoice', 'Timesheet', 'POS Invoice Merge Log', 'POS Closing Entry'];
 		if(!this.frm.doc.__islocal && !this.frm.doc.customer && this.frm.doc.debit_to) {
 			// show debit_to in print format
 			this.frm.set_df_property("debit_to", "print_hide", 0);