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

Merge pull request #51409 from ljain112/fix-tds-manual-entry-taxes

Browse Source 
fix(tds): always update item taxable value
This commit is contained in:
ruthra kumar
2025-12-31 15:13:53 +05:30
committed by GitHub
parent 87d00a373f 410a4b20af
commit 7811c08e2b
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
View File

@@ -1214,8 +1214,6 @@ class TestTaxWithholdingCategory(IntegrationTestCase):
# First invoice - below threshold, should be under withheld # First invoice - below threshold, should be under withheld
pi = create_purchase_invoice(supplier="Test TDS Supplier6", rate=4000, do_not_save=True) pi = create_purchase_invoice(supplier="Test TDS Supplier6", rate=4000, do_not_save=True)
pi.apply_tds = 1 pi.apply_tds = 1
pi.tax_withholding_category = "Test Multi Invoice Category"
pi.save()
pi.submit() pi.submit()
invoices.append(pi) invoices.append(pi)
@@ -1478,7 +1476,6 @@ class TestTaxWithholdingCategory(IntegrationTestCase):
pi = create_purchase_invoice(supplier="Test TDS Supplier6", rate=12000, do_not_save=True) pi = create_purchase_invoice(supplier="Test TDS Supplier6", rate=12000, do_not_save=True)
pi.apply_tds = 1 pi.apply_tds = 1
pi.tax_withholding_category = "Test Multi Invoice Category"
advances = pi.get_advance_entries() advances = pi.get_advance_entries()
pi.append( pi.append(
"advances", "advances",
@@ -2096,7 +2093,6 @@ class TestTaxWithholdingCategory(IntegrationTestCase):
# Create purchase invoice that settles the payment entry # Create purchase invoice that settles the payment entry
pi = create_purchase_invoice(supplier="Test TDS Supplier6", rate=8000, do_not_save=True) pi = create_purchase_invoice(supplier="Test TDS Supplier6", rate=8000, do_not_save=True)
pi.apply_tds = 1 pi.apply_tds = 1
pi.tax_withholding_category = "Test Multi Invoice Category"
advances = pi.get_advance_entries() advances = pi.get_advance_entries()
pi.append( pi.append(
"advances", "advances",
@@ -2719,7 +2715,6 @@ class TestTaxWithholdingCategory(IntegrationTestCase):
# Create purchase invoice with manual override # Create purchase invoice with manual override
pi = create_purchase_invoice(supplier="Test TDS Supplier6", rate=20000, do_not_save=True) pi = create_purchase_invoice(supplier="Test TDS Supplier6", rate=20000, do_not_save=True)
pi.apply_tds = 1 pi.apply_tds = 1
pi.tax_withholding_category = "Test Multi Invoice Category"
pi.ignore_tax_withholding_threshold = 1 pi.ignore_tax_withholding_threshold = 1
pi.save() pi.save()
@@ -2749,7 +2744,6 @@ class TestTaxWithholdingCategory(IntegrationTestCase):
# Step 2: Create Purchase Invoice with partial adjustment and manual rate change # Step 2: Create Purchase Invoice with partial adjustment and manual rate change
pi = create_purchase_invoice(supplier="Test TDS Supplier8", rate=80000, do_not_save=True) pi = create_purchase_invoice(supplier="Test TDS Supplier8", rate=80000, do_not_save=True)
pi.tax_withholding_category = "Test Multi Invoice Category"
pi.override_tax_withholding_entries = 1 # Enable manual override pi.override_tax_withholding_entries = 1 # Enable manual override
pi.tax_withholding_entries = [] pi.tax_withholding_entries = []
@@ -2790,6 +2784,7 @@ class TestTaxWithholdingCategory(IntegrationTestCase):
) )
pi.save() pi.save()
pi.reload()
pi.submit() pi.submit()
# Step 3: Verify the tax withholding entries # Step 3: Verify the tax withholding entries
@@ -2870,7 +2865,6 @@ class TestTaxWithholdingCategory(IntegrationTestCase):
# Step 2: Create Purchase Invoice with partial adjustment and manual rate change # Step 2: Create Purchase Invoice with partial adjustment and manual rate change
pi = create_purchase_invoice(supplier="Test TDS Supplier8", rate=80000, do_not_save=True) pi = create_purchase_invoice(supplier="Test TDS Supplier8", rate=80000, do_not_save=True)
pi.tax_withholding_category = "Test Multi Invoice Category"
pi.override_tax_withholding_entries = 1 # Enable manual override pi.override_tax_withholding_entries = 1 # Enable manual override
pi.tax_withholding_entries = [] pi.tax_withholding_entries = []
@@ -2911,6 +2905,7 @@ class TestTaxWithholdingCategory(IntegrationTestCase):
) )
pi.save() pi.save()
pi.reload()
pi.submit() pi.submit()
# Step 3: Verify the tax withholding entries # Step 3: Verify the tax withholding entries
@@ -2993,7 +2988,6 @@ class TestTaxWithholdingCategory(IntegrationTestCase):
self.validate_tax_withholding_entries("Payment Entry", pe.name, pe_expected) self.validate_tax_withholding_entries("Payment Entry", pe.name, pe_expected)
pi = create_purchase_invoice(supplier="Test TDS Supplier8", rate=50000, do_not_save=True) pi = create_purchase_invoice(supplier="Test TDS Supplier8", rate=50000, do_not_save=True)
pi.tax_withholding_category = "Test Multi Invoice Category"
pi.override_tax_withholding_entries = 1 pi.override_tax_withholding_entries = 1
pi.tax_withholding_entries = [] pi.tax_withholding_entries = []

11
erpnext/accounts/doctype/tax_withholding_entry/tax_withholding_entry.py
View File

@@ -377,30 +377,23 @@ class TaxWithholdingController:
return category_names return category_names
def calculate(self): def calculate(self):
# Always get category details first for account mapping
self.category_details = self._get_category_details() self.category_details = self._get_category_details()
self._update_taxable_amounts()
if not self.doc.override_tax_withholding_entries: if not self.doc.override_tax_withholding_entries:
self._generate_withholding_entries() self._generate_withholding_entries()
# Final processing - entry status and tax_update
self._process_withholding_entries() self._process_withholding_entries()
def _generate_withholding_entries(self): def _generate_withholding_entries(self):
# Clear existing entries
self.doc.tax_withholding_entries = [] self.doc.tax_withholding_entries = []
# Calculate taxable amounts for each category
self._update_taxable_amounts()
# Apply threshold rules
self._evaluate_thresholds() self._evaluate_thresholds()
# Generate entries for each category
for category in self.category_details.values(): for category in self.category_details.values():
self.entries += self._create_entries_for_category(category) self.entries += self._create_entries_for_category(category)
# Add all generated entries to the document
self.doc.extend("tax_withholding_entries", self.entries) self.doc.extend("tax_withholding_entries", self.entries)
def _create_entries_for_category(self, category): def _create_entries_for_category(self, category):