From b312629b4bf08d3baa9ee9301eb133edf57767c8 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Thu, 31 Aug 2023 12:04:04 +0200
Subject: [PATCH 1/9] fix: responsiveness of address and contact list

---
 .../frappe/form/templates/address_list.html   | 23 +++++++++++--------
 .../frappe/form/templates/contact_list.html   | 14 +++++------
 frappe/public/scss/common/controls.scss       |  6 +++++
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/frappe/public/js/frappe/form/templates/address_list.html b/frappe/public/js/frappe/form/templates/address_list.html
index 0e533ed2ea..e67bb26fd3 100644
--- a/frappe/public/js/frappe/form/templates/address_list.html
+++ b/frappe/public/js/frappe/form/templates/address_list.html
@@ -1,19 +1,22 @@
 <div class="clearfix"></div>
 {% for(var i=0, l=addr_list.length; i<l; i++) { %}
 <div class="address-box">
-	<p class="h6">
-		{%= i+1 %}. {%= addr_list[i].address_title %}{% if(addr_list[i].address_type!="Other") { %}
-		<span class="text-muted">({%= __(addr_list[i].address_type) %})</span>{% } %}
+	<a href="/app/Form/Address/{%= encodeURIComponent(addr_list[i].name) %}" class="btn btn-default btn-xs edit-btn">
+		{%= __("Edit") %}</a>
+	<p class="h6 flex flex-wrap">
+		{%= i+1 %}. {%= addr_list[i].address_title %}
+		{% if(addr_list[i].address_type!="Other") { %}
+			&#183;&nbsp;<span class="text-muted">{%= __(addr_list[i].address_type) %}</span>
+		{% } %}
 		{% if(addr_list[i].is_primary_address) { %}
-		<span class="text-muted">({%= __("Primary") %})</span>{% } %}
+			&#183;&nbsp;<span class="text-muted">{%= __("Primary") %}</span>
+		{% } %}
 		{% if(addr_list[i].is_shipping_address) { %}
-		<span class="text-muted">({%= __("Shipping") %})</span>{% } %}
+			&#183;&nbsp;<span class="text-muted">{%= __("Shipping") %}</span>
+		{% } %}
 		{% if(addr_list[i].disabled) { %}
-		<span class="text-muted">({%= __("Disabled") %})</span>{% } %}
-
-		<a href="/app/Form/Address/{%= encodeURIComponent(addr_list[i].name) %}" class="btn btn-default btn-xs pull-right"
-			style="margin-top:-3px; margin-right: -5px;">
-			{%= __("Edit") %}</a>
+			&#183;&nbsp;<span class="text-muted">{%= __("Disabled") %}</span>
+		{% } %}
 	</p>
 	<p>{%= addr_list[i].display %}</p>
 </div>
diff --git a/frappe/public/js/frappe/form/templates/contact_list.html b/frappe/public/js/frappe/form/templates/contact_list.html
index c4cc08a549..874d67d7b7 100644
--- a/frappe/public/js/frappe/form/templates/contact_list.html
+++ b/frappe/public/js/frappe/form/templates/contact_list.html
@@ -1,18 +1,18 @@
 <div class="clearfix"></div>
 {% for(const contact of contact_list) { %}
 	<div class="address-box">
-		<p class="h6 flex align-center">
+		<a href="/app/Form/Contact/{%= encodeURIComponent(contact.name) %}"
+			class="btn btn-xs btn-default edit-btn">
+			{%= __("Edit") %}
+		</a>
+		<p class="h6 flex flex-wrap">
 			{%= contact.first_name %} {%= contact.last_name %}
 			{% if(contact.is_primary_contact) { %}
-				<span class="text-muted">&nbsp;({%= __("Primary") %})</span>
+				&#183;&nbsp;<span class="text-muted">{%= __("Primary Contact") %}</span>
 			{% } %}
 			{% if(contact.designation){ %}
-			 <span class="text-muted">&ndash; {%= contact.designation %}</span>
+				&#183;&nbsp;<span class="text-muted"> {%= contact.designation %}</span>
 			{% } %}
-			<a href="/app/Form/Contact/{%= encodeURIComponent(contact.name) %}"
-				class="btn btn-xs btn-default ml-auto">
-				{%= __("Edit") %}
-			</a>
 		</p>
 		{% if (contact.phone || contact.mobile_no || contact.phone_nos.length > 0) { %}
 		<p>
diff --git a/frappe/public/scss/common/controls.scss b/frappe/public/scss/common/controls.scss
index 9fe5f82a35..676bf22aa2 100644
--- a/frappe/public/scss/common/controls.scss
+++ b/frappe/public/scss/common/controls.scss
@@ -149,9 +149,15 @@ select.form-control {
 		border-radius: var(--border-radius);
 		font-size: var(--text-sm);
 		word-wrap: break-word;
+		position: relative;
 		p:last-child {
 			margin-bottom: 0;
 		}
+		.edit-btn {
+			position: absolute;
+			top: 5px;
+			right: 5px;
+		}
 	}
 	.action-btn {
 		position: absolute;

From 3ca1bb0ea0085660fbfe1085eeb24f8d299795c8 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Thu, 31 Aug 2023 12:43:18 +0200
Subject: [PATCH 2/9] feat: edit icon instead of text

---
 .../public/js/frappe/form/templates/address_list.html | 11 +++++++++--
 .../public/js/frappe/form/templates/contact_list.html | 11 ++++++++---
 frappe/public/scss/common/controls.scss               |  4 ++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/form/templates/address_list.html b/frappe/public/js/frappe/form/templates/address_list.html
index e67bb26fd3..a5cfb3de8d 100644
--- a/frappe/public/js/frappe/form/templates/address_list.html
+++ b/frappe/public/js/frappe/form/templates/address_list.html
@@ -1,8 +1,15 @@
 <div class="clearfix"></div>
 {% for(var i=0, l=addr_list.length; i<l; i++) { %}
 <div class="address-box">
-	<a href="/app/Form/Address/{%= encodeURIComponent(addr_list[i].name) %}" class="btn btn-default btn-xs edit-btn">
-		{%= __("Edit") %}</a>
+	<a
+		href="/app/Form/Address/{%= encodeURIComponent(addr_list[i].name) %}"
+		class="btn btn-xs btn-default edit-btn"
+		title="{%= __('Edit') %}"
+	>
+		<svg class="icon icon-xs">
+			<use href="#icon-edit"></use>
+		</svg>
+	</a>
 	<p class="h6 flex flex-wrap">
 		{%= i+1 %}. {%= addr_list[i].address_title %}
 		{% if(addr_list[i].address_type!="Other") { %}
diff --git a/frappe/public/js/frappe/form/templates/contact_list.html b/frappe/public/js/frappe/form/templates/contact_list.html
index 874d67d7b7..7713b31d46 100644
--- a/frappe/public/js/frappe/form/templates/contact_list.html
+++ b/frappe/public/js/frappe/form/templates/contact_list.html
@@ -1,9 +1,14 @@
 <div class="clearfix"></div>
 {% for(const contact of contact_list) { %}
 	<div class="address-box">
-		<a href="/app/Form/Contact/{%= encodeURIComponent(contact.name) %}"
-			class="btn btn-xs btn-default edit-btn">
-			{%= __("Edit") %}
+		<a
+			href="/app/Form/Contact/{%= encodeURIComponent(contact.name) %}"
+			class="btn btn-xs btn-default edit-btn"
+			title="{%= __('Edit') %}"
+		>
+			<svg class="icon icon-xs">
+				<use href="#icon-edit"></use>
+			</svg>
 		</a>
 		<p class="h6 flex flex-wrap">
 			{%= contact.first_name %} {%= contact.last_name %}
diff --git a/frappe/public/scss/common/controls.scss b/frappe/public/scss/common/controls.scss
index 676bf22aa2..77e104098d 100644
--- a/frappe/public/scss/common/controls.scss
+++ b/frappe/public/scss/common/controls.scss
@@ -157,6 +157,10 @@ select.form-control {
 			position: absolute;
 			top: 5px;
 			right: 5px;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			padding: var(--padding-sm);
 		}
 	}
 	.action-btn {

From 9511b5a6c577b522db7020c73da4093dba2daf5c Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Thu, 31 Aug 2023 12:56:00 +0200
Subject: [PATCH 3/9] fix: spacing in address and contact list

---
 .../public/js/frappe/form/templates/address_list.html  | 10 +++++-----
 .../public/js/frappe/form/templates/contact_list.html  |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frappe/public/js/frappe/form/templates/address_list.html b/frappe/public/js/frappe/form/templates/address_list.html
index a5cfb3de8d..c0054a2af6 100644
--- a/frappe/public/js/frappe/form/templates/address_list.html
+++ b/frappe/public/js/frappe/form/templates/address_list.html
@@ -11,18 +11,18 @@
 		</svg>
 	</a>
 	<p class="h6 flex flex-wrap">
-		{%= i+1 %}. {%= addr_list[i].address_title %}
+		<span>{%= i+1 %}. {%= addr_list[i].address_title %}</span>
 		{% if(addr_list[i].address_type!="Other") { %}
-			&#183;&nbsp;<span class="text-muted">{%= __(addr_list[i].address_type) %}</span>
+			&nbsp;&#183;&nbsp;<span class="text-muted">{%= __(addr_list[i].address_type) %}</span>
 		{% } %}
 		{% if(addr_list[i].is_primary_address) { %}
-			&#183;&nbsp;<span class="text-muted">{%= __("Primary") %}</span>
+			&nbsp;&#183;&nbsp;<span class="text-muted">{%= __("Primary") %}</span>
 		{% } %}
 		{% if(addr_list[i].is_shipping_address) { %}
-			&#183;&nbsp;<span class="text-muted">{%= __("Shipping") %}</span>
+			&nbsp;&#183;&nbsp;<span class="text-muted">{%= __("Shipping") %}</span>
 		{% } %}
 		{% if(addr_list[i].disabled) { %}
-			&#183;&nbsp;<span class="text-muted">{%= __("Disabled") %}</span>
+			&nbsp;&#183;&nbsp;<span class="text-muted">{%= __("Disabled") %}</span>
 		{% } %}
 	</p>
 	<p>{%= addr_list[i].display %}</p>
diff --git a/frappe/public/js/frappe/form/templates/contact_list.html b/frappe/public/js/frappe/form/templates/contact_list.html
index 7713b31d46..841dd9da28 100644
--- a/frappe/public/js/frappe/form/templates/contact_list.html
+++ b/frappe/public/js/frappe/form/templates/contact_list.html
@@ -11,12 +11,12 @@
 			</svg>
 		</a>
 		<p class="h6 flex flex-wrap">
-			{%= contact.first_name %} {%= contact.last_name %}
+			<span>{%= contact.first_name %} {%= contact.last_name %}</span>
 			{% if(contact.is_primary_contact) { %}
-				&#183;&nbsp;<span class="text-muted">{%= __("Primary Contact") %}</span>
+			&nbsp;&#183;&nbsp;<span class="text-muted">{%= __("Primary Contact") %}</span>
 			{% } %}
 			{% if(contact.designation){ %}
-				&#183;&nbsp;<span class="text-muted"> {%= contact.designation %}</span>
+				&nbsp;&#183;&nbsp;<span class="text-muted"> {%= contact.designation %}</span>
 			{% } %}
 		</p>
 		{% if (contact.phone || contact.mobile_no || contact.phone_nos.length > 0) { %}

From 740f4165723eb190c9658d4de111507299dd2e26 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Thu, 31 Aug 2023 15:32:30 +0200
Subject: [PATCH 4/9] refactor: use `frappe.utils.get_form_link`

---
 frappe/public/js/frappe/form/templates/address_list.html | 2 +-
 frappe/public/js/frappe/form/templates/contact_list.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/templates/address_list.html b/frappe/public/js/frappe/form/templates/address_list.html
index c0054a2af6..596dfe65f6 100644
--- a/frappe/public/js/frappe/form/templates/address_list.html
+++ b/frappe/public/js/frappe/form/templates/address_list.html
@@ -2,7 +2,7 @@
 {% for(var i=0, l=addr_list.length; i<l; i++) { %}
 <div class="address-box">
 	<a
-		href="/app/Form/Address/{%= encodeURIComponent(addr_list[i].name) %}"
+		href="{%= frappe.utils.get_form_link('Address', addr_list[i].name) %}"
 		class="btn btn-xs btn-default edit-btn"
 		title="{%= __('Edit') %}"
 	>
diff --git a/frappe/public/js/frappe/form/templates/contact_list.html b/frappe/public/js/frappe/form/templates/contact_list.html
index 841dd9da28..f293f1f35e 100644
--- a/frappe/public/js/frappe/form/templates/contact_list.html
+++ b/frappe/public/js/frappe/form/templates/contact_list.html
@@ -2,7 +2,7 @@
 {% for(const contact of contact_list) { %}
 	<div class="address-box">
 		<a
-			href="/app/Form/Contact/{%= encodeURIComponent(contact.name) %}"
+			href="{%= frappe.utils.get_form_link('Contact', contact.name) %}"
 			class="btn btn-xs btn-default edit-btn"
 			title="{%= __('Edit') %}"
 		>

From 45822067dc1b17c4b1092688845dfae6e3d66872 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Thu, 31 Aug 2023 15:35:36 +0200
Subject: [PATCH 5/9] refactor: use for..of loop in address list

---
 .../js/frappe/form/templates/address_list.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/frappe/public/js/frappe/form/templates/address_list.html b/frappe/public/js/frappe/form/templates/address_list.html
index 596dfe65f6..e909ada0fb 100644
--- a/frappe/public/js/frappe/form/templates/address_list.html
+++ b/frappe/public/js/frappe/form/templates/address_list.html
@@ -1,8 +1,8 @@
 <div class="clearfix"></div>
-{% for(var i=0, l=addr_list.length; i<l; i++) { %}
+{% for(const addr of addr_list) { %}
 <div class="address-box">
 	<a
-		href="{%= frappe.utils.get_form_link('Address', addr_list[i].name) %}"
+		href="{%= frappe.utils.get_form_link('Address', addr.name) %}"
 		class="btn btn-xs btn-default edit-btn"
 		title="{%= __('Edit') %}"
 	>
@@ -11,21 +11,21 @@
 		</svg>
 	</a>
 	<p class="h6 flex flex-wrap">
-		<span>{%= i+1 %}. {%= addr_list[i].address_title %}</span>
-		{% if(addr_list[i].address_type!="Other") { %}
-			&nbsp;&#183;&nbsp;<span class="text-muted">{%= __(addr_list[i].address_type) %}</span>
+		<span>{%= addr.address_title %}</span>
+		{% if(addr.address_type!="Other") { %}
+			&nbsp;&#183;&nbsp;<span class="text-muted">{%= __(addr.address_type) %}</span>
 		{% } %}
-		{% if(addr_list[i].is_primary_address) { %}
+		{% if(addr.is_primary_address) { %}
 			&nbsp;&#183;&nbsp;<span class="text-muted">{%= __("Primary") %}</span>
 		{% } %}
-		{% if(addr_list[i].is_shipping_address) { %}
+		{% if(addr.is_shipping_address) { %}
 			&nbsp;&#183;&nbsp;<span class="text-muted">{%= __("Shipping") %}</span>
 		{% } %}
-		{% if(addr_list[i].disabled) { %}
+		{% if(addr.disabled) { %}
 			&nbsp;&#183;&nbsp;<span class="text-muted">{%= __("Disabled") %}</span>
 		{% } %}
 	</p>
-	<p>{%= addr_list[i].display %}</p>
+	<p>{%= addr.display %}</p>
 </div>
 {% } %}
 {% if(!addr_list.length) { %}

From 8084d938e6b15542bfeb7119218831d1c8632bf2 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Thu, 31 Aug 2023 15:49:29 +0200
Subject: [PATCH 6/9] style: add space

---
 .../frappe/form/templates/address_list.html   | 72 +++++++++++--------
 .../frappe/form/templates/contact_list.html   | 69 ++++++++++++------
 2 files changed, 89 insertions(+), 52 deletions(-)

diff --git a/frappe/public/js/frappe/form/templates/address_list.html b/frappe/public/js/frappe/form/templates/address_list.html
index e909ada0fb..c70babc06f 100644
--- a/frappe/public/js/frappe/form/templates/address_list.html
+++ b/frappe/public/js/frappe/form/templates/address_list.html
@@ -1,34 +1,44 @@
 <div class="clearfix"></div>
-{% for(const addr of addr_list) { %}
-<div class="address-box">
-	<a
-		href="{%= frappe.utils.get_form_link('Address', addr.name) %}"
-		class="btn btn-xs btn-default edit-btn"
-		title="{%= __('Edit') %}"
-	>
-		<svg class="icon icon-xs">
-			<use href="#icon-edit"></use>
-		</svg>
-	</a>
-	<p class="h6 flex flex-wrap">
-		<span>{%= addr.address_title %}</span>
-		{% if(addr.address_type!="Other") { %}
-			&nbsp;&#183;&nbsp;<span class="text-muted">{%= __(addr.address_type) %}</span>
-		{% } %}
-		{% if(addr.is_primary_address) { %}
-			&nbsp;&#183;&nbsp;<span class="text-muted">{%= __("Primary") %}</span>
-		{% } %}
-		{% if(addr.is_shipping_address) { %}
-			&nbsp;&#183;&nbsp;<span class="text-muted">{%= __("Shipping") %}</span>
-		{% } %}
-		{% if(addr.disabled) { %}
-			&nbsp;&#183;&nbsp;<span class="text-muted">{%= __("Disabled") %}</span>
-		{% } %}
-	</p>
-	<p>{%= addr.display %}</p>
-</div>
+{% for (const addr of addr_list) { %}
+	<div class="address-box">
+		<a
+			href="{%= frappe.utils.get_form_link('Address', addr.name) %}"
+			class="btn btn-xs btn-default edit-btn"
+			title="{%= __('Edit') %}"
+		>
+			<svg class="icon icon-xs">
+				<use href="#icon-edit"></use>
+			</svg>
+		</a>
+		<p class="h6 flex flex-wrap">
+			<span>{%= addr.address_title %}</span>
+			{% if (addr.address_type !== "Other") { %}
+				&nbsp;&#183;&nbsp;
+				<span class="text-muted">{%= __(addr.address_type) %}</span>
+			{% } %}
+			{% if (addr.is_primary_address) { %}
+				&nbsp;&#183;&nbsp;
+				<span class="text-muted">{%= __("Primary") %}</span>
+			{% } %}
+			{% if (addr.is_shipping_address) { %}
+				&nbsp;&#183;&nbsp;
+				<span class="text-muted">{%= __("Shipping") %}</span>
+			{% } %}
+			{% if (addr.disabled) { %}
+				&nbsp;&#183;&nbsp;
+				<span class="text-muted">{%= __("Disabled") %}</span>
+			{% } %}
+		</p>
+		<p>{%= addr.display %}</p>
+	</div>
 {% } %}
-{% if(!addr_list.length) { %}
-<p class="text-muted small">{%= __("No address added yet.") %}</p>
+
+{% if (!addr_list.length) { %}
+	<p class="text-muted small">{%= __("No address added yet.") %}</p>
 {% } %}
-<p><button class="btn btn-xs btn-default btn-address">{{ __("New Address") }}</button></p>
\ No newline at end of file
+
+<p>
+	<button class="btn btn-xs btn-default btn-address">
+		{{ __("New Address") }}
+	</button>
+</p>
diff --git a/frappe/public/js/frappe/form/templates/contact_list.html b/frappe/public/js/frappe/form/templates/contact_list.html
index f293f1f35e..a581c4a66a 100644
--- a/frappe/public/js/frappe/form/templates/contact_list.html
+++ b/frappe/public/js/frappe/form/templates/contact_list.html
@@ -1,5 +1,5 @@
 <div class="clearfix"></div>
-{% for(const contact of contact_list) { %}
+{% for (const contact of contact_list) { %}
 	<div class="address-box">
 		<a
 			href="{%= frappe.utils.get_form_link('Contact', contact.name) %}"
@@ -12,36 +12,59 @@
 		</a>
 		<p class="h6 flex flex-wrap">
 			<span>{%= contact.first_name %} {%= contact.last_name %}</span>
-			{% if(contact.is_primary_contact) { %}
-			&nbsp;&#183;&nbsp;<span class="text-muted">{%= __("Primary Contact") %}</span>
+			{% if (contact.is_primary_contact) { %}
+				&nbsp;&#183;&nbsp;
+				<span class="text-muted">{%= __("Primary Contact") %}</span>
 			{% } %}
-			{% if(contact.designation){ %}
-				&nbsp;&#183;&nbsp;<span class="text-muted"> {%= contact.designation %}</span>
+			{% if (contact.designation){ %}
+				&nbsp;&#183;&nbsp;
+				<span class="text-muted"> {%= contact.designation %}</span>
 			{% } %}
 		</p>
 		{% if (contact.phone || contact.mobile_no || contact.phone_nos.length > 0) { %}
 		<p>
-			{% if(contact.phone) { %}
-				<a href="tel:{%= frappe.utils.escape_html(contact.phone) %}">{%= frappe.utils.escape_html(contact.phone) %}</a> &#183; <span class="text-muted">{%= __("Primary Phone") %}</span><br>
+			{% if (contact.phone) { %}
+				<a href="tel:{%= frappe.utils.escape_html(contact.phone) %}">
+					{%= frappe.utils.escape_html(contact.phone) %}
+				</a>
+				&#183;
+				<span class="text-muted">{%= __("Primary Phone") %}</span>
+				<br>
 			{% endif %}
-			{% if(contact.mobile_no) { %}
-				<a href="tel:{%= frappe.utils.escape_html(contact.mobile_no) %}">{%= frappe.utils.escape_html(contact.mobile_no) %}</a> &#183; <span class="text-muted">{%= __("Primary Mobile") %}</span><br>
+			{% if (contact.mobile_no) { %}
+				<a href="tel:{%= frappe.utils.escape_html(contact.mobile_no) %}">
+					{%= frappe.utils.escape_html(contact.mobile_no) %}
+				</a>
+				&#183;
+				<span class="text-muted">{%= __("Primary Mobile") %}</span>
+				<br>
 			{% endif %}
-			{% if(contact.phone_nos) { %}
-				{% for(const phone_no of contact.phone_nos) { %}
-					<a href="tel:{%= frappe.utils.escape_html(phone_no.phone) %}">{%= frappe.utils.escape_html(phone_no.phone) %}</a><br>
+			{% if (contact.phone_nos) { %}
+				{% for (const phone_no of contact.phone_nos) { %}
+					<a href="tel:{%= frappe.utils.escape_html(phone_no.phone) %}">
+						{%= frappe.utils.escape_html(phone_no.phone) %}
+					</a>
+					<br>
 				{% } %}
 			{% endif %}
 		</p>
 		{% endif %}
 		{% if (contact.email_id || contact.email_ids.length > 0) { %}
 		<p>
-			{% if(contact.email_id) { %}
-				<a href="mailto:{%= frappe.utils.escape_html(contact.email_id) %}">{%= frappe.utils.escape_html(contact.email_id) %}</a> &#183; <span class="text-muted">{%= __("Primary Email") %}</span><br>
+			{% if (contact.email_id) { %}
+				<a href="mailto:{%= frappe.utils.escape_html(contact.email_id) %}">
+					{%= frappe.utils.escape_html(contact.email_id) %}
+				</a>
+				&#183;
+				<span class="text-muted">{%= __("Primary Email") %}</span>
+				<br>
 			{% endif %}
-			{% if(contact.email_ids) { %}
-				{% for(const email_id of contact.email_ids) { %}
-					<a href="mailto:{%= frappe.utils.escape_html(email_id.email_id) %}">{%= frappe.utils.escape_html(email_id.email_id) %}</a><br>
+			{% if (contact.email_ids) { %}
+				{% for (const email_id of contact.email_ids) { %}
+					<a href="mailto:{%= frappe.utils.escape_html(email_id.email_id) %}">
+						{%= frappe.utils.escape_html(email_id.email_id) %}
+					</a>
+					<br>
 				{% } %}
 			{% endif %}
 		</p>
@@ -53,9 +76,13 @@
 		{% endif %}
 	</div>
 {% } %}
-{% if(!contact_list.length) { %}
-<p class="text-muted small">{%= __("No contacts added yet.") %}</p>
+
+{% if (!contact_list.length) { %}
+	<p class="text-muted small">{%= __("No contacts added yet.") %}</p>
 {% } %}
-<p><button class="btn btn-xs btn-default btn-contact">
-	{{ __("New Contact") }}</button>
+
+<p>
+	<button class="btn btn-xs btn-default btn-contact">
+		{{ __("New Contact") }}
+	</button>
 </p>

From b36a64ad474332f96f8eed2c4e9ff5cdff56d1d1 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Tue, 12 Sep 2023 16:14:04 +0200
Subject: [PATCH 7/9] fix: disabiguate address labels

---
 frappe/public/js/frappe/form/templates/address_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/templates/address_list.html b/frappe/public/js/frappe/form/templates/address_list.html
index c70babc06f..490ab07b8d 100644
--- a/frappe/public/js/frappe/form/templates/address_list.html
+++ b/frappe/public/js/frappe/form/templates/address_list.html
@@ -18,11 +18,11 @@
 			{% } %}
 			{% if (addr.is_primary_address) { %}
 				&nbsp;&#183;&nbsp;
-				<span class="text-muted">{%= __("Primary") %}</span>
+				<span class="text-muted">{%= __("Primary Address") %}</span>
 			{% } %}
 			{% if (addr.is_shipping_address) { %}
 				&nbsp;&#183;&nbsp;
-				<span class="text-muted">{%= __("Shipping") %}</span>
+				<span class="text-muted">{%= __("Shipping Address") %}</span>
 			{% } %}
 			{% if (addr.disabled) { %}
 				&nbsp;&#183;&nbsp;

From c6222ca7611f944631618132118e03f10a313eb5 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Tue, 12 Sep 2023 16:14:32 +0200
Subject: [PATCH 8/9] fix: add contact label "Billing Contact"

---
 frappe/public/js/frappe/form/templates/contact_list.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/public/js/frappe/form/templates/contact_list.html b/frappe/public/js/frappe/form/templates/contact_list.html
index a581c4a66a..ef11831f3f 100644
--- a/frappe/public/js/frappe/form/templates/contact_list.html
+++ b/frappe/public/js/frappe/form/templates/contact_list.html
@@ -16,6 +16,10 @@
 				&nbsp;&#183;&nbsp;
 				<span class="text-muted">{%= __("Primary Contact") %}</span>
 			{% } %}
+			{% if (contact.is_billing_contact) { %}
+				&nbsp;&#183;&nbsp;
+				<span class="text-muted">{%= __("Billing Contact") %}</span>
+			{% } %}
 			{% if (contact.designation){ %}
 				&nbsp;&#183;&nbsp;
 				<span class="text-muted"> {%= contact.designation %}</span>

From f94f3ad0a9528d9b48929531f9d444077b82b02a Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Tue, 12 Sep 2023 16:22:11 +0200
Subject: [PATCH 9/9] fix: german translations

For address and contact list
---
 frappe/translations/de.csv | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv
index cf27bbe449..a6d84ba8e1 100644
--- a/frappe/translations/de.csv
+++ b/frappe/translations/de.csv
@@ -1384,7 +1384,7 @@ Is Globally Pinned,Wird global gepinnt,
 Is Home Folder,Ist Ordner für Startseite,
 Is Mandatory Field,Ist Pflichtfeld,
 Is Pinned,Ist angeheftet,
-Is Primary Contact,Ist primärer Ansprechpartner,
+Is Primary Contact,Ist Hauptkontakt,
 Is Private,Ist Privat,
 Is Published Field,Ist Veröffentlicht Feld,
 Is Published Field must be a valid fieldname,Ist Veröffentlicht Feld muss eine gültige Feldname sein,
@@ -1940,6 +1940,11 @@ Preview Message,Vorschau Nachricht,
 Previous,Vorhergehende,
 Previous Hash,Vorheriger Hash,
 Primary Color,Primärfarbe,
+Primary Address,Hauptadresse,
+Primary Contact,Hauptkontakt,
+Primary Email,Haupt-E-Mail,
+Primary Mobile,Haupt-Mobiltelefon,
+Primary Phone,Haupttelefon,
 Print Documents,Dokumente drucken,
 Print Format Builder,Programm zum Erstellen von Druckformaten,
 Print Format Help,Hilfe zu Druckformaten,
@@ -4851,6 +4856,7 @@ Anonymous,Anonym,
 Author,Autor,
 Basic,Grundeinkommen,
 Billing,Abrechnung,
+Billing Contact,Abrechnungskontakt,
 Contact Details,Kontakt-Details,
 Datetime,Datum und Uhrzeit,
 Enable,ermöglichen,
@@ -4879,6 +4885,7 @@ Saved,Gespeichert,
 Series {0} already used in {1},Serie {0} bereits verwendet in {1},
 Set as Default,Als Standard festlegen,
 Shipping,Versand,
+Shipping Address,Lieferadresse,
 Standard,Standard,
 Test,Test,
 Traceback,Zurück verfolgen,