From 5bb97f5ea3fb0d118836f0a844b800a1e0fbeefb Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 29 Sep 2014 12:09:35 +0530 Subject: [PATCH] [version] v5.0.0-alpha [fixes] email --- frappe/__version__.py | 2 +- frappe/email/email_body.py | 6 +++--- frappe/hooks.py | 2 +- frappe/public/js/frappe/form/formatters.js | 2 +- setup.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frappe/__version__.py b/frappe/__version__.py index 30357c8bf7..0c29013065 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1 +1 @@ -__version__ = "4.4.2" +__version__ = "5.0.0-alpha" diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py index 6429009db8..ddf9f94a42 100644 --- a/frappe/email/email_body.py +++ b/frappe/email/email_body.py @@ -221,12 +221,12 @@ def get_footer(footer=None): """append a footer (signature)""" footer = footer or "" - email_account = get_outgoing_email_account() + email_account = get_outgoing_email_account(False) - if email_account.add_signature and email_account.signature: + if email_account and email_account.add_signature and email_account.signature: footer += email_account.signature - if email_account.footer: + if email_account and email_account.footer: footer += email_account.footer else: for default_mail_footer in frappe.get_hooks("default_mail_footer"): diff --git a/frappe/hooks.py b/frappe/hooks.py index 6d4a6ff3a0..f687ddf724 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -3,7 +3,7 @@ app_title = "Frappe Framework" app_publisher = "Web Notes Technologies Pvt. Ltd." app_description = "Full Stack Web Application Framework in Python" app_icon = "assets/frappe/images/frappe.svg" -app_version = "4.4.2" +app_version = "5.0.0-alpha" app_color = "#3498db" app_email = "support@frappe.io" diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js index 02aff3a009..0830e09b21 100644 --- a/frappe/public/js/frappe/form/formatters.js +++ b/frappe/public/js/frappe/form/formatters.js @@ -69,7 +69,7 @@ frappe.form.formatters = { return repl('%(icon)s%(label)s', { doctype: encodeURIComponent(doctype), name: encodeURIComponent(value), - label: value, + label: __(value), icon: (options && options.no_icon) ? "" : (' ') }); diff --git a/setup.py b/setup.py index e6211708ec..3ff684a504 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.4.2" +version = "5.0.0-alpha" with open("requirements.txt", "r") as f: install_requires = f.readlines()