From 273e8e59cad3a9855250982c33973c8fe40852af Mon Sep 17 00:00:00 2001 From: Ranjith Kurungadam Date: Tue, 3 Jul 2018 10:05:01 +0530 Subject: [PATCH] fix Salary Component (#14783) --- erpnext/hr/doctype/salary_component/salary_component.js | 4 ++++ erpnext/hr/doctype/salary_component/salary_component.json | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/salary_component/salary_component.js b/erpnext/hr/doctype/salary_component/salary_component.js index 74afd54cfc..b33451bc35 100644 --- a/erpnext/hr/doctype/salary_component/salary_component.js +++ b/erpnext/hr/doctype/salary_component/salary_component.js @@ -27,11 +27,15 @@ frappe.ui.form.on('Salary Component', { if(frm.doc.is_flexible_benefit){ set_value_for_condition_and_formula(frm); frm.set_value("is_additional_component", 0); + frm.set_value("formula", ''); + frm.set_value("amount", 0); } }, is_additional_component: function(frm) { if(frm.doc.is_additional_component){ frm.set_value("is_flexible_benefit", 0); + frm.set_value("formula", ''); + frm.set_value("amount", 0); } }, type: function(frm) { diff --git a/erpnext/hr/doctype/salary_component/salary_component.json b/erpnext/hr/doctype/salary_component/salary_component.json index 40af90f1e6..4221916469 100644 --- a/erpnext/hr/doctype/salary_component/salary_component.json +++ b/erpnext/hr/doctype/salary_component/salary_component.json @@ -770,7 +770,7 @@ "collapsible": 1, "collapsible_depends_on": "", "columns": 0, - "depends_on": "eval:doc.is_flexible_benefit != 1 && doc.variable_based_on_taxable_salary != 1", + "depends_on": "eval:doc.is_flexible_benefit != 1 && doc.variable_based_on_taxable_salary != 1 && doc.is_additional_component != 1", "fieldname": "condition_and_formula", "fieldtype": "Section Break", "hidden": 0, @@ -1003,7 +1003,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2018-06-29 17:44:14.491265", + "modified": "2018-07-02 16:55:44.467519", "modified_by": "Administrator", "module": "HR", "name": "Salary Component",