From 4430c0d718f8ef5cf085d78ae71c16acf6510506 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 14 May 2013 19:23:37 +0530 Subject: [PATCH] [upload attendance] [fix] fixed import issue for role restricted whitelist methods --- hr/doctype/upload_attendance/upload_attendance.js | 1 - hr/doctype/upload_attendance/upload_attendance.py | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hr/doctype/upload_attendance/upload_attendance.js b/hr/doctype/upload_attendance/upload_attendance.js index 35a00ed69d..4e5b47fe00 100644 --- a/hr/doctype/upload_attendance/upload_attendance.js +++ b/hr/doctype/upload_attendance/upload_attendance.js @@ -75,7 +75,6 @@ erpnext.hr.AttendanceControlPanel = wn.ui.form.Controller.extend({ r.messages = ["

Import Successful!

"]. concat(r.messages) } - console.log(r.messages); $.each(r.messages, function(i, v) { var $p = $('

').html(v).appendTo($log_wrapper); diff --git a/hr/doctype/upload_attendance/upload_attendance.py b/hr/doctype/upload_attendance/upload_attendance.py index e48cbefb69..ee4234a279 100644 --- a/hr/doctype/upload_attendance/upload_attendance.py +++ b/hr/doctype/upload_attendance/upload_attendance.py @@ -100,7 +100,6 @@ def get_naming_series(): def upload(): from webnotes.utils.datautils import read_csv_content_from_uploaded_file from webnotes.modules import scrub - from core.page.data_import_tool.data_import_tool import check_record, import_doc rows = read_csv_content_from_uploaded_file() if not rows: @@ -112,6 +111,9 @@ def upload(): ret = [] error = False + from webnotes.utils.datautils import check_record, import_doc + doctype_dl = webnotes.get_doctype("Attendance") + for i, row in enumerate(rows[5:]): if not row: continue row_idx = i + 5 @@ -121,7 +123,7 @@ def upload(): d["docstatus"] = webnotes.conn.get_value("Attendance", d.name, "docstatus") try: - check_record(d) + check_record(d, doctype_dl=doctype_dl) ret.append(import_doc(d, "Attendance", 1, row_idx, submit=True)) except Exception, e: error = True