Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HRA fix (#14589)

Browse Source 
* hra - fix var ref before assignment

* Tax Exemption Category - remove deduction component
This commit is contained in:
Ranjith Kurungadam 2018-06-20 11:10:56 +05:30 committed by Nabin Hait
parent 55a2f4da71
commit 4f9744a56d
2 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
erpnext/hr/doctype/employee_tax_exemption_category/employee_tax_exemption_category.json
View File

@ -15,38 +15,7 @@
"fields": [ "fields": [
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_on_submit": 0, "allow_in_quick_entry": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "deduction_component",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Deduction Component",
"length": 0,
"no_copy": 0,
"options": "Salary Component",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
@ -78,6 +47,7 @@
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
@ -118,7 +88,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-04-13 19:29:34.579934", "modified": "2018-06-19 16:33:48.419267",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Employee Tax Exemption Category", "name": "Employee Tax Exemption Category",

6
erpnext/regional/india/utils.py
View File

@ -192,6 +192,6 @@ def calculate_hra_exemption_for_period(doc):
if exemptions["monthly_exemption"]: if exemptions["monthly_exemption"]:
# calc total exemption amount # calc total exemption amount
eligible_hra = exemptions["monthly_exemption"] * factor eligible_hra = exemptions["monthly_exemption"] * factor
exemptions["monthly_house_rent"] = monthly_rent exemptions["monthly_house_rent"] = monthly_rent
exemptions["total_eligible_hra_exemption"] = eligible_hra exemptions["total_eligible_hra_exemption"] = eligible_hra
return exemptions return exemptions