diff --git a/erpnext/hr/doctype/salary_detail/salary_detail.json b/erpnext/hr/doctype/salary_detail/salary_detail.json index d8097875be..3bb621bb62 100644 --- a/erpnext/hr/doctype/salary_detail/salary_detail.json +++ b/erpnext/hr/doctype/salary_detail/salary_detail.json @@ -14,6 +14,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "salary_component", "fieldtype": "Link", "hidden": 0, @@ -21,7 +22,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, - "label": "Component", + "label": "Component", "length": 0, "no_copy": 0, "options": "Salary Component", @@ -40,6 +41,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 1, "depends_on": "eval:doc.parenttype=='Salary Structure'", "fieldname": "abbr", "fieldtype": "Data", @@ -47,7 +49,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "label": "Abbr", "length": 0, "no_copy": 0, @@ -67,6 +69,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_2", "fieldtype": "Section Break", "hidden": 0, @@ -91,6 +94,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.parenttype=='Salary Structure'", "fieldname": "condition", "fieldtype": "Code", @@ -117,6 +121,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "1", "depends_on": "eval:doc.parenttype=='Salary Structure'", "fieldname": "amount_based_on_formula", @@ -145,8 +150,9 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "", - "depends_on": "eval:doc.amount_based_on_formula!=0 && doc.parenttype=='Salary Structure'", + "depends_on": "eval:doc.amount_based_on_formula!==0 && doc.parenttype==='Salary Structure'", "description": "", "fieldname": "formula", "fieldtype": "Code", @@ -154,7 +160,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "label": "Formula", "length": 0, "no_copy": 0, @@ -173,30 +179,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "section_break_8", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.amount_based_on_formula!==1 || doc.parenttype==='Salary Slip'", "fieldname": "amount", "fieldtype": "Currency", @@ -204,7 +187,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "label": "Amount", "length": 0, "no_copy": 0, @@ -224,6 +207,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "", "fieldname": "depends_on_lwp", "fieldtype": "Check", @@ -250,6 +234,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.parenttype=='Salary Structure'", "fieldname": "default_amount", "fieldtype": "Currency", @@ -277,9 +262,10 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.parenttype=='Salary Structure'", "fieldname": "section_break_11", - "fieldtype": "Section Break", + "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -302,6 +288,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.parenttype=='Salary Structure'", "fieldname": "condition_and_formula_help", "fieldtype": "HTML", @@ -336,7 +323,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-08-22 00:25:44.331685", + "modified": "2016-08-23 15:26:07.754570", "modified_by": "Administrator", "module": "HR", "name": "Salary Detail", diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.js b/erpnext/hr/doctype/salary_slip/salary_slip.js index 3b6eef8373..4c60fbad55 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.js +++ b/erpnext/hr/doctype/salary_slip/salary_slip.js @@ -24,6 +24,9 @@ frappe.ui.form.on("Salary Slip", { refresh: function(frm) { frm.trigger("toggle_fields") + salary_detail_fields = ['formula', 'abbr'] + cur_frm.fields_dict['earnings'].grid.set_column_disp(salary_detail_fields,false); + cur_frm.fields_dict['deductions'].grid.set_column_disp(salary_detail_fields,false); }, salary_slip_based_on_timesheet: function(frm) { diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index c82dcf5b06..1918f921c7 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -271,7 +271,7 @@ class SalarySlip(TransactionBase): def calculate_lwp(self, holidays, working_days): lwp = 0 for d in range(working_days): - dt = add_days(cstr(self.start_date), d) + dt = add_days(cstr(getdate(self.start_date)), d) if dt not in holidays: leave = frappe.db.sql(""" select t1.name, t1.half_day diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.json b/erpnext/hr/doctype/salary_structure/salary_structure.json index 7ee42049f9..5abebef52c 100644 --- a/erpnext/hr/doctype/salary_structure/salary_structure.json +++ b/erpnext/hr/doctype/salary_structure/salary_structure.json @@ -15,6 +15,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break0", "fieldtype": "Column Break", "hidden": 0, @@ -39,6 +40,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "company", "fieldtype": "Link", "hidden": 0, @@ -64,6 +66,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "letter_head", "fieldtype": "Link", "hidden": 0, @@ -90,6 +93,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break1", "fieldtype": "Column Break", "hidden": 0, @@ -114,6 +118,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "Yes", "fieldname": "is_active", "fieldtype": "Select", @@ -142,6 +147,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "No", "fieldname": "is_default", "fieldtype": "Select", @@ -169,6 +175,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "from_date", "fieldtype": "Date", "hidden": 0, @@ -195,6 +202,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "to_date", "fieldtype": "Date", "hidden": 0, @@ -221,6 +229,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "employee_break", "fieldtype": "Section Break", "hidden": 0, @@ -245,6 +254,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Select employees for current Salary Structure", "fieldname": "employees", "fieldtype": "Table", @@ -272,6 +282,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "time_sheet_earning_detail", "fieldtype": "Section Break", "hidden": 0, @@ -297,6 +308,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "", "fieldname": "salary_slip_based_on_timesheet", "fieldtype": "Check", @@ -323,6 +335,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_17", "fieldtype": "Column Break", "hidden": 0, @@ -347,6 +360,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "", "description": "Salary Component for timesheet based payroll.", "fieldname": "salary_component", @@ -375,6 +389,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "", "fieldname": "hour_rate", "fieldtype": "Currency", @@ -401,6 +416,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "", "description": "Salary breakup based on Earning and Deduction.", "fieldname": "earning_deduction", @@ -430,8 +446,9 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "earning", - "fieldtype": "Column Break", + "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -457,6 +474,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "", "fieldname": "earnings", "fieldtype": "Table", @@ -485,8 +503,9 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "deduction", - "fieldtype": "Column Break", + "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -512,6 +531,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "deductions", "fieldtype": "Table", "hidden": 0, @@ -539,6 +559,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "", "fieldname": "net_pay_detail", "fieldtype": "Section Break", @@ -564,6 +585,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break2", "fieldtype": "Column Break", "hidden": 0, @@ -588,6 +610,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total_earning", "fieldtype": "Currency", "hidden": 1, @@ -615,6 +638,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total_deduction", "fieldtype": "Currency", "hidden": 1, @@ -642,6 +666,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_pay", "fieldtype": "Currency", "hidden": 1, @@ -675,7 +700,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-08-10 12:18:31.521436", + "modified": "2016-08-23 12:49:41.258649", "modified_by": "Administrator", "module": "HR", "name": "Salary Structure",