nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-17 08:28:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(taxes): add category and add_deduct_tax fields to tax entries (backport #55753) (#55773)

Browse Source 
Co-authored-by: Lakshit Jain <ljain112@gmail.com>
fix(taxes): add category and add_deduct_tax fields to tax entries (#55753)
This commit is contained in:
mergify[bot]
2026-06-09 12:59:13 +00:00
committed by GitHub
parent 7904385b90
commit 9a6fae9fdd
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
erpnext/controllers/tests/test_accounts_controller.py
View File

@@ -988,6 +988,34 @@ class TestAccountsController(ERPNextTestSuite):
self.assertEqual(sinv.taxes[0].account_head, "_Test Account Excise Duty - _TC") self.assertEqual(sinv.taxes[0].account_head, "_Test Account Excise Duty - _TC")
self.assertEqual(sinv.total_taxes_and_charges, 5) self.assertEqual(sinv.total_taxes_and_charges, 5)
@ERPNextTestSuite.change_settings(
"Accounts Settings",
{"add_taxes_from_item_tax_template": 1, "add_taxes_from_taxes_and_charges_template": 0},
)
def test_19b_fetch_taxes_from_item_tax_template_purchase_invoice(self):
pinv = frappe.new_doc("Purchase Invoice")
pinv.supplier = "_Test Supplier"
pinv.company = self.company
pinv.currency = "INR"
item = pinv.append(
"items",
{
"item_code": "_Test Item",
"qty": 1,
"rate": 50,
"item_tax_template": "_Test Account Excise Duty @ 10 - _TC",
},
)
item_details = pinv.fetch_item_details(item)
pinv.add_taxes_from_item_template(item, item_details)
self.assertEqual(len(pinv.taxes), 1)
tax_row = pinv.taxes[0]
self.assertEqual(tax_row.account_head, "_Test Account Excise Duty - _TC")
self.assertEqual(tax_row.category, "Total")
self.assertEqual(tax_row.add_deduct_tax, "Add")
def test_20_journal_against_sales_invoice(self): def test_20_journal_against_sales_invoice(self):
# Invoice in Foreign Currency # Invoice in Foreign Currency
si = self.create_sales_invoice(qty=1, conversion_rate=80, rate=1) si = self.create_sales_invoice(qty=1, conversion_rate=80, rate=1)

7
erpnext/utilities/transaction_base.py
View File

@@ -430,7 +430,12 @@ class TransactionBase(StatusUpdater):
found = [x for x in self.taxes if x.account_head == tax_head] found = [x for x in self.taxes if x.account_head == tax_head]
if not found: if not found:
self.append("taxes", {"charge_type": "On Net Total", "account_head": tax_head, "rate": 0}) child_doctype = self.get_table_field_doctype("taxes")
child = frappe.new_doc(child_doctype, parent_doc=self, parentfield="taxes")
child.charge_type = "On Net Total"
child.account_head = tax_head
child.rate = 0
self.append("taxes", child)
def set_rate_based_on_price_list(self, item_obj: object, item_details: dict) -> None: def set_rate_based_on_price_list(self, item_obj: object, item_details: dict) -> None:
if item_obj.price_list_rate and item_obj.discount_percentage: if item_obj.price_list_rate and item_obj.discount_percentage: