Merge pull request #35114 from saurabh6790/consider-standard-exemption

fix: allow user to set standard deductions in income tax slab without allowing other exemptions
frappe · May 2, 2023 · 2f74026 · 2f74026
2 parents 740313f + c5261cd
commit 2f74026
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/erpnext/payroll/doctype/income_tax_slab/income_tax_slab.json b/erpnext/payroll/doctype/income_tax_slab/income_tax_slab.json
@@ -67,7 +67,6 @@
    "label": "Disabled"
   },
   {
-   "depends_on": "allow_tax_exemption",
    "fieldname": "standard_tax_exemption_amount",
    "fieldtype": "Currency",
    "label": "Standard Tax Exemption Amount",
@@ -104,7 +103,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2021-03-31 22:42:08.139520",
+ "modified": "2023-05-01 13:42:08.139520",
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Income Tax Slab",

diff --git a/erpnext/payroll/doctype/salary_slip/salary_slip.py b/erpnext/payroll/doctype/salary_slip/salary_slip.py
@@ -1331,6 +1331,7 @@ def get_total_exemption_amount(self, payroll_period, tax_slab):
 				if declaration:
 					total_exemption_amount = declaration
 
+		if tax_slab.standard_tax_exemption_amount:
 			total_exemption_amount += flt(tax_slab.standard_tax_exemption_amount)
 
 		return total_exemption_amount