From 819667ab24c58acc5c728f526e4212e2dc16a414 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 7 Oct 2025 11:00:45 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/public/js/controllers/transaction.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index c1f014fb971..5fa63cb9c02 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -2200,19 +2200,11 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe return doc.company ? {filters: {company: doc.company}} : {}; } else { let filters = { -<<<<<<< HEAD 'item_code': item.item_code, 'valid_from': ["<=", doc.transaction_date || doc.bill_date || doc.posting_date], 'item_group': item.item_group, + 'disabled': 0, } -======= - item_code: item.item_code, - valid_from: ["<=", doc.transaction_date || doc.bill_date || doc.posting_date], - item_group: item.item_group, - base_net_rate: item.base_net_rate, - disabled: 0, - }; ->>>>>>> b10cf4a928 (fix: do not fetch disabled item tax template) if (doc.tax_category) filters['tax_category'] = doc.tax_category;