fix Salary Component (#14783)
This commit is contained in:
parent
e734b7c17b
commit
273e8e59ca
@ -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) {
|
||||
|
@ -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",
|
||||
|
Loading…
x
Reference in New Issue
Block a user