vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor: Fix address naming

Browse source
This commit is contained in:
Suraj Shetty 2021-01-21 10:13:19 +05:30
parent 733d33aad0
commit d2b5bd7af7
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/email/email_body.py
View file

@ -369,10 +369,10 @@ def get_footer(email_account, footer=None):
if email_account and email_account.footer:
args.update({'email_account_footer': email_account.footer})
company_address = frappe.db.get_default("email_footer_address")
sender_address = frappe.db.get_default("email_footer_address")
if company_address:
args.update({'company_address': company_address})
if sender_address:
args.update({'sender_address': sender_address})
if not cint(frappe.db.get_default("disable_standard_email_footer")):
args.update({'default_mail_footer': frappe.get_hooks('default_mail_footer')})

8
frappe/templates/emails/email_footer.html
View file

@ -6,10 +6,10 @@
</div>
{% endif %}
<!-- company_address -->
{% if company_address %}
<div class="company-address">
{% for line in company_address.splitlines(True) %}
<!-- sender_address -->
{% if sender_address %}
<div class="sender-address">
{% for line in sender_address.splitlines(True) %}
<div>{{ line }}</div>
{% endfor %}
</div>