From 4f9744a56dd1208a541dc89f02e04b512c164640 Mon Sep 17 00:00:00 2001
From: Ranjith Kurungadam <rkurungadam@gmail.com>
Date: Wed, 20 Jun 2018 11:10:56 +0530
Subject: [PATCH] HRA fix (#14589)

* hra - fix var ref before assignment

* Tax Exemption Category - remove deduction component
---
 .../employee_tax_exemption_category.json      | 36 ++-----------------
 erpnext/regional/india/utils.py               |  6 ++--
 2 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/erpnext/hr/doctype/employee_tax_exemption_category/employee_tax_exemption_category.json b/erpnext/hr/doctype/employee_tax_exemption_category/employee_tax_exemption_category.json
index 9a4c1817e4..7b2804b326 100644
--- a/erpnext/hr/doctype/employee_tax_exemption_category/employee_tax_exemption_category.json
+++ b/erpnext/hr/doctype/employee_tax_exemption_category/employee_tax_exemption_category.json
@@ -15,38 +15,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
-   "allow_on_submit": 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_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -78,6 +47,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -118,7 +88,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-13 19:29:34.579934", 
+ "modified": "2018-06-19 16:33:48.419267", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee Tax Exemption Category", 
diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py
index 273912b95f..c88001ea11 100644
--- a/erpnext/regional/india/utils.py
+++ b/erpnext/regional/india/utils.py
@@ -192,6 +192,6 @@ def calculate_hra_exemption_for_period(doc):
 		if exemptions["monthly_exemption"]:
 			# calc total exemption amount
 			eligible_hra = exemptions["monthly_exemption"] * factor
-	exemptions["monthly_house_rent"] = monthly_rent
-	exemptions["total_eligible_hra_exemption"] = eligible_hra
-	return exemptions
+		exemptions["monthly_house_rent"] = monthly_rent
+		exemptions["total_eligible_hra_exemption"] = eligible_hra
+		return exemptions