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

fix: Added filter to consider Tax Exemption Declaration if proof not submitted

Browse Source
This commit is contained in:
Nabin Hait
2022-02-23 16:01:50 +05:30
parent 535217a042
commit e3a53590de
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/payroll/report/income_tax_computation/income_tax_computation.js
View File

@@ -34,6 +34,12 @@ frappe.query_reports["Income Tax Computation"] = {
"fieldtype": "Link", "fieldtype": "Link",
"options": "Department", "options": "Department",
"width": "100px", "width": "100px",
},
{
"fieldname":"consider_tax_exemption_declaration",
"label": __("Consider Tax Exemption Declaration"),
"fieldtype": "Check",
"width": "180px"
} }
] ]
}; };

6
erpnext/payroll/report/income_tax_computation/income_tax_computation.py
View File

@@ -256,7 +256,8 @@ class IncomeTaxComputationReport(object):
self.employees_with_proofs = [] self.employees_with_proofs = []
self.get_tax_exemptions("Employee Tax Exemption Proof Submission") self.get_tax_exemptions("Employee Tax Exemption Proof Submission")
self.get_tax_exemptions("Employee Tax Exemption Declaration") if self.filters.consider_tax_exemption_declaration:
self.get_tax_exemptions("Employee Tax Exemption Declaration")
def get_tax_exemptions(self, source): def get_tax_exemptions(self, source):
# Get category-wise exmeptions based on submitted proofs or declarations # Get category-wise exmeptions based on submitted proofs or declarations
@@ -311,7 +312,8 @@ class IncomeTaxComputationReport(object):
self.employees_with_proofs = [] self.employees_with_proofs = []
self.get_eligible_hra("Employee Tax Exemption Proof Submission") self.get_eligible_hra("Employee Tax Exemption Proof Submission")
self.get_eligible_hra("Employee Tax Exemption Declaration") if self.filters.consider_tax_exemption_declaration:
self.get_eligible_hra("Employee Tax Exemption Declaration")
def get_eligible_hra(self, source): def get_eligible_hra(self, source):
if source == "Employee Tax Exemption Proof Submission": if source == "Employee Tax Exemption Proof Submission":