From f833923f2fcc5ce18847a93fe741db7e59a4d349 Mon Sep 17 00:00:00 2001
From: ljain112 <ljain112@gmail.com>
Date: Fri, 14 Jun 2024 13:13:11 +0530
Subject: [PATCH] refactor: ignore unreconcile doc for PO and SO on
 cancel/delete

(cherry picked from commit b618d685c62837657fe808d6c30dc3582a12d0ec)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.js
#	erpnext/selling/doctype/sales_order/sales_order.js
---
 erpnext/buying/doctype/purchase_order/purchase_order.js | 5 +++++
 erpnext/buying/doctype/purchase_order/purchase_order.py | 8 +++++++-
 erpnext/selling/doctype/sales_order/sales_order.js      | 8 ++++++++
 erpnext/selling/doctype/sales_order/sales_order.py      | 8 +++++++-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 52a0f4ac2a2..ced0b5fb4a1 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -6,8 +6,13 @@ frappe.provide("erpnext.accounts.dimensions");
 {% include 'erpnext/public/js/controllers/buying.js' %};
 
 frappe.ui.form.on("Purchase Order", {
+<<<<<<< HEAD
 	setup: function(frm) {
 
+=======
+	setup: function (frm) {
+		frm.ignore_doctypes_on_cancel_all = ["Unreconcile Payment", "Unreconcile Payment Entries"];
+>>>>>>> b618d685c6 (refactor: ignore unreconcile doc for PO and SO on cancel/delete)
 		if (frm.doc.is_old_subcontracting_flow) {
 			frm.set_query("reserve_warehouse", "supplied_items", function() {
 				return {
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index 58d7440211c..705e8fd6dd8 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -345,7 +345,13 @@ class PurchaseOrder(BuyingController):
 		update_linked_doc(self.doctype, self.name, self.inter_company_order_reference)
 
 	def on_cancel(self):
-		self.ignore_linked_doctypes = ("GL Entry", "Payment Ledger Entry")
+		self.ignore_linked_doctypes = (
+			"GL Entry",
+			"Payment Ledger Entry",
+			"Unreconcile Payment",
+			"Unreconcile Payment Entries",
+		)
+
 		super().on_cancel()
 
 		if self.is_against_so():
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 2995a1e99bc..d0f85790553 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -150,7 +150,15 @@ frappe.ui.form.on("Sales Order", {
 			frm.set_value("advance_paid", 0)
 		}
 
+<<<<<<< HEAD
 		frm.ignore_doctypes_on_cancel_all = ['Purchase Order'];
+=======
+		frm.ignore_doctypes_on_cancel_all = [
+			"Purchase Order",
+			"Unreconcile Payment",
+			"Unreconcile Payment Entries",
+		];
+>>>>>>> b618d685c6 (refactor: ignore unreconcile doc for PO and SO on cancel/delete)
 	},
 
 	delivery_date: function(frm) {
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 52b5e4051bb..5b4597125fb 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -269,7 +269,13 @@ class SalesOrder(SellingController):
 			update_coupon_code_count(self.coupon_code, "used")
 
 	def on_cancel(self):
-		self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Payment Ledger Entry")
+		self.ignore_linked_doctypes = (
+			"GL Entry",
+			"Stock Ledger Entry",
+			"Payment Ledger Entry",
+			"Unreconcile Payment",
+			"Unreconcile Payment Entries",
+		)
 		super().on_cancel()
 
 		# Cannot cancel closed SO