Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Salary Component - field display, value dependency (#14747)

Browse Source
This commit is contained in:
Ranjith Kurungadam 2018-06-29 16:53:56 +05:30 committed by Nabin Hait
parent b402ccc0b5
commit fd7ef2e15c
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,10 +52,16 @@ frappe.ui.form.on('Salary Component', {
create_separate_payment_entry_against_benefit_claim: function(frm) { create_separate_payment_entry_against_benefit_claim: function(frm) {
if(frm.doc.create_separate_payment_entry_against_benefit_claim){ if(frm.doc.create_separate_payment_entry_against_benefit_claim){
frm.set_df_property("accounts", "reqd", 1); frm.set_df_property("accounts", "reqd", 1);
frm.set_value("only_tax_impact", 0);
} }
else{ else{
frm.set_df_property("accounts", "reqd", 0); frm.set_df_property("accounts", "reqd", 0);
} }
},
only_tax_impact: function(frm) {
if(frm.only_tax_impact){
frm.set_value("create_separate_payment_entry_against_benefit_claim", 0);
}
} }
}); });

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

@ -410,7 +410,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"depends_on": "eval:doc.type==\"Earning\" && doc.is_additional_component != 1", "depends_on": "eval:doc.type==\"Earning\" && doc.is_additional_component != 1 && doc.statistical_component!=1",
"fieldname": "flexible_benefits", "fieldname": "flexible_benefits",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hidden": 0, "hidden": 0,
@ -573,7 +573,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"depends_on": "is_flexible_benefit", "depends_on": "eval:doc.is_flexible_benefit == 1 & doc.create_separate_payment_entry_against_benefit_claim !=1",
"fieldname": "only_tax_impact", "fieldname": "only_tax_impact",
"fieldtype": "Check", "fieldtype": "Check",
"hidden": 0, "hidden": 0,
@ -606,7 +606,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"depends_on": "is_flexible_benefit", "depends_on": "eval:doc.is_flexible_benefit == 1 & doc.only_tax_impact !=1",
"fieldname": "create_separate_payment_entry_against_benefit_claim", "fieldname": "create_separate_payment_entry_against_benefit_claim",
"fieldtype": "Check", "fieldtype": "Check",
"hidden": 0, "hidden": 0,
@ -703,7 +703,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"depends_on": "eval:doc.is_payable == 1", "depends_on": "eval:doc.is_payable == 1 && doc.statistical_component != 1",
"fieldname": "section_break_5", "fieldname": "section_break_5",
"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-22 17:27:08.334858", "modified": "2018-06-29 13:59:12.958648",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Salary Component", "name": "Salary Component",