From 01d607906ad9b3bd668747f4d1d67cfd5fc1ebf1 Mon Sep 17 00:00:00 2001
From: oco-odoo <oco@odoo.com>
Date: Wed, 23 Nov 2022 09:27:16 +0000
Subject: [PATCH] [FIX] l10n_th: fix tax report formulas

Some formulas had not been properly converted to the new format introduced in 16.0. The report crashed when opening it.

OPW 3064180

X-original-commit: e0cd7020580bc34d5c31bc327361def534d04272
Part-of: odoo/odoo#107171
---
 .../l10n_ro/data/account_tax_report_data.xml   | 12 ++++++------
 .../l10n_th/data/account_tax_report_data.xml   | 18 ++++++++++++++++--
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_ro/data/account_tax_report_data.xml b/addons/l10n_ro/data/account_tax_report_data.xml
index be552fdd607..12e6130ba68 100644
--- a/addons/l10n_ro/data/account_tax_report_data.xml
+++ b/addons/l10n_ro/data/account_tax_report_data.xml
@@ -301,7 +301,7 @@
                                             model="account.report.expression">
                                         <field name="label">balance</field>
                                         <field name="engine">aggregation</field>
-                                        <field name="formula">0.5.balance * tax_ro_baza_rd242.balance</field>
+                                        <field name="formula">0.5 * tax_ro_baza_rd242.balance</field>
                                     </record>
                                 </field>
                             </record>
@@ -340,7 +340,7 @@
                                             model="account.report.expression">
                                         <field name="label">balance</field>
                                         <field name="engine">aggregation</field>
-                                        <field name="formula">0.5.balance * tax_ro_baza_rd252.balance</field>
+                                        <field name="formula">0.5 * tax_ro_baza_rd252.balance</field>
                                     </record>
                                 </field>
                             </record>
@@ -379,7 +379,7 @@
                                             model="account.report.expression">
                                         <field name="label">balance</field>
                                         <field name="engine">aggregation</field>
-                                        <field name="formula">0.5.balance * tax_ro_baza_rd262.balance</field>
+                                        <field name="formula">0.5 * tax_ro_baza_rd262.balance</field>
                                     </record>
                                 </field>
                             </record>
@@ -1382,7 +1382,7 @@
             <record id="account_tax_report_ro_baza_rd24_formula" model="account.report.expression">
                 <field name="label">balance</field>
                 <field name="engine">aggregation</field>
-                <field name="formula">tax_ro_baza_rd241.balance + 0.5.balance * tax_ro_baza_rd242.balance</field>
+                <field name="formula">tax_ro_baza_rd241.balance + 0.5 * tax_ro_baza_rd242.balance</field>
             </record>
         </field>
         <field name="children_ids">
@@ -1417,7 +1417,7 @@
             <record id="account_tax_report_ro_baza_rd25_formula" model="account.report.expression">
                 <field name="label">balance</field>
                 <field name="engine">aggregation</field>
-                <field name="formula">tax_ro_baza_rd251.balance + 0.5.balance * tax_ro_baza_rd252.balance</field>
+                <field name="formula">tax_ro_baza_rd251.balance + 0.5 * tax_ro_baza_rd252.balance</field>
             </record>
         </field>
         <field name="children_ids">
@@ -1452,7 +1452,7 @@
             <record id="account_tax_report_ro_baza_rd26_formula" model="account.report.expression">
                 <field name="label">balance</field>
                 <field name="engine">aggregation</field>
-                <field name="formula">tax_ro_baza_rd261.balance + 0.5.balance * tax_ro_baza_rd262.balance</field>
+                <field name="formula">tax_ro_baza_rd261.balance + 0.5 * tax_ro_baza_rd262.balance</field>
             </record>
         </field>
         <field name="children_ids">
diff --git a/addons/l10n_th/data/account_tax_report_data.xml b/addons/l10n_th/data/account_tax_report_data.xml
index 246329301eb..9e5e7b16518 100644
--- a/addons/l10n_th/data/account_tax_report_data.xml
+++ b/addons/l10n_th/data/account_tax_report_data.xml
@@ -102,11 +102,25 @@
                 <field name="children_ids">
                     <record id="tax_report_vat_payable" model="account.report.line">
                         <field name="name">8. Tax payable (5. minus 7. (if 5. is greater than 7.))</field>
-                        <field name="aggregation_formula">OUTPUTTAX_TAX.balance - INPUTTAX_TAX if (OUTPUTTAX_TAX &gt; INPUTTAX_TAX) else 0.balance</field>
+                        <field name="expression_ids">
+                            <record id="tax_report_vat_payable_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">OUTPUTTAX_TAX.balance - INPUTTAX_TAX.balance</field>
+                                <field name="subformula">if_above(THB(0))</field>
+                            </record>
+                        </field>
                     </record>
                     <record id="tax_report_vat_excess" model="account.report.line">
                         <field name="name">9. Excess tax payable (7. minus 5. (if 5. is less than 7.))</field>
-                        <field name="aggregation_formula">INPUTTAX_TAX.balance - OUTPUTTAX_TAX if (INPUTTAX_TAX &gt; OUTPUTTAX_TAX) else 0.balance</field>
+                        <field name="expression_ids">
+                            <record id="tax_report_vat_excess_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">INPUTTAX_TAX.balance - OUTPUTTAX_TAX.balance</field>
+                                <field name="subformula">if_above(THB(0))</field>
+                            </record>
+                        </field>
                     </record>
                     <record id="tax_report_vat_payment_last_period" model="account.report.line">
                         <field name="name">10. Excess tax payment carried forward from last period</field>