nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: ignore unreconcile doc for PO and SO on cancel/delete

Browse Source 
(cherry picked from commit b618d685c6)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.js
#	erpnext/selling/doctype/sales_order/sales_order.js
This commit is contained in:
ljain112
2024-06-14 13:13:11 +05:30
committed by Mergify
parent 077cb9e983
commit f833923f2f
4 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/buying/doctype/purchase_order/purchase_order.js
View File

@@ -6,8 +6,13 @@ frappe.provide("erpnext.accounts.dimensions");
{% include 'erpnext/public/js/controllers/buying.js' %}; {% include 'erpnext/public/js/controllers/buying.js' %};
frappe.ui.form.on("Purchase Order", { frappe.ui.form.on("Purchase Order", {
<<<<<<< HEAD
setup: function(frm) { 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) { if (frm.doc.is_old_subcontracting_flow) {
frm.set_query("reserve_warehouse", "supplied_items", function() { frm.set_query("reserve_warehouse", "supplied_items", function() {
return { return {

8
erpnext/buying/doctype/purchase_order/purchase_order.py
View File

@@ -345,7 +345,13 @@ class PurchaseOrder(BuyingController):
update_linked_doc(self.doctype, self.name, self.inter_company_order_reference) update_linked_doc(self.doctype, self.name, self.inter_company_order_reference)
def on_cancel(self): 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() super().on_cancel()
if self.is_against_so(): if self.is_against_so():

8
erpnext/selling/doctype/sales_order/sales_order.js
View File

@@ -150,7 +150,15 @@ frappe.ui.form.on("Sales Order", {
frm.set_value("advance_paid", 0) frm.set_value("advance_paid", 0)
} }
<<<<<<< HEAD
frm.ignore_doctypes_on_cancel_all = ['Purchase Order']; 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) { delivery_date: function(frm) {

8
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -269,7 +269,13 @@ class SalesOrder(SellingController):
update_coupon_code_count(self.coupon_code, "used") update_coupon_code_count(self.coupon_code, "used")
def on_cancel(self): 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() super().on_cancel()
# Cannot cancel closed SO # Cannot cancel closed SO