From 2fabcb0c50c8b76e8b13a4b50497b19ef8bad308 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 18 Jun 2024 10:43:07 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/buying/doctype/purchase_order/purchase_order.js | 5 ----- erpnext/selling/doctype/sales_order/sales_order.js | 4 ---- 2 files changed, 9 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index ced0b5fb4a1..1abd10ec3f8 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -6,13 +6,8 @@ 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/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index d0f85790553..db3d6c2ca54 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -150,15 +150,11 @@ 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) {