From 5748cde54ba33512382c106c04b24b4080697b73 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 31 Dec 2019 17:17:54 +0530 Subject: [PATCH] fix: minor field arrangements --- erpnext/hr/doctype/salary_detail/salary_detail.json | 6 +++--- erpnext/hr/doctype/salary_slip/salary_slip.json | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/erpnext/hr/doctype/salary_detail/salary_detail.json b/erpnext/hr/doctype/salary_detail/salary_detail.json index 3e6161694e..bde735d3bc 100644 --- a/erpnext/hr/doctype/salary_detail/salary_detail.json +++ b/erpnext/hr/doctype/salary_detail/salary_detail.json @@ -7,10 +7,10 @@ "field_order": [ "salary_component", "abbr", + "statistical_component", + "column_break_3", "deduct_full_tax_on_selected_payroll_date", "depends_on_payment_days", - "column_break_3", - "statistical_component", "is_tax_applicable", "is_flexible_benefit", "variable_based_on_taxable_salary", @@ -191,7 +191,7 @@ ], "istable": 1, "links": [], - "modified": "2019-12-12 15:36:46.103938", + "modified": "2019-12-31 17:15:25.646689", "modified_by": "Administrator", "module": "HR", "name": "Salary Detail", diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json index da26007f8a..e73d41a28e 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.json +++ b/erpnext/hr/doctype/salary_slip/salary_slip.json @@ -309,7 +309,6 @@ { "fieldname": "earning", "fieldtype": "Column Break", - "label": "Earning", "oldfieldtype": "Column Break", "width": "50%" }, @@ -324,7 +323,6 @@ { "fieldname": "deduction", "fieldtype": "Column Break", - "label": "Deduction", "oldfieldtype": "Column Break", "width": "50%" }, @@ -466,7 +464,7 @@ "idx": 9, "is_submittable": 1, "links": [], - "modified": "2019-12-12 15:30:23.678933", + "modified": "2019-12-31 17:13:45.146271", "modified_by": "Administrator", "module": "HR", "name": "Salary Slip",