CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 18:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ljain112
2025-10-07 11:01:47 +05:30
parent c42dcbe739
commit d47f3cc101
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2575,20 +2575,12 @@ 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,
"base_net_rate": item.base_net_rate,
"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;

7
erpnext/stock/get_item_details.py
View File

@@ -704,15 +704,10 @@ def _get_item_tax_template(args, taxes, out=None, for_validate=False):
taxes_with_no_validity = []
for tax in taxes:
<<<<<<< HEAD
tax_company = frappe.get_cached_value("Item Tax Template", tax.item_tax_template, "company")
if tax_company == args["company"]:
=======
disabled, tax_company = frappe.get_cached_value(
"Item Tax Template", tax.item_tax_template, ["disabled", "company"]
)
if not disabled and tax_company == ctx["company"]:
>>>>>>> b10cf4a928 (fix: do not fetch disabled item tax template)
if not disabled and tax_company == args["company"]:
if tax.valid_from or tax.maximum_net_rate:
# In purchase Invoice first preference will be given to supplier invoice date
# if supplier date is not present then posting date