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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-10-07 11:00:45 +05:30
committed by GitHub
parent aa20e224fb
commit 819667ab24
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/public/js/controllers/transaction.js
View File

@@ -2200,19 +2200,11 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
return doc.company ? {filters: {company: doc.company}} : {}; return doc.company ? {filters: {company: doc.company}} : {};
} else { } else {
let filters = { let filters = {
<<<<<<< HEAD
'item_code': item.item_code, 'item_code': item.item_code,
'valid_from': ["<=", doc.transaction_date || doc.bill_date || doc.posting_date], 'valid_from': ["<=", doc.transaction_date || doc.bill_date || doc.posting_date],
'item_group': item.item_group, '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) if (doc.tax_category)
filters['tax_category'] = doc.tax_category; filters['tax_category'] = doc.tax_category;