diff --git a/frappe/__init__.py b/frappe/__init__.py
index e123edce68..90d2fe31bd 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -215,12 +215,20 @@ def set_user(username):
def get_request_header(key, default=None):
return request.headers.get(key, default)
-def sendmail(recipients=(), sender="", subject="No Subject", message="No Message", as_markdown=False):
- import frappe.utils.email_lib
- if as_markdown:
- frappe.utils.email_lib.sendmail_md(recipients, sender=sender, subject=subject, msg=message)
+def sendmail(recipients=(), sender="", subject="No Subject", message="No Message",
+ as_markdown=False, bulk=False):
+
+ if bulk:
+ import frappe.utils.email_lib.bulk
+ frappe.utils.email_lib.bulk.send(recipients=recipients, sender=sender,
+ subject=subject, message=msg, add_unsubscribe_link=False)
+
else:
- frappe.utils.email_lib.sendmail(recipients, sender=sender, subject=subject, msg=message)
+ import frappe.utils.email_lib
+ if as_markdown:
+ frappe.utils.email_lib.sendmail_md(recipients, sender=sender, subject=subject, msg=message)
+ else:
+ frappe.utils.email_lib.sendmail(recipients, sender=sender, subject=subject, msg=message)
logger = None
whitelisted = []
diff --git a/frappe/templates/base.html b/frappe/templates/base.html
index 1f5f1b6754..7e7ebca807 100644
--- a/frappe/templates/base.html
+++ b/frappe/templates/base.html
@@ -20,10 +20,6 @@ https://frappe.io/apps/frappe
{%- endfor -%}
{%- endif -%}
- {%- for link in web_include_js %}
-
- {%- endfor -%}
-
{%- for link in web_include_css %}
{%- endfor -%}
@@ -38,6 +34,7 @@ https://frappe.io/apps/frappe
{%- block banner -%}
+ {% include "templates/includes/banner_extension.html" %}
{% if banner_html -%}
{%- endif %}
@@ -92,6 +89,10 @@ https://frappe.io/apps/frappe
{%- block footer -%}{% include "templates/includes/footer.html" %}{%- endblock -%}
+ {%- for link in web_include_js %}
+
+ {%- endfor -%}
+
{%- block script %}