diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py index 4e9e91ef3b8..6ec5c26e7d3 100644 --- a/erpnext/config/hr.py +++ b/erpnext/config/hr.py @@ -23,10 +23,6 @@ def get_data(): "type": "doctype", "name": "Attendance Request", }, - { - "type": "doctype", - "name": "Attendance Request", - }, { "type": "doctype", "name": "Upload Attendance", @@ -131,6 +127,10 @@ def get_data(): "type": "doctype", "name": "Employee Tax Exemption Category", }, + { + "type": "doctype", + "name": "Employee Tax Exemption Sub Category" + } ] }, { diff --git a/erpnext/hr/doctype/employee_tax_exemption_declaration_category/employee_tax_exemption_declaration_category.json b/erpnext/hr/doctype/employee_tax_exemption_declaration_category/employee_tax_exemption_declaration_category.json index 48a5dd09db4..bdaf9bf3d0d 100644 --- a/erpnext/hr/doctype/employee_tax_exemption_declaration_category/employee_tax_exemption_declaration_category.json +++ b/erpnext/hr/doctype/employee_tax_exemption_declaration_category/employee_tax_exemption_declaration_category.json @@ -18,7 +18,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "exemption_category", + "fieldname": "exemption_sub_category", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, @@ -27,10 +27,41 @@ "in_global_search": 0, "in_list_view": 1, "in_standard_filter": 0, - "label": "Exemption Category", + "label": "Exemption Sub Category", "length": 0, "no_copy": 0, - "options": "Employee Tax Exemption Category", + "options": "Employee Tax Exemption Sub Category", + "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, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "exemption_category", + "fieldtype": "Read Only", + "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": "Exemption Category", + "length": 0, + "no_copy": 0, + "options": "exemption_sub_category.exemption_category", "permlevel": 0, "precision": "", "print_hide": 0, @@ -41,7 +72,6 @@ "reqd": 1, "search_index": 0, "set_only_once": 0, - "translatable": 0, "unique": 0 }, { @@ -72,7 +102,6 @@ "reqd": 1, "search_index": 0, "set_only_once": 0, - "translatable": 0, "unique": 0 } ], @@ -86,7 +115,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2018-04-13 19:24:18.076613", + "modified": "2018-05-09 13:30:44.363393", "modified_by": "Administrator", "module": "HR", "name": "Employee Tax Exemption Declaration Category", diff --git a/erpnext/hr/doctype/employee_tax_exemption_proof_submission_detail/employee_tax_exemption_proof_submission_detail.json b/erpnext/hr/doctype/employee_tax_exemption_proof_submission_detail/employee_tax_exemption_proof_submission_detail.json index 509e425270d..37259007728 100644 --- a/erpnext/hr/doctype/employee_tax_exemption_proof_submission_detail/employee_tax_exemption_proof_submission_detail.json +++ b/erpnext/hr/doctype/employee_tax_exemption_proof_submission_detail/employee_tax_exemption_proof_submission_detail.json @@ -18,7 +18,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "exemption_category", + "fieldname": "exemption_sub_category", "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, @@ -27,10 +27,41 @@ "in_global_search": 0, "in_list_view": 1, "in_standard_filter": 0, - "label": "Exemption Category", + "label": "Exemption Sub Category", "length": 0, "no_copy": 0, - "options": "Employee Tax Exemption Category", + "options": "Employee Tax Exemption Sub Category", + "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, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "exemption_category", + "fieldtype": "Read Only", + "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": "Exemption Category", + "length": 0, + "no_copy": 0, + "options": "exemption_sub_category.exemption_category", "permlevel": 0, "precision": "", "print_hide": 0, @@ -41,7 +72,6 @@ "reqd": 1, "search_index": 0, "set_only_once": 0, - "translatable": 0, "unique": 0 }, { @@ -73,7 +103,6 @@ "reqd": 1, "search_index": 0, "set_only_once": 0, - "translatable": 0, "unique": 0 }, { @@ -104,7 +133,6 @@ "reqd": 1, "search_index": 0, "set_only_once": 0, - "translatable": 0, "unique": 0 } ], @@ -118,7 +146,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2018-04-13 17:19:03.006149", + "modified": "2018-05-09 13:53:22.563316", "modified_by": "Administrator", "module": "HR", "name": "Employee Tax Exemption Proof Submission Detail",