From d1f9444be70a04628deb9de147626b2d26681c27 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 28 Mar 2025 23:43:25 +0530 Subject: [PATCH 1/2] fix: incorrect condition (cherry picked from commit 0c1a8e9c58a0776bcdb7d4781416bc2d40e98a76) # Conflicts: # erpnext/public/js/controllers/transaction.js --- erpnext/public/js/controllers/transaction.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index a424d01489d..434a56ace0a 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -297,7 +297,11 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe let d = locals[cdt][cdn]; return { filters: { +<<<<<<< HEAD docstatus: 1, +======= + docstatus: ["<", 2], +>>>>>>> 0c1a8e9c58 (fix: incorrect condition) inspection_type: inspection_type, reference_name: doc.name, item_code: d.item_code From a8831351e37736261b5c762802d4e76e1582f7e7 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Sat, 29 Mar 2025 12:16:17 +0530 Subject: [PATCH 2/2] chore: fix conflicts --- erpnext/public/js/controllers/transaction.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 434a56ace0a..7ab8533368f 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -297,11 +297,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe let d = locals[cdt][cdn]; return { filters: { -<<<<<<< HEAD - docstatus: 1, -======= docstatus: ["<", 2], ->>>>>>> 0c1a8e9c58 (fix: incorrect condition) inspection_type: inspection_type, reference_name: doc.name, item_code: d.item_code