From 0b1a8e13fd5da3b479ee3c3580332d5e4f230798 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 18 Dec 2013 07:53:49 +0530 Subject: [PATCH 1/4] [patch] Email Digest --- patches/1311/p07_scheduler_errors_digest.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches/1311/p07_scheduler_errors_digest.py b/patches/1311/p07_scheduler_errors_digest.py index 7cfa251847..b1fa78e14f 100644 --- a/patches/1311/p07_scheduler_errors_digest.py +++ b/patches/1311/p07_scheduler_errors_digest.py @@ -5,6 +5,8 @@ from __future__ import unicode_literals import webnotes def execute(): + webnotes.reload_doc("setup", "doctype", "email_digest") + from webnotes.profile import get_system_managers system_managers = get_system_managers(only_name=True) if not system_managers: From c565de2c1232cbc1605ef0a6342f5eb4afd78693 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 18 Dec 2013 10:41:29 +0530 Subject: [PATCH 2/4] Removed schedule_date from no_copy in purchase receipt item --- stock/doctype/purchase_receipt_item/purchase_receipt_item.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt index 22ded6d2c3..9a641c2ba3 100755 --- a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt +++ b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:10", "docstatus": 0, - "modified": "2013-11-02 19:41:45", + "modified": "2013-12-18 10:38:39", "modified_by": "Administrator", "owner": "Administrator" }, @@ -326,7 +326,7 @@ "fieldname": "schedule_date", "fieldtype": "Date", "label": "Required By", - "no_copy": 1, + "no_copy": 0, "oldfieldname": "schedule_date", "oldfieldtype": "Date", "print_hide": 1, From 677ef0c3cf21911f0e39f269a5674a07cb43c1c6 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 18 Dec 2013 10:56:43 +0530 Subject: [PATCH 3/4] [fix] backup manager --- setup/doctype/backup_manager/backup_dropbox.py | 6 +----- setup/doctype/backup_manager/backup_manager.js | 6 +++--- setup/doctype/backup_manager/backup_manager.py | 16 ++++++---------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/setup/doctype/backup_manager/backup_dropbox.py b/setup/doctype/backup_manager/backup_dropbox.py index bbd33b5e4b..1583f7ebd6 100644 --- a/setup/doctype/backup_manager/backup_dropbox.py +++ b/setup/doctype/backup_manager/backup_dropbox.py @@ -16,8 +16,6 @@ import webnotes from webnotes.utils import get_request_site_address, cstr from webnotes import _ -from backup_manager import ignore_list - @webnotes.whitelist() def get_dropbox_authorize_url(): sess = get_dropbox_session() @@ -100,9 +98,7 @@ def backup_to_dropbox(): path = get_files_path() for filename in os.listdir(path): filename = cstr(filename) - if filename in ignore_list: - continue - + found = False filepath = os.path.join(path, filename) for file_metadata in response["contents"]: diff --git a/setup/doctype/backup_manager/backup_manager.js b/setup/doctype/backup_manager/backup_manager.js index c0117570b5..6fdb9e4f62 100644 --- a/setup/doctype/backup_manager/backup_manager.js +++ b/setup/doctype/backup_manager/backup_manager.js @@ -87,7 +87,7 @@ $.extend(cur_frm.cscript, { cur_frm.save(); }, - upload_backups_to_gdrive: function() { - cur_frm.save(); - }, + // upload_backups_to_gdrive: function() { + // cur_frm.save(); + // }, }); \ No newline at end of file diff --git a/setup/doctype/backup_manager/backup_manager.py b/setup/doctype/backup_manager/backup_manager.py index 0a83dea38b..b09446485e 100644 --- a/setup/doctype/backup_manager/backup_manager.py +++ b/setup/doctype/backup_manager/backup_manager.py @@ -7,8 +7,6 @@ from __future__ import unicode_literals import webnotes from webnotes import _ -ignore_list = [] - class DocType: def __init__(self, d, dl): self.doc, self.doclist = d, dl @@ -39,10 +37,6 @@ def take_backups_dropbox(): file_and_error = [" - ".join(f) for f in zip(did_not_upload, error_log)] error_message = ("\n".join(file_and_error) + "\n" + webnotes.getTraceback()) webnotes.errprint(error_message) - - if not webnotes.conn: - webnotes.connect() - send_email(False, "Dropbox", error_message) #backup to gdrive @@ -62,6 +56,7 @@ def take_backups_gdrive(): send_email(False, "Google Drive", error_message) def send_email(success, service_name, error_status=None): + from webnotes.utils.email_lib import sendmail if success: subject = "Backup Upload Successful" message ="""

Backup Uploaded Successfully

Hi there, this is just to inform you @@ -76,7 +71,8 @@ def send_email(success, service_name, error_status=None):

Please contact your system manager for more information.

""" % (service_name, error_status) - # email system managers - from webnotes.utils.email_lib import sendmail - sendmail(webnotes.conn.get_value("Backup Manager", None, "send_notifications_to").split(","), - subject=subject, msg=message) + if not webnotes.conn: + webnotes.connect() + + recipients = webnotes.conn.get_value("Backup Manager", None, "send_notifications_to").split(",") + sendmail(recipients, subject=subject, msg=message) From 797e0713ea2fd22995005deea8f8d0f0a907028f Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Wed, 18 Dec 2013 12:49:28 +0600 Subject: [PATCH 4/4] bumped to version 3.3.1 --- config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index cf1b11c7c9..d7dcbc1aef 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "app_name": "ERPNext", - "app_version": "3.3.0", + "app_version": "3.3.1", "base_template": "app/portal/templates/base.html", "modules": { "Accounts": { @@ -74,5 +74,5 @@ "type": "module" } }, - "requires_framework_version": "==3.3.0" + "requires_framework_version": "==3.3.1" } \ No newline at end of file