nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix Salary Component (#14783)

Browse Source
This commit is contained in:
Ranjith Kurungadam
2018-07-03 10:05:01 +05:30
committed by Nabin Hait
parent e734b7c17b
commit 273e8e59ca
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/doctype/salary_component/salary_component.js
View File

@@ -27,11 +27,15 @@ frappe.ui.form.on('Salary Component', {
if(frm.doc.is_flexible_benefit){ if(frm.doc.is_flexible_benefit){
set_value_for_condition_and_formula(frm); set_value_for_condition_and_formula(frm);
frm.set_value("is_additional_component", 0); frm.set_value("is_additional_component", 0);
frm.set_value("formula", '');
frm.set_value("amount", 0);
} }
}, },
is_additional_component: function(frm) { is_additional_component: function(frm) {
if(frm.doc.is_additional_component){ if(frm.doc.is_additional_component){
frm.set_value("is_flexible_benefit", 0); frm.set_value("is_flexible_benefit", 0);
frm.set_value("formula", '');
frm.set_value("amount", 0);
} }
}, },
type: function(frm) { type: function(frm) {

4
erpnext/hr/doctype/salary_component/salary_component.json
View File

@@ -770,7 +770,7 @@
"collapsible": 1, "collapsible": 1,
"collapsible_depends_on": "", "collapsible_depends_on": "",
"columns": 0, "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", "fieldname": "condition_and_formula",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hidden": 0, "hidden": 0,
@@ -1003,7 +1003,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-06-29 17:44:14.491265", "modified": "2018-07-02 16:55:44.467519",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Salary Component", "name": "Salary Component",