Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/hr/doctype/leave_application/leave_application.py b/hr/doctype/leave_application/leave_application.py
index 839c730..6e39751 100755
--- a/hr/doctype/leave_application/leave_application.py
+++ b/hr/doctype/leave_application/leave_application.py
@@ -333,7 +333,7 @@
@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 @@
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))
diff --git a/setup/doctype/backup_manager/backup_manager.py b/setup/doctype/backup_manager/backup_manager.py
index 4fb6ab3..ce0f1e1 100644
--- a/setup/doctype/backup_manager/backup_manager.py
+++ b/setup/doctype/backup_manager/backup_manager.py
@@ -27,8 +27,8 @@
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 @@
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: