nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 11:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: format and display the address for improved visual clarity

Browse Source
This commit is contained in:
khushi8112
2025-09-30 13:29:47 +05:30
parent 301b294da9
commit 8a19dc4a20
4 changed files with 140 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
erpnext/accounts/letterhead/letterhead_plain.html
View File

@@ -32,6 +32,7 @@
} }
.company-details { .company-details {
width: 40%; width: 40%;
align-content: center;
} }
.company-name { .company-name {
font-size: 14px; font-size: 14px;
@@ -70,23 +71,11 @@
<div class="company-name"> <div class="company-name">
{{ doc.company }} {{ doc.company }}
</div> </div>
{% set company_address = frappe.get_all( {% if doc.company_address %}
"Dynamic Link", {% set company_address_display = frappe.get_doc("Address", doc.company_address) %}
fields=["parent"], {{ company_address_display.address_line1 or "" }}
filters={ {% if company_address_display.address_line2 %}{{ company_address_display.address_line2 }}{% endif %}<br>
"link_doctype": "Company", {{ company_address_display.city or "" }} {{ company_address_display.state or "" }} {{ company_address_display.pincode or "" }} {{ company_address_display.country or "" }}<br>
"link_name": doc.company,
"parenttype": "Address"
},
limit=1
) %}
{% if company_address %}
{% set address = frappe.get_doc("Address", company_address[0].parent) %}
{{ address.address_line1 or "" }}<br>
{% if address.address_line2 %}
{{ address.address_line2 }}<br>
{% endif %}
{{ address.city or "" }} {{ address.state or "" }} {{ address.pincode or "" }} {{ address.country or "" }}
{% endif %} {% endif %}
</td> </td>

80
erpnext/accounts/letterhead/letterhead_with_background_colour.html
View File

@@ -1,7 +1,7 @@
<style> <style>
.letter-head { .letter-head {
border-radius: 18px; border-radius: 18px;
background: #F8F8F8; background: #f8f8f8;
padding: 12px; padding: 12px;
margin-left: 12px; margin-left: 12px;
margin-right: 12px; margin-right: 12px;
@@ -14,7 +14,7 @@
right: 0; right: 0;
bottom: 0; bottom: 0;
} }
.logo-address{ .logo-address {
width: 65%; width: 65%;
vertical-align: top; vertical-align: top;
} }
@@ -27,7 +27,7 @@
.logo img { .logo img {
border-radius: 15px; border-radius: 15px;
border: 1px solid #EDEDED; border: 1px solid #ededed;
} }
.company-name { .company-name {
@@ -47,11 +47,11 @@
} }
.invoice-number { .invoice-number {
color: #7C7C7C; color: #7c7c7c;
} }
.contact-title { .contact-title {
color: #7C7C7C; color: #7c7c7c;
width: 60px; width: 60px;
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
@@ -69,56 +69,54 @@
</style> </style>
<table class="letterhead-container"> <table class="letterhead-container">
<tbody><tr> <tbody>
<tr>
<td class="logo-address"> <td class="logo-address">
{% set company_logo = frappe.db.get_value("Company", doc.company, "company_logo") %} {% set company_logo = frappe.db.get_value("Company", doc.company, "company_logo") %} {% if
{% if company_logo %} company_logo %}
<div class="logo"> <div class="logo">
<img src="{{ frappe.utils.get_url(company_logo) }}"> <img src="{{ frappe.utils.get_url(company_logo) }}" />
</div> </div>
{% endif %} {% endif %}
<div class="company-name">{{ doc.company }}</div> <div class="company-name">{{ doc.company }}</div>
<div class="company-address"> <div class="company-address">
{% set company_address = frappe.get_all( {% if doc.company_address %} {% set company_address_display = frappe.get_doc("Address",
"Dynamic Link", doc.company_address) %} {{ company_address_display.address_line1 or "" }} {% if
fields=["parent"], company_address_display.address_line2 %}{{ company_address_display.address_line2 }}<br />{%
filters={ endif %} {{ company_address_display.city or "" }} {{ company_address_display.state or ""
"link_doctype": "Company", }} {{ company_address_display.pincode or "" }} {{ company_address_display.country or ""
"link_name": doc.company, }}<br />
"parenttype": "Address"
},
limit=1
) %}
{% if company_address %}
{% set address = frappe.get_doc("Address", company_address[0].parent) %}
{{ address.address_line1 or "" }}<br>
{% if address.address_line2 %}{{ address.address_line2 }}<br>{% endif %}
{{ address.city or "" }} {{ address.state or "" }} {{ address.pincode or "" }} {{ address.country or "" }}<br>
{% endif %} {% endif %}
</div> </div>
</td> </td>
<td style="vertical-align: top;"> <td style="vertical-align: top">
<div style="height: 90px; margin-bottom: 10px; text-align: right;"> <div style="height: 90px; margin-bottom: 10px; text-align: right">
<div class="invoice-title">{{ _("Sales Invoice") }}</div> <div class="invoice-title">{{ _("Sales Invoice") }}</div>
<div class="invoice-number">{{ doc.name }}</div> <div class="invoice-number">{{ doc.name }}</div>
<br> <br />
</div>
<div style="text-align: left; float: right" class="other-details">
{% set website = frappe.db.get_value("Company", doc.company, "website") %} {% set email =
frappe.db.get_value("Company", doc.company, "email") %} {% set phone_no =
frappe.db.get_value("Company", doc.company, "phone_no") %} {% if website %}
<div>
<span class="contact-title">{{ _("Website:") }}</span
><span class="contact-value">{{ website }}</span>
</div>
{% endif %} {% if email %}
<div>
<span class="contact-title">{{ _("Email:") }}</span
><span class="contact-value">{{ email }}</span>
</div>
{% endif %} {% if phone_no %}
<div>
<span class="contact-title">{{ _("Contact:") }}</span
><span class="contact-value">{{ phone_no }}</span>
</div> </div>
<div style="text-align: left; float: right;" class="other-details">
{% set website = frappe.db.get_value("Company", doc.company, "website") %}
{% set email = frappe.db.get_value("Company", doc.company, "email") %}
{% set phone_no = frappe.db.get_value("Company", doc.company, "phone_no") %}
{% if website %}
<div><span class="contact-title">{{ _("Website:") }}</span><span class="contact-value">{{ website }}</span></div>
{% endif %}
{% if email %}
<div><span class="contact-title">{{ _("Email:") }}</span><span class="contact-value">{{ email }}</span></div>
{% endif %}
{% if phone_no %}
<div><span class="contact-title">{{ _("Contact:") }}</span><span class="contact-value">{{ phone_no }}</span></div>
{% endif %} {% endif %}
</div> </div>
</td> </td>
</tr> </tr>
</tbody></table> </tbody>
</table>

10
erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html
View File

@@ -172,7 +172,15 @@ print_heading_template=None) -%}
</div> </div>
<div class="col-xs-7"> <div class="col-xs-7">
<div class="info-text">{{ doc.customer_name }}</div> <div class="info-text">{{ doc.customer_name }}</div>
<div class="info-text">{{ doc.address_display or "" }}</div> <div class="info-text">
{% if doc.customer_address %}
{% set customer_address = frappe.get_doc("Address", doc.customer_address) %}
{{ customer_address.address_line1 or "" }}<br>
{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}<br>{% endif %}
{{ customer_address.city or "" }} {{ customer_address.state or "" }} {{ customer_address.pincode or "" }} {{ customer_address.country or "" }}<br>
{% endif %}
</div>
</div> </div>
</td> </td>

23
erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html
View File

@@ -201,17 +201,22 @@ print_heading_template=None) -%}
</td> </td>
</tr> </tr>
<tr> <tr>
{% set address = (doc.address_display) %} <td><span class="heading">{{ _("Bill From") }}:</span><br />
{% if address and address.rstrip().endswith("<br />") %} {% if doc.customer_address %}
{% set address = address[:-5] %} {% set customer_address = frappe.get_doc("Address", doc.customer_address) %}
{{ customer_address.address_line1 or "" }}
{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}{% endif %}<br>
{{ customer_address.city or "" }} {{ customer_address.state or "" }} {{ customer_address.pincode or "" }} {{ customer_address.country or "" }}<br>
{% endif %} {% endif %}
</td>
{% set company_address_display = (doc.company_address_display) %} <td><span class="heading">{{ _("Bill To") }}:</span><br />
{% if company_address_display and company_address_display.rstrip().endswith("<br />") %} {% if doc.company_address %}
{% set company_address_display = company_address_display[:-5] %} {% set company_address_display = frappe.get_doc("Address", doc.company_address) %}
{{ company_address_display.address_line1 or "" }}
{% if company_address_display.address_line2 %}{{ company_address_display.address_line2 }}{% endif %}<br>
{{ company_address_display.city or "" }} {{ company_address_display.state or "" }} {{ company_address_display.pincode or "" }} {{ company_address_display.country or "" }}<br>
{% endif %} {% endif %}
<td><span class="heading">{{ _("Bill From") }}:</span><br />{{ address }}</td> </td>
<td><span class="heading">{{ _("Bill To") }}:</span><br />{{ company_address_display }}</td>
</tr> </tr>
</table> </table>