From a39ffcaf5fdadaaaf9daf376b7048afc3c70f6ce Mon Sep 17 00:00:00 2001
From: "Claire Bretton (clbr)" <clbr@odoo.com>
Date: Mon, 18 Mar 2024 11:34:12 +0100
Subject: [PATCH] =?UTF-8?q?[FIX]=20l10n=5Fcz:=20change=20position=20of=20V?=
 =?UTF-8?q?AT/DI=C4=8C=20in=20Czech=20localization?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In Czech republic, the standard is to first render Company ID (IČO), and then to render VAT ID (DIČ).
- Changing the position to before (not after), so company ID renders before VAT ID.
- Changed label from "ID" to "Company ID" (so it is obvious in what ID it is).

Original fixes by @cunivca: odoo/odoo#149339, odoo/odoo#149340, merged into one.

closes odoo/odoo#157993

Related: https://github.com/odoo/odoo/commit/d0704a19de31e0251d343081ae6b3da9991a248e
Signed-off-by: Habib Ayob (ayh) <ayh@odoo.com>
---
 addons/l10n_cz/i18n/cs.po                | 12 ++++++------
 addons/l10n_cz/i18n/l10n_cz.pot          | 12 ++++++------
 addons/l10n_cz/views/report_invoice.xml  | 12 ++++++------
 addons/l10n_cz/views/report_template.xml | 24 ++++++++++++------------
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/addons/l10n_cz/i18n/cs.po b/addons/l10n_cz/i18n/cs.po
index 5370c45fc0c..98edc2fe1a2 100644
--- a/addons/l10n_cz/i18n/cs.po
+++ b/addons/l10n_cz/i18n/cs.po
@@ -47,20 +47,20 @@ msgstr "Vzhled dokumentů společnosti"
 msgid "Company ID"
 msgstr "IČO společnosti"
 
-#. module: l10n_cz
-#: model:ir.model.fields,field_description:l10n_cz.field_base_document_layout__account_fiscal_country_id
-msgid "Fiscal Country"
-msgstr "Daňová země"
-
 #. module: l10n_cz
 #: model_terms:ir.ui.view,arch_db:l10n_cz.l10n_cz_external_layout_bold
 #: model_terms:ir.ui.view,arch_db:l10n_cz.l10n_cz_external_layout_boxed
 #: model_terms:ir.ui.view,arch_db:l10n_cz.l10n_cz_external_layout_standard
 #: model_terms:ir.ui.view,arch_db:l10n_cz.l10n_cz_external_layout_striped
 #: model_terms:ir.ui.view,arch_db:l10n_cz.report_invoice_document
-msgid "ID:"
+msgid "Company ID:"
 msgstr "IČO:"
 
+#. module: l10n_cz
+#: model:ir.model.fields,field_description:l10n_cz.field_base_document_layout__account_fiscal_country_id
+msgid "Fiscal Country"
+msgstr "Daňová země"
+
 #. module: l10n_cz
 #: model:ir.model,name:l10n_cz.model_account_move
 msgid "Journal Entry"
diff --git a/addons/l10n_cz/i18n/l10n_cz.pot b/addons/l10n_cz/i18n/l10n_cz.pot
index 7b48b4b3a6d..5681be32d6c 100644
--- a/addons/l10n_cz/i18n/l10n_cz.pot
+++ b/addons/l10n_cz/i18n/l10n_cz.pot
@@ -45,18 +45,18 @@ msgstr ""
 msgid "Company ID"
 msgstr ""
 
-#. module: l10n_cz
-#: model:ir.model.fields,field_description:l10n_cz.field_base_document_layout__account_fiscal_country_id
-msgid "Fiscal Country"
-msgstr ""
-
 #. module: l10n_cz
 #: model_terms:ir.ui.view,arch_db:l10n_cz.l10n_cz_external_layout_bold
 #: model_terms:ir.ui.view,arch_db:l10n_cz.l10n_cz_external_layout_boxed
 #: model_terms:ir.ui.view,arch_db:l10n_cz.l10n_cz_external_layout_standard
 #: model_terms:ir.ui.view,arch_db:l10n_cz.l10n_cz_external_layout_striped
 #: model_terms:ir.ui.view,arch_db:l10n_cz.report_invoice_document
-msgid "ID:"
+msgid "Company ID:"
+msgstr ""
+
+#. module: l10n_cz
+#: model:ir.model.fields,field_description:l10n_cz.field_base_document_layout__account_fiscal_country_id
+msgid "Fiscal Country"
 msgstr ""
 
 #. module: l10n_cz
diff --git a/addons/l10n_cz/views/report_invoice.xml b/addons/l10n_cz/views/report_invoice.xml
index bcdf4a16773..98eb1adef77 100644
--- a/addons/l10n_cz/views/report_invoice.xml
+++ b/addons/l10n_cz/views/report_invoice.xml
@@ -2,21 +2,21 @@
 <odoo>
     <template id="report_invoice_document" inherit_id="account.report_invoice_document">
         <!-- add company id to partner details-->
-        <xpath expr="//div[@id='partner_vat_address_not_same_as_shipping']" position="after">
+        <xpath expr="//div[@id='partner_vat_address_not_same_as_shipping']" position="before">
             <div t-if="o.partner_id.company_registry and o.company_id.country_code == 'CZ'">
-                ID: <span t-field="o.partner_id.company_registry"/>
+                Company ID: <span t-field="o.partner_id.company_registry"/>
             </div>
         </xpath>
 
-        <xpath expr="//div[@id='partner_vat_address_same_as_shipping']" position="after">
+        <xpath expr="//div[@id='partner_vat_address_same_as_shipping']" position="before">
             <div t-if="o.partner_id.company_registry and o.company_id.country_code == 'CZ'">
-                ID: <span t-field="o.partner_id.company_registry"/>
+                Company ID: <span t-field="o.partner_id.company_registry"/>
             </div>
         </xpath>
 
-        <xpath expr="//div[@id='partner_vat_no_shipping']" position="after">
+        <xpath expr="//div[@id='partner_vat_no_shipping']" position="before">
             <div t-if="o.partner_id.company_registry and o.company_id.country_code == 'CZ'">
-                ID: <span t-field="o.partner_id.company_registry"/>
+                Company ID: <span t-field="o.partner_id.company_registry"/>
             </div>
         </xpath>
 
diff --git a/addons/l10n_cz/views/report_template.xml b/addons/l10n_cz/views/report_template.xml
index fcf993d303e..76556bb2f9e 100644
--- a/addons/l10n_cz/views/report_template.xml
+++ b/addons/l10n_cz/views/report_template.xml
@@ -2,49 +2,49 @@
 <odoo>
     <template id="l10n_cz_external_layout_standard" inherit_id="web.external_layout_standard">
         <xpath expr="//ul[@name='company_address_list']" position="inside">
+            <li t-if="company.company_registry and company.account_fiscal_country_id.code == 'CZ'">
+                Company ID: <span t-field="company.company_registry"/>
+            </li>
             <li t-if="company.vat and company.account_fiscal_country_id.code == 'CZ'">
                 <t t-esc="company.country_id.vat_label or 'Tax ID'"/>:
                 <span t-esc="company.vat"/>
             </li>
-            <li t-if="company.company_registry and company.account_fiscal_country_id.code == 'CZ'">
-                ID: <span t-field="company.company_registry"/>
-            </li>
         </xpath>
     </template>
 
     <template id="l10n_cz_external_layout_bold" inherit_id="web.external_layout_bold">
         <xpath expr="//ul[@name='company_address_list']" position="inside">
+            <li t-if="company.company_registry and company.account_fiscal_country_id.code == 'CZ'">
+                Company ID: <span t-field="company.company_registry"/>
+            </li>
             <li t-if="company.vat and company.account_fiscal_country_id.code == 'CZ'">
                 <t t-esc="company.country_id.vat_label or 'Tax ID'"/>:
                 <span t-esc="company.vat"/>
             </li>
-            <li t-if="company.company_registry and company.account_fiscal_country_id.code == 'CZ'">
-                ID: <span t-field="company.company_registry"/>
-            </li>
         </xpath>
     </template>
 
     <template id="l10n_cz_external_layout_boxed" inherit_id="web.external_layout_boxed">
         <xpath expr="//ul[@name='company_address_list']" position="inside">
+            <li t-if="company.company_registry and company.account_fiscal_country_id.code == 'CZ'">
+                Company ID: <span t-field="company.company_registry"/>
+            </li>
             <li t-if="company.vat and company.account_fiscal_country_id.code == 'CZ'">
                 <t t-esc="company.country_id.vat_label or 'Tax ID'"/>:
                 <span t-esc="company.vat"/>
             </li>
-            <li t-if="company.company_registry and company.account_fiscal_country_id.code == 'CZ'">
-                ID: <span t-field="company.company_registry"/>
-            </li>
         </xpath>
     </template>
 
     <template id="l10n_cz_external_layout_striped" inherit_id="web.external_layout_striped">
         <xpath expr="//ul[@name='company_address_list']" position="inside">
+            <li t-if="company.company_registry and company.account_fiscal_country_id.code == 'CZ'">
+                Company ID: <span t-field="company.company_registry"/>
+            </li>
             <li t-if="company.vat and company.account_fiscal_country_id.code == 'CZ'">
                 <t t-esc="company.country_id.vat_label or 'Tax ID'"/>:
                 <span t-esc="company.vat"/>
             </li>
-            <li t-if="company.company_registry and company.account_fiscal_country_id.code == 'CZ'">
-                ID: <span t-field="company.company_registry"/>
-            </li>
         </xpath>
     </template>
 </odoo>