nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22415 from Anurag810/payroll_entry_ux_fix_2.0

Browse Source 
fix: Create salary slip button disappears
This commit is contained in:
rohitwaghchaure
2020-07-08 12:35:24 +05:30
committed by GitHub
parent 3431d42d12 e862b3f9ce
commit c7b63bfcaf
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/payroll/doctype/payroll_entry/payroll_entry.js
View File

@@ -30,6 +30,7 @@ frappe.ui.form.on('Payroll Entry', {
).toggleClass('btn-primary', !(frm.doc.employees || []).length); ).toggleClass('btn-primary', !(frm.doc.employees || []).length);
} }
if ((frm.doc.employees || []).length) { if ((frm.doc.employees || []).length) {
frm.page.clear_primary_action();
frm.page.set_primary_action(__('Create Salary Slips'), () => { frm.page.set_primary_action(__('Create Salary Slips'), () => {
frm.save('Submit').then(()=>{ frm.save('Submit').then(()=>{
frm.page.clear_primary_action(); frm.page.clear_primary_action();
@@ -49,13 +50,14 @@ frappe.ui.form.on('Payroll Entry', {
return frappe.call({ return frappe.call({
doc: frm.doc, doc: frm.doc,
method: 'fill_employee_details', method: 'fill_employee_details',
callback: function(r) { }).then(r => {
if (r.docs[0].employees){ if (r.docs && r.docs[0].employees){
frm.save(); frm.employees = r.docs[0].employees;
frm.refresh(); frm.dirty();
if(r.docs[0].validate_attendance){ frm.save();
render_employee_attendance(frm, r.message); frm.refresh();
} if(r.docs[0].validate_attendance){
render_employee_attendance(frm, r.message);
} }
} }
}) })