nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 19:49:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40459 from Nihantra-Patel/fix_sp_address

Browse Source 
fix: sales partner address display Issue
This commit is contained in:
Deepesh Garg
2024-03-17 11:05:48 +05:30
committed by GitHub
parent 1fc099dacf cefb8f69e5
commit 6d47b8a24e
2 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
erpnext/setup/doctype/sales_partner/sales_partner.py
View File

@@ -54,25 +54,30 @@ class SalesPartner(WebsiteGenerator):
self.partner_website = "http://" + self.partner_website self.partner_website = "http://" + self.partner_website
def get_context(self, context): def get_context(self, context):
address = frappe.db.get_value( address_names = frappe.db.get_all(
"Address", {"sales_partner": self.name, "is_primary_address": 1}, "*", as_dict=True "Dynamic Link",
filters={"link_doctype": "Sales Partner", "link_name": self.name, "parenttype": "Address"},
pluck=["parent"],
) )
if address:
city_state = ", ".join(filter(None, [address.city, address.state]))
address_rows = [
address.address_line1,
address.address_line2,
city_state,
address.pincode,
address.country,
]
context.update( addresses = []
for address_name in address_names:
address_doc = frappe.get_doc("Address", address_name)
city_state = ", ".join([item for item in [address_doc.city, address_doc.state] if item])
address_rows = [
address_doc.address_line1,
address_doc.address_line2,
city_state,
address_doc.pincode,
address_doc.country,
]
addresses.append(
{ {
"email": address.email_id, "email": address_doc.email_id,
"partner_address": filter_strip_join(address_rows, "\n<br>"), "partner_address": filter_strip_join(address_rows, "\n<br>"),
"phone": filter_strip_join(cstr(address.phone).split(","), "\n<br>"), "phone": filter_strip_join(cstr(address_doc.phone).split(","), "\n<br>"),
} }
) )
context["addresses"] = addresses
return context return context

20
erpnext/templates/generators/sales_partner.html
View File

@@ -8,18 +8,20 @@
<div class="partner-content" itemscope itemtype="http://schema.org/Organization"> <div class="partner-content" itemscope itemtype="http://schema.org/Organization">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
{% if logo -%} {% if logo %}
<img itemprop="brand" src="{{ logo }}" class="partner-logo" <img itemprop="brand" src="{{ logo }}" class="partner-logo"
alt="{{ partner_name }}" title="{{ partner_name }}" /> alt="{{ partner_name }}" title="{{ partner_name }}" />
<br><br> <br><br>
{%- endif %} {% endif %}
<address> {% if addresses %}
{% if partner_website -%}<p><a href="{{ partner_website }}" {% for address in addresses %}
target="_blank">{{ partner_website }}</a></p>{%- endif %} <address>
{% if partner_address -%}<p itemprop="address">{{ partner_address }}</p>{%- endif %} {% if address.partner_address %}<p itemprop="address">{{ address.partner_address }}</p>{% endif %}
{% if phone -%}<p itemprop="telephone">{{ phone }}</p>{%- endif %} {% if address.phone %}<p itemprop="telephone">{{ address.phone }}</p>{% endif %}
{% if email -%}<p itemprop="email"><span class="fa fa-envelope"></span> {{ email }}</p>{%- endif %} {% if address.email %}<p itemprop="email"><span class="fa fa-envelope"></span> {{ address.email }}</p>{% endif %}
</address> </address>
{% endfor %}
{% endif %}
</div> </div>
<div class="col-md-8"> <div class="col-md-8">
<p>{{ description }}</p> <p>{{ description }}</p>