nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-13 03:45:08 +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 {
width: 40%;
align-content: center;
}
.company-name {
font-size: 14px;
@@ -70,23 +71,11 @@
<div class="company-name">
{{ doc.company }}
</div>
{% set company_address = frappe.get_all(
"Dynamic Link",
fields=["parent"],
filters={
"link_doctype": "Company",
"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 "" }}
{% if doc.company_address %}
{% 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 %}
</td>

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

@@ -1,124 +1,122 @@
<style>
.letter-head {
border-radius: 18px;
background: #F8F8F8;
padding: 12px;
margin-left: 12px;
margin-right: 12px;
}
.letterhead-container {
width: 100%;
}
.letterhead-container .other-details {
position: absolute;
right: 0;
bottom: 0;
}
.logo-address{
width: 65%;
vertical-align: top;
}
.letter-head {
border-radius: 18px;
background: #f8f8f8;
padding: 12px;
margin-left: 12px;
margin-right: 12px;
}
.letterhead-container {
width: 100%;
}
.letterhead-container .other-details {
position: absolute;
right: 0;
bottom: 0;
}
.logo-address {
width: 65%;
vertical-align: top;
}
.logo {
width: 90px;
display: block;
margin-bottom: 10px;
}
.logo {
width: 90px;
display: block;
margin-bottom: 10px;
}
.logo img {
border-radius: 15px;
border: 1px solid #EDEDED;
}
.logo img {
border-radius: 15px;
border: 1px solid #ededed;
}
.company-name {
color: #171717;
font-weight: bold;
line-height: 23px;
margin-bottom: 5px;
}
.company-name {
color: #171717;
font-weight: bold;
line-height: 23px;
margin-bottom: 5px;
}
.company-address {
color: #171717;
width: 300px;
}
.company-address {
color: #171717;
width: 300px;
}
.invoice-title {
font-weight: bold;
}
.invoice-title {
font-weight: bold;
}
.invoice-number {
color: #7C7C7C;
}
.invoice-number {
color: #7c7c7c;
}
.contact-title {
color: #7C7C7C;
width: 60px;
display: inline-block;
vertical-align: top;
margin-right: 10px;
}
.contact-title {
color: #7c7c7c;
width: 60px;
display: inline-block;
vertical-align: top;
margin-right: 10px;
}
.contact-value {
color: #171717;
display: inline-block;
}
.letterhead-container td {
padding: 0px !important;
position: relative;
}
.contact-value {
color: #171717;
display: inline-block;
}
.letterhead-container td {
padding: 0px !important;
position: relative;
}
</style>
<table class="letterhead-container">
<tbody><tr>
<td class="logo-address">
{% set company_logo = frappe.db.get_value("Company", doc.company, "company_logo") %}
{% if company_logo %}
<div class="logo">
<img src="{{ frappe.utils.get_url(company_logo) }}">
</div>
{% endif %}
<div class="company-name">{{ doc.company }}</div>
<div class="company-address">
{% set company_address = frappe.get_all(
"Dynamic Link",
fields=["parent"],
filters={
"link_doctype": "Company",
"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 "" }}<br>
{% endif %}
</div>
</td>
<tbody>
<tr>
<td class="logo-address">
{% set company_logo = frappe.db.get_value("Company", doc.company, "company_logo") %} {% if
company_logo %}
<div class="logo">
<img src="{{ frappe.utils.get_url(company_logo) }}" />
</div>
{% endif %}
<div class="company-name">{{ doc.company }}</div>
<div class="company-address">
{% if doc.company_address %} {% 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 }}<br />{%
endif %} {{ company_address_display.city or "" }} {{ company_address_display.state or ""
}} {{ company_address_display.pincode or "" }} {{ company_address_display.country or ""
}}<br />
{% endif %}
</div>
</td>
<td style="vertical-align: top;">
<div style="height: 90px; margin-bottom: 10px; text-align: right;">
<div class="invoice-title">{{ _("Sales Invoice") }}</div>
<div class="invoice-number">{{ doc.name }}</div>
<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>
{% endif %}
</div>
</td>
</tr>
</tbody></table>
<td style="vertical-align: top">
<div style="height: 90px; margin-bottom: 10px; text-align: right">
<div class="invoice-title">{{ _("Sales Invoice") }}</div>
<div class="invoice-number">{{ doc.name }}</div>
<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>
{% endif %}
</div>
</td>
</tr>
</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 class="col-xs-7">
<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>
</td>

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

@@ -201,17 +201,22 @@ print_heading_template=None) -%}
</td>
</tr>
<tr>
{% set address = (doc.address_display) %}
{% if address and address.rstrip().endswith("<br />") %}
{% set address = address[:-5] %}
{% endif %}
{% set company_address_display = (doc.company_address_display) %}
{% if company_address_display and company_address_display.rstrip().endswith("<br />") %}
{% set company_address_display = company_address_display[:-5] %}
{% endif %}
<td><span class="heading">{{ _("Bill From") }}:</span><br />{{ address }}</td>
<td><span class="heading">{{ _("Bill To") }}:</span><br />{{ company_address_display }}</td>
<td><span class="heading">{{ _("Bill From") }}:</span><br />
{% if doc.customer_address %}
{% 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 %}
</td>
<td><span class="heading">{{ _("Bill To") }}:</span><br />
{% if doc.company_address %}
{% 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 %}
</td>
</tr>
</table>