From f7b16fc56ab69849a5a73a0ee7e6edf296a5c983 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 14 Jun 2017 15:43:03 +0530 Subject: [PATCH 1/5] Prepare email message only if there is message (#3477) --- frappe/email/queue.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/email/queue.py b/frappe/email/queue.py index 23a549d6e2..2fe1e34486 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -429,11 +429,13 @@ where name=%s""", (unicode(e), email.name), auto_commit=auto_commit) def prepare_message(email, recipient, recipients_list): message = email.message + if not message: + return "" + if email.add_unsubscribe_link and email.reference_doctype: # is missing the check for unsubscribe message but will not add as there will be no unsubscribe url unsubscribe_url = get_unsubcribed_url(email.reference_doctype, email.reference_name, recipient, email.unsubscribe_method, email.unsubscribe_params) - if message: - message = message.replace("", quopri.encodestring(unsubscribe_url)) + message = message.replace("", quopri.encodestring(unsubscribe_url)) if email.expose_recipients == "header": pass From e5dc0af0e15bb3cf6503df64ad5a9e1edafbc353 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 14 Jun 2017 15:45:39 +0530 Subject: [PATCH 2/5] [Fix] Email digest email by document field's value not refreshing on change of document type (#3479) --- frappe/email/doctype/email_alert/email_alert.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/email/doctype/email_alert/email_alert.js b/frappe/email/doctype/email_alert/email_alert.js index 2042b62679..3736585f9a 100755 --- a/frappe/email/doctype/email_alert/email_alert.js +++ b/frappe/email/doctype/email_alert/email_alert.js @@ -34,6 +34,7 @@ frappe.email_alert = { // set first option as blank to allow email alert not to be defaulted to the owner frm.doc.name).options = [""].concat(["owner"].concat(email_fields)); + frm.fields_dict.recipients.grid.refresh(); }); } } From db928600da9008dfa24b4c3122d49e8924223fe0 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 14 Jun 2017 18:38:44 +0530 Subject: [PATCH 3/5] [Fix] System manager not able to restore the deleted document --- frappe/core/doctype/deleted_document/deleted_document.js | 2 +- frappe/core/doctype/deleted_document/deleted_document.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/deleted_document/deleted_document.js b/frappe/core/doctype/deleted_document/deleted_document.js index c158e4d39f..3125cb2f1c 100644 --- a/frappe/core/doctype/deleted_document/deleted_document.js +++ b/frappe/core/doctype/deleted_document/deleted_document.js @@ -13,7 +13,7 @@ frappe.ui.form.on('Deleted Document', { method: 'frappe.core.doctype.deleted_document.deleted_document.restore', args: {name: frm.doc.name}, callback: function(r) { - // + frm.reload_doc(); } }); }); diff --git a/frappe/core/doctype/deleted_document/deleted_document.py b/frappe/core/doctype/deleted_document/deleted_document.py index 3be4566910..e01b01d9f9 100644 --- a/frappe/core/doctype/deleted_document/deleted_document.py +++ b/frappe/core/doctype/deleted_document/deleted_document.py @@ -23,6 +23,6 @@ def restore(name): deleted.new_name = doc.name deleted.restored = 1 - deleted.save() + deleted.db_update() frappe.msgprint('Document Restored') \ No newline at end of file From f9d461e28af42ba480376386daf26085e8259712 Mon Sep 17 00:00:00 2001 From: tunde Date: Thu, 15 Jun 2017 00:32:20 +0100 Subject: [PATCH 4/5] removes culprit print statement --- frappe/desk/tags.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/desk/tags.py b/frappe/desk/tags.py index e6af49f90d..b02e814280 100644 --- a/frappe/desk/tags.py +++ b/frappe/desk/tags.py @@ -84,7 +84,6 @@ class DocTags: def remove(self, dn, tag): """remove a user tag""" tl = self.get_tags(dn).split(',') - print(tag, filter(lambda x:x!=tag, tl)) self.update(dn, filter(lambda x:x.lower()!=tag.lower(), tl)) def remove_all(self, dn): From eaebdfcd7371c97ef367ac6a603151b8972c3649 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Thu, 15 Jun 2017 13:57:12 +0600 Subject: [PATCH 5/5] bumped to version 8.0.67 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 1a119a09d5..7e89057d02 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = '8.0.66' +__version__ = '8.0.67' __title__ = "Frappe Framework" local = Local()