From 1fa4f1dc1065fc356b9153a15382585dee2b0bf0 Mon Sep 17 00:00:00 2001
From: luvi <luvi@odoo.com>
Date: Wed, 7 Sep 2022 07:08:11 +0000
Subject: [PATCH] [FIX] web,*: whitespaces in form/kanban templates

*: crm,link_tracker,project,sale,utm

Before this commit, in some form and kanban views, there were
missing whitespaces, typically between icons and texts. This was
due to the transition to owl views, because we simply ignored
`&amp;nbsp;` in archs. This commit also fixes a layout issue in
a project view, where the icon and the field should be displayed
in the same line.

closes odoo/odoo#101040

X-original-commit: f5813e348b6052436a4fabaa5837ecc37b15430e
Related: odoo/enterprise#31746
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
---
 addons/crm/views/utm_campaign_views.xml          | 3 +--
 addons/link_tracker/views/utm_campaign_views.xml | 3 +--
 addons/project/views/project_views.xml           | 5 ++---
 addons/sale/views/utm_campaign_views.xml         | 5 +----
 addons/utm/static/src/scss/utm_views.scss        | 2 --
 addons/web/static/src/core/utils/xml.js          | 4 +++-
 6 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/addons/crm/views/utm_campaign_views.xml b/addons/crm/views/utm_campaign_views.xml
index 56d18bc79f9..a134c2b1b0d 100644
--- a/addons/crm/views/utm_campaign_views.xml
+++ b/addons/crm/views/utm_campaign_views.xml
@@ -12,8 +12,7 @@
                 <div class="me-3"
                     groups="sales_team.group_sale_salesman"
                     t-att-title="record.use_leads.raw_value ? 'Leads' : 'Opportunities'">
-                    <i class="fa fa-star text-muted"></i>
-                    <small class="fw-bold"><field name="crm_lead_count"/></small>
+                    <i class="fa fa-star text-muted"></i> <small class="fw-bold"><field name="crm_lead_count"/></small>
                 </div>
             </xpath>
         </field>
diff --git a/addons/link_tracker/views/utm_campaign_views.xml b/addons/link_tracker/views/utm_campaign_views.xml
index c1d922a0d4c..21d9b4a3ede 100644
--- a/addons/link_tracker/views/utm_campaign_views.xml
+++ b/addons/link_tracker/views/utm_campaign_views.xml
@@ -24,8 +24,7 @@
             </xpath>
             <xpath expr="//div[@id='utm_statistics']" position="inside">
                 <div class="me-3" title="Clicks">
-                    <i class="fa fa-mouse-pointer text-muted"></i>
-                    <small class="fw-bold" t-esc="record.click_count.raw_value" />
+                    <i class="fa fa-mouse-pointer text-muted"></i> <small class="fw-bold" t-esc="record.click_count.raw_value" />
                 </div>
             </xpath>
         </field>
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 14b2406a8fe..46a5eb46dd2 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -521,11 +521,10 @@
                                     <field name="analytic_account_id" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]" context="{'default_partner_id': partner_id}" groups="analytic.group_analytic_accounting"/>
                                     <field name="privacy_visibility" widget="radio"/>
                                     <span colspan="2" class="text-muted" attrs="{'invisible':[('access_instruction_message', '=', '')]}">
-                                        <i class="fa fa-lightbulb-o"/>&amp;nbsp;<field name="access_instruction_message" nolabel="1"/>
+                                        <i class="fa fa-lightbulb-o"/>&amp;nbsp;<field class="d-inline" name="access_instruction_message" nolabel="1"/>
                                     </span>
                                     <span colspan="2" class="text-muted" attrs="{'invisible':[('privacy_visibility_warning', '=', '')]}">
-                                        <i class="fa fa-warning">&amp;nbsp;</i>
-                                        <field name="privacy_visibility_warning" nolabel="1"/>
+                                        <i class="fa fa-warning"/>&amp;nbsp;<field class="d-inline" name="privacy_visibility_warning" nolabel="1"/>
                                     </span>
                                 </group>
                                 <group>
diff --git a/addons/sale/views/utm_campaign_views.xml b/addons/sale/views/utm_campaign_views.xml
index 1d48cbda82c..7e2132d72f4 100644
--- a/addons/sale/views/utm_campaign_views.xml
+++ b/addons/sale/views/utm_campaign_views.xml
@@ -14,10 +14,7 @@
                     </small>
                 </div>
                 <div class="me-3" title="Quotations" groups="sales_team.group_sale_salesman">
-                    <i class="fa fa-money text-muted"></i>
-                    <small class="fw-bold">
-                        <field name="quotation_count"/>
-                    </small>
+                    <i class="fa fa-money text-muted"></i> <small class="fw-bold"><field name="quotation_count"/></small>
                 </div>
             </xpath>
         </field>
diff --git a/addons/utm/static/src/scss/utm_views.scss b/addons/utm/static/src/scss/utm_views.scss
index 34f47b5ac18..9791dea18d1 100644
--- a/addons/utm/static/src/scss/utm_views.scss
+++ b/addons/utm/static/src/scss/utm_views.scss
@@ -4,8 +4,6 @@
     --KanbanGroup-padding-bottom: #{$grid-gutter-width};
 
     #o_utm_actions {
-        margin: 0 calc(var(--KanbanRecord-padding-h) * -1);
-
         > a {
             padding: var(--KanbanRecord-gap-inner-v) var(--KanbanRecord-padding-h);
             white-space: nowrap;
diff --git a/addons/web/static/src/core/utils/xml.js b/addons/web/static/src/core/utils/xml.js
index 1f07f87f2c6..a57a606c642 100644
--- a/addons/web/static/src/core/utils/xml.js
+++ b/addons/web/static/src/core/utils/xml.js
@@ -1,5 +1,7 @@
 /** @odoo-module **/
 
+import { nbsp } from "@web/core/utils/strings";
+
 /**
  * XML document to create new elements from. The fact that this is a "text/xml"
  * document ensures that tagNames and attribute names are case sensitive.
@@ -47,7 +49,7 @@ export class XMLParser {
      * @returns {Element}
      */
     parseXML(arch) {
-        const cleanedArch = arch.replace(/&amp;nbsp;/g, "");
+        const cleanedArch = arch.replace(/&amp;nbsp;/g, nbsp);
         const xml = parser.parseFromString(cleanedArch, "text/xml");
         if (hasParsingError(xml)) {
             throw new Error(