From 6f83e7701081a32081aec6108b1ae34704a3a462 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 23 Apr 2013 12:24:31 +0530 Subject: [PATCH 1/2] [leave application] [employee query] fixes --- hr/doctype/leave_application/leave_application.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr/doctype/leave_application/leave_application.py b/hr/doctype/leave_application/leave_application.py index 839c73031be..6e39751b716 100755 --- a/hr/doctype/leave_application/leave_application.py +++ b/hr/doctype/leave_application/leave_application.py @@ -333,7 +333,7 @@ def add_holidays(events, start, end, employee, company): @webnotes.whitelist() def query_for_permitted_employees(doctype, txt, searchfield, start, page_len, filters): - txt = cstr(txt) + "%" + txt = "%" + cstr(txt) + "%" return webnotes.conn.sql("""select name, employee_name from `tabEmployee` emp where status = 'Active' and docstatus < 2 and @@ -346,4 +346,4 @@ def query_for_permitted_employees(doctype, txt, searchfield, start, page_len, fi case when name like %s then 0 else 1 end, case when employee_name like %s then 0 else 1 end, name limit %s, %s""" % tuple([searchfield] + ["%s"]*8), - (txt, txt, webnotes.session.user, webnotes.session.user, txt, txt, start, page_len), debug=1) + (txt, txt, webnotes.session.user, webnotes.session.user, txt, txt, start, page_len)) From 890265928b88c880ae534f8c7df04f91d2d0956b Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 23 Apr 2013 12:30:38 +0530 Subject: [PATCH 2/2] [backup manager] [error handling] on error, send complete traceback as email --- setup/doctype/backup_manager/backup_manager.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup/doctype/backup_manager/backup_manager.py b/setup/doctype/backup_manager/backup_manager.py index 4fb6ab30697..ce0f1e17297 100644 --- a/setup/doctype/backup_manager/backup_manager.py +++ b/setup/doctype/backup_manager/backup_manager.py @@ -27,8 +27,8 @@ def take_backups_dropbox(): from setup.doctype.backup_manager.backup_dropbox import backup_to_dropbox backup_to_dropbox() send_email(True, "Dropbox") - except Exception, e: - send_email(False, "Dropbox", e) + except Exception: + send_email(False, "Dropbox", webnotes.getTraceback()) #backup to gdrive @webnotes.whitelist() @@ -37,8 +37,8 @@ def take_backups_gdrive(): from setup.doctype.backup_manager.backup_googledrive import backup_to_gdrive backup_to_gdrive() send_email(True, "Google Drive") - except Exception, e: - send_email(False, "Google Drive", e) + except Exception: + send_email(False, "Google Drive", webnotes.getTraceback()) def send_email(success, service_name, error_status=None): if success: