Renamed some salary related fields
diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.json b/erpnext/hr/doctype/payroll_entry/payroll_entry.json
index 0af6d5d..54f1e45 100644
--- a/erpnext/hr/doctype/payroll_entry/payroll_entry.json
+++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.json
@@ -588,7 +588,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "include_unclaimed_employee_benefits",
+ "fieldname": "deduct_tax_for_unclaimed_employee_benefits",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -597,7 +597,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Include Unclaimed Employee Benefits",
+ "label": "Deduct Tax For Unclaimed Employee Benefits",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -968,7 +968,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2018-04-13 17:28:42.759513",
+ "modified": "2018-04-27 12:42:45.054509",
"modified_by": "Administrator",
"module": "HR",
"name": "Payroll Entry",
diff --git a/erpnext/hr/doctype/salary_component/salary_component.json b/erpnext/hr/doctype/salary_component/salary_component.json
index ac8e51d..27b4bef 100644
--- a/erpnext/hr/doctype/salary_component/salary_component.json
+++ b/erpnext/hr/doctype/salary_component/salary_component.json
@@ -144,6 +144,37 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fieldname": "disabled",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Disabled",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "translatable": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "description",
"fieldtype": "Small Text",
"hidden": 0,
@@ -239,8 +270,8 @@
"collapsible": 0,
"columns": 0,
"depends_on": "is_flexible_benefit",
- "fieldname": "is_pro_rata_applicable",
- "fieldtype": "Check",
+ "fieldname": "max_benefit_amount",
+ "fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -248,7 +279,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Is Pro-rata Applicable",
+ "label": "Max Benefit Amount (Yearly)",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -270,6 +301,39 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "depends_on": "is_flexible_benefit",
+ "fieldname": "earning_component_group",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Earning Component Group",
+ "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": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "translatable": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_9",
"fieldtype": "Column Break",
"hidden": 0,
@@ -301,8 +365,8 @@
"collapsible": 0,
"columns": 0,
"depends_on": "is_flexible_benefit",
- "fieldname": "max_benefit",
- "fieldtype": "Currency",
+ "fieldname": "is_pro_rata_applicable",
+ "fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -310,7 +374,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Max Benefit (Amount)",
+ "label": "Is Pro-rata Applicable",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -333,8 +397,8 @@
"collapsible": 0,
"columns": 0,
"depends_on": "is_flexible_benefit",
- "fieldname": "earning_component_if_unclaimed",
- "fieldtype": "Link",
+ "fieldname": "only_tax_impact",
+ "fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -342,10 +406,40 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Earning Component If Unclaimed",
+ "label": "Only Tax Impact (Cannot Claim But Part of Taxable Income)",
"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": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "translatable": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "create_separate_payment_entry_against_benefit_claim",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Create Separate Payment Entry Against Benefit Claim",
+ "length": 0,
+ "no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -529,7 +623,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2018-04-13 20:10:20.771538",
+ "modified": "2018-04-27 13:23:34.503504",
"modified_by": "Administrator",
"module": "HR",
"name": "Salary Component",
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json
index 240e3cf..6f524f2 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json
@@ -1044,7 +1044,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "include_unclaimed_employee_benefits",
+ "fieldname": "deduct_tax_for_unclaimed_employee_benefits",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -1053,7 +1053,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Include Unclaimed Employee Benefits",
+ "label": "Deduct Tax For Unclaimed Employee Benefits",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1435,7 +1435,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Loan",
+ "label": "Employee Loan",
"length": 0,
"no_copy": 0,
"options": "Salary Slip Loan",
@@ -1812,7 +1812,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2018-04-13 20:14:23.105069",
+ "modified": "2018-04-27 12:42:21.278360",
"modified_by": "Administrator",
"module": "HR",
"name": "Salary Slip",
@@ -1835,7 +1835,6 @@
"set_user_permissions": 0,
"share": 1,
"submit": 1,
- "user_permission_doctypes": "[\"Branch\",\"Company\",\"Department\",\"Designation\",\"Fiscal Year\",\"Salary Slip\"]",
"write": 1
},
{
@@ -1874,7 +1873,6 @@
"set_user_permissions": 0,
"share": 0,
"submit": 0,
- "user_permission_doctypes": "[\"Employee\"]",
"write": 0
}
],
diff --git a/erpnext/patches/v11_0/create_salary_structure_assignments.py b/erpnext/patches/v11_0/create_salary_structure_assignments.py
index fc3a431..289554e 100644
--- a/erpnext/patches/v11_0/create_salary_structure_assignments.py
+++ b/erpnext/patches/v11_0/create_salary_structure_assignments.py
@@ -9,7 +9,6 @@
for d in frappe.db.sql("""
select sse.*, ss.company from `tabSalary Structure Employee` sse, `tabSalary Structure` ss
where ss.name = sse.parent""", as_dict=1):
- print(d)
s = frappe.new_doc("Salary Structure Assignment")
s.employee = d.employee
s.employee_name = d.employee_name
diff --git a/erpnext/patches/v11_0/make_quality_inspection_template.py b/erpnext/patches/v11_0/make_quality_inspection_template.py
index 67755e8..9720af4 100644
--- a/erpnext/patches/v11_0/make_quality_inspection_template.py
+++ b/erpnext/patches/v11_0/make_quality_inspection_template.py
@@ -5,8 +5,8 @@
import frappe
def execute():
- frappe.reload_doc('stock', 'doctype', 'item')
frappe.reload_doc('stock', 'doctype', 'quality_inspection_template')
+ frappe.reload_doc('stock', 'doctype', 'item')
for data in frappe.get_all('Item Quality Inspection Parameter',
fields = ["distinct parent"], filters = {'parenttype': 'Item'}):
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index caa44ac..21900ad 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -3717,7 +3717,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 1,
- "modified": "2018-04-11 12:21:48.715529",
+ "modified": "2018-04-30 12:21:48.715529",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item",