[version] v5.0.0-alpha [fixes] email
This commit is contained in:
parent
584e53a8b8
commit
5bb97f5ea3
5 changed files with 7 additions and 7 deletions
|
|
@ -1 +1 @@
|
|||
__version__ = "4.4.2"
|
||||
__version__ = "5.0.0-alpha"
|
||||
|
|
|
|||
|
|
@ -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"):
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ frappe.form.formatters = {
|
|||
return repl('%(icon)s<a href="#Form/%(doctype)s/%(name)s">%(label)s</a>', {
|
||||
doctype: encodeURIComponent(doctype),
|
||||
name: encodeURIComponent(value),
|
||||
label: value,
|
||||
label: __(value),
|
||||
icon: (options && options.no_icon) ? "" :
|
||||
('<i class="icon-fixed-width '+frappe.boot.doctype_icons[doctype]+'"></i> ')
|
||||
});
|
||||
|
|
|
|||
2
setup.py
2
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()
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue