diff --git a/accounts/page/voucher_import_tool/voucher_import_tool.js b/accounts/page/voucher_import_tool/voucher_import_tool.js index 48216b83ee6..ffa230dd21c 100644 --- a/accounts/page/voucher_import_tool/voucher_import_tool.js +++ b/accounts/page/voucher_import_tool/voucher_import_tool.js @@ -30,7 +30,7 @@ wn.pages['voucher-import-tool'].onload = function(wrapper) { args: { method: "accounts.page.voucher_import_tool.voucher_import_tool.upload" }, - callback: function(r) { + callback: function(fid, filename, r) { wrapper.waiting.toggle(false); $(wrapper).find(".messages").toggle(true).html( r.join("
")) diff --git a/hr/doctype/upload_attendance/upload_attendance.js b/hr/doctype/upload_attendance/upload_attendance.js index 4e5b47fe00f..db97714236f 100644 --- a/hr/doctype/upload_attendance/upload_attendance.js +++ b/hr/doctype/upload_attendance/upload_attendance.js @@ -52,13 +52,13 @@ erpnext.hr.AttendanceControlPanel = wn.ui.form.Controller.extend({ method: 'hr.doctype.upload_attendance.upload_attendance.upload' }, sample_url: "e.g. http://example.com/somefile.csv", - callback: function(r) { + callback: function(fid, filename, r) { var $log_wrapper = $(cur_frm.fields_dict.import_log.wrapper).empty(); - + if(!r.messages) r.messages = []; // replace links if error has occured if(r.exc || r.error) { - r.messages = $.map(r.messages, function(v) { + r.messages = $.map(r.message.messages, function(v) { var msg = v.replace("Inserted", "Valid") .replace("Updated", "Valid").split("<"); if (msg.length > 1) { @@ -73,7 +73,7 @@ erpnext.hr.AttendanceControlPanel = wn.ui.form.Controller.extend({ .concat(r.messages) } else { r.messages = ["