From ac04c9dbfd8ca1630753a8a76454718864e3dc5b Mon Sep 17 00:00:00 2001
From: mafo-odoo <mafo@odoo.com>
Date: Thu, 7 Apr 2022 14:28:05 +0000
Subject: [PATCH] [FIX] account: remove nested html p tag in p tag for
 invoicing report

Current behavior:
The invoice payment term of the report is a p tag with another p tag inside like:
<p name="payment_term">
	<span>
		<p> This is a payment term note</p>
	</span>
</p>
but because nested p tags are not supported in html de result in the browser is something like:
<p name="payment_term">
        <span></span>
</p>
<p> This is a payment term note</p>
<p></p>

Similar behavior can be observe for the fiscal position note.

Expected behavior:
The code should respect html format rules and not have nested p tags.

Solution: We replace the parent p tags by div tags, and we modify xml file that have xpath relying
on this tag.

opw-2804933

closes odoo/odoo#88660

Related: odoo/enterprise#26372
Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
---
 addons/account/views/report_invoice.xml           | 8 ++++----
 addons/l10n_ae/views/report_invoice_templates.xml | 2 +-
 addons/l10n_cl/views/report_invoice.xml           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index 3afdcaa0c3f..cdc1a892f8b 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -167,15 +167,15 @@
                     <p t-if="o.move_type in ('out_invoice', 'in_refund') and o.payment_reference" name="payment_communication">
                         Please use the following communication for your payment : <b><span t-field="o.payment_reference"/></b>
                     </p>
-                    <p t-if="o.invoice_payment_term_id" name="payment_term">
+                    <div t-if="o.invoice_payment_term_id" name="payment_term">
                         <span t-field="o.invoice_payment_term_id.note"/>
-                    </p>
+                    </div>
                     <div t-if="not is_html_empty(o.narration)" name="comment">
                         <span t-field="o.narration"/>
                     </div>
-                    <p t-if="not is_html_empty(o.fiscal_position_id.note)" name="note">
+                    <div t-if="not is_html_empty(o.fiscal_position_id.note)" name="note">
                         <span t-field="o.fiscal_position_id.note"/>
-                    </p>
+                    </div>
                     <p t-if="o.invoice_incoterm_id" name="incoterm">
                         <strong>Incoterm: </strong><span t-field="o.invoice_incoterm_id.code"/> - <span t-field="o.invoice_incoterm_id.name"/>
                     </p>
diff --git a/addons/l10n_ae/views/report_invoice_templates.xml b/addons/l10n_ae/views/report_invoice_templates.xml
index ca164c0c2d8..df0099e7478 100644
--- a/addons/l10n_ae/views/report_invoice_templates.xml
+++ b/addons/l10n_ae/views/report_invoice_templates.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <template id="report_invoice_document" inherit_id="account.report_invoice_document">
-        <xpath expr="//p[@name='payment_term']" position="after">
+        <xpath expr="//div[@name='payment_term']" position="after">
             <p t-if="o.company_id.country_id.code == 'AE' and o.partner_id.country_id.code != 'AE' and o.env.ref('l10n_ae.gcc_countries_group') in o.partner_id.country_id.country_group_ids">
                 Supply between <b>United Arab Emirates</b> and
                 <b>
diff --git a/addons/l10n_cl/views/report_invoice.xml b/addons/l10n_cl/views/report_invoice.xml
index 28457be5c17..fd6869f388e 100644
--- a/addons/l10n_cl/views/report_invoice.xml
+++ b/addons/l10n_cl/views/report_invoice.xml
@@ -173,7 +173,7 @@
         <xpath expr="//th[@name='th_taxes']" position="replace"/>
         <xpath expr="//span[@id='line_tax_ids']/.." position="replace"/>
 
-        <p name="payment_term" position="replace"/>
+        <div name="payment_term" position="replace"/>
         <xpath expr="//span[@t-field='o.payment_reference']/../.." position="replace"/>
 
         <!-- replace information section and usage chilean style -->