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

fixes in employee master

Browse Source
This commit is contained in:
Nabin Hait 2013-01-18 11:39:24 +05:30
parent a642ae14eb
commit dc84d410bc
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hr/doctype/employee/employee.js
View File

@ -25,7 +25,8 @@ cur_frm.cscript.onload = function(doc) {
cur_frm.cscript.refresh = function(doc) { cur_frm.cscript.refresh = function(doc) {
if(!doc.__islocal) { if(!doc.__islocal) {
hide_field("naming_series"); hide_field("naming_series");
cur_frm.add_custom_button('Make Salary Structure', cur_frm.cscript['Make Salary Structure']); cur_frm.add_custom_button('Make Salary Structure',
cur_frm.cscript['Make Salary Structure']);
} }
} }
@ -44,12 +45,16 @@ cur_frm.cscript.salutation = function(doc,dt,dn) {
} }
cur_frm.cscript['Make Salary Structure']=function(){ cur_frm.cscript['Make Salary Structure']=function(){
$c_obj(make_doclist (doc.doctype,doc.name),'check_sal_structure',cur_frm.doc.name,function(r, rt) { $c_obj(make_doclist (cur_frm.doc.doctype, cur_frm.doc.name), 'check_sal_structure',
cur_frm.doc.name, function(r, rt) {
if(r.message) if(r.message)
alert("You have already created Active salary structure.\nIf you want to create new one, please ensure that no active salary structure exist.\nTo inactive salary structure select 'Is Active' as 'No'."); msgprint("You have already created Active salary structure.\n \
If you want to create new one, please ensure that no active salary structure \
exist.\nTo inactive salary structure select 'Is Active' as 'No'.");
else else
cur_frm.cscript.make_salary_structure(cur_frm.doc); cur_frm.cscript.make_salary_structure(cur_frm.doc);
}); }
);
} }
cur_frm.cscript.make_salary_structure = function(doc, dt, dn, det){ cur_frm.cscript.make_salary_structure = function(doc, dt, dn, det){