nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-13 11:55:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ignore is overridden by transaction.js upon clicking cancel

Browse Source 
which overrides with 'Serial and Batch Bundle'

(cherry picked from commit cf70147c0d)
This commit is contained in:
ruthra kumar
2025-07-29 16:26:57 +05:30
committed by Mergify
parent 9508ae5044
commit 424baed077
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,6 @@ erpnext.buying.setup_buying_controller();
frappe.ui.form.on("Purchase Order", { frappe.ui.form.on("Purchase Order", {
setup: function (frm) { setup: function (frm) {
frm.ignore_doctypes_on_cancel_all = ["Unreconcile Payment", "Unreconcile Payment Entries"];
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 {
@@ -140,6 +139,10 @@ frappe.ui.form.on("Purchase Order", {
}, },
onload: function (frm) { onload: function (frm) {
var ignore_list = ["Unreconcile Payment", "Unreconcile Payment Entries"];
frm.ignore_doctypes_on_cancel_all = Object.hasOwn(frm, "ignore_doctypes_on_cancel_all")
? frm.ignore_doctypes_on_cancel_all.concat(ignore_list)
: ignore_list;
set_schedule_date(frm); set_schedule_date(frm);
if (!frm.doc.transaction_date) { if (!frm.doc.transaction_date) {
frm.set_value("transaction_date", frappe.datetime.get_today()); frm.set_value("transaction_date", frappe.datetime.get_today());