nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 04:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait
2013-04-23 12:54:54 +05:30
parent 0a480f4efd 890265928b
commit 98025ac32c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hr/doctype/leave_application/leave_application.py
View File

@@ -333,7 +333,7 @@ def add_holidays(events, start, end, employee, company):
@webnotes.whitelist() @webnotes.whitelist()
def query_for_permitted_employees(doctype, txt, searchfield, start, page_len, filters): 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 return webnotes.conn.sql("""select name, employee_name from `tabEmployee` emp
where status = 'Active' and docstatus < 2 and 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 name like %s then 0 else 1 end,
case when employee_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), 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))

8
setup/doctype/backup_manager/backup_manager.py
View File

@@ -27,8 +27,8 @@ def take_backups_dropbox():
from setup.doctype.backup_manager.backup_dropbox import backup_to_dropbox from setup.doctype.backup_manager.backup_dropbox import backup_to_dropbox
backup_to_dropbox() backup_to_dropbox()
send_email(True, "Dropbox") send_email(True, "Dropbox")
except Exception, e: except Exception:
send_email(False, "Dropbox", e) send_email(False, "Dropbox", webnotes.getTraceback())
#backup to gdrive #backup to gdrive
@webnotes.whitelist() @webnotes.whitelist()
@@ -37,8 +37,8 @@ def take_backups_gdrive():
from setup.doctype.backup_manager.backup_googledrive import backup_to_gdrive from setup.doctype.backup_manager.backup_googledrive import backup_to_gdrive
backup_to_gdrive() backup_to_gdrive()
send_email(True, "Google Drive") send_email(True, "Google Drive")
except Exception, e: except Exception:
send_email(False, "Google Drive", e) send_email(False, "Google Drive", webnotes.getTraceback())
def send_email(success, service_name, error_status=None): def send_email(success, service_name, error_status=None):
if success: if success: