nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 16:15:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into edge

Browse Source 
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
This commit is contained in:
Anand Doshi
2013-04-23 12:42:18 +05:30
parent e2fe4cd317 890265928b
commit dc0f2d2422
17 changed files with 602 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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
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: