nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-30 07:08:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] cleanup stop-resume code

Browse Source
This commit is contained in:
Rushabh Mehta
2015-11-03 18:20:39 +05:30
parent 7d23e4286e
commit 5951692db0
10 changed files with 100 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,8 +25,8 @@ cur_frm.cscript.create_salary_slip = function(doc, cdt, cdn) {
cur_frm.cscript.submit_salary_slip = function(doc, cdt, cdn) {
cur_frm.cscript.display_activity_log("");
var check = confirm(__("Do you really want to Submit all Salary Slip for month {0} and year {1}", [doc.month, doc.fiscal_year]));
if(check){
frappe.confirm(__("Do you really want to Submit all Salary Slip for month {0} and year {1}", [doc.month, doc.fiscal_year]), function() {
// clear all in locals
if(locals["Salary Slip"]) {
$.each(locals["Salary Slip"], function(name, d) {
@@ -40,7 +40,7 @@ cur_frm.cscript.submit_salary_slip = function(doc, cdt, cdn) {
}
return $c('runserverobj', args={'method':'submit_salary_slip','docs':doc},callback);
}
});
}
cur_frm.cscript.make_bank_entry = function(doc,cdt,cdn){