From 05dc6679b99b432b535460dc589d44bce57937ba Mon Sep 17 00:00:00 2001
From: "Nasreddin (bon)" <bon@odoo.com>
Date: Tue, 14 Jul 2020 09:10:50 +0000
Subject: [PATCH] [FIX] base: Handle custom field under country in contact
kanban view
Issue
- Install "Studio" and "Contact" apps
- Edit with Studio the Contact Kanban View
- Add field under city/country
Field appears only if no city is set.
Cause
The new field has as anchor the 5th <li> with the field country
who will appear only if not city is set. However, in case there a city
AND a country, the 6th <li> will appear instead of 5th (the target one).
Solution
Let only one <li>, one country and one city field but with the right conditions.
opw-2288545
closes odoo/odoo#54423
Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
---
odoo/addons/base/views/res_partner_views.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/odoo/addons/base/views/res_partner_views.xml b/odoo/addons/base/views/res_partner_views.xml
index da975e231340..f3b42502275f 100644
--- a/odoo/addons/base/views/res_partner_views.xml
+++ b/odoo/addons/base/views/res_partner_views.xml
@@ -470,9 +470,10 @@
<li t-if="record.parent_id.raw_value and !record.function.raw_value"><field name="parent_id"/></li>
<li t-if="!record.parent_id.raw_value and record.function.raw_value"><field name="function"/></li>
<li t-if="record.parent_id.raw_value and record.function.raw_value"><field name="function"/> at <field name="parent_id"/></li>
- <li t-if="record.city.raw_value and !record.country_id.raw_value"><field name="city"/></li>
- <li t-if="!record.city.raw_value and record.country_id.raw_value"><field name="country_id"/></li>
- <li t-if="record.city.raw_value and record.country_id.raw_value"><field name="city"/>, <field name="country_id"/></li>
+ <li t-if="record.city.raw_value or record.country_id.raw_value">
+ <t t-if="record.city.raw_value"><field name="city"/><t t-if="record.country_id.raw_value">, </t></t>
+ <t t-if="record.country_id.raw_value"><field name="country_id"/></t>
+ </li>
<li t-if="record.email.raw_value" class="o_text_overflow"><field name="email"/></li>
</ul>
<div class="o_row">
--
GitLab