[MIG] l10n_fr_oca to v16

Remove tax codes because we can't create them as in l10n_fr because the code must be unique and we don't want this module to depend on l10n_fr. And this module is designed for the OCA VAT return, so we don't need them.
OCA · Mar 7, 2023 · f507b0f · f507b0f
1 parent 6ced8c6
commit f507b0f
Show file tree

Hide file tree

Showing 11 changed files with 775 additions and 1,825 deletions.
diff --git a/l10n_fr_oca/__manifest__.py b/l10n_fr_oca/__manifest__.py
@@ -1,6 +1,6 @@
 {
     "name": "France - OCA Chart of Account",
-    "version": "14.0.1.0.0",
+    "version": "16.0.1.0.0",
     "category": "Accounting/Localizations/Account Charts",
     "summary": "Fork of l10n_fr: fewer taxes, ready for OCA VAT return for France",
     "author": "Akretion,Odoo SA,Odoo Community Association (OCA)",
@@ -15,7 +15,6 @@
         "data/account.group.template.csv",
         "data/account_chart_template_data.xml",
         "data/account_data.xml",
-        "data/tax_report_data.xml",
         "data/account_tax_data.xml",
         "data/account_account_template_default_tax.xml",
         "data/account_fiscal_position_template_data.xml",

diff --git a/l10n_fr_oca/data/account.account.template.csv b/l10n_fr_oca/data/account.account.template.csv
diff --git a/l10n_fr_oca/data/account_account_template_default_tax.xml b/l10n_fr_oca/data/account_account_template_default_tax.xml
@@ -2,6 +2,8 @@
 <odoo>
 
 <!--  Default taxes on accounts  -->
+<!-- We can't put this in account.account.template.csv because we need to load
+    taxes before, and taxes need to be loaded after account.account.template.csv -->
 
 <!-- Expenses -->
     <record id="pcg_6011" model="account.account.template">

diff --git a/l10n_fr_oca/data/account_chart_template_configure_data.xml b/l10n_fr_oca/data/account_chart_template_configure_data.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
-        <function model="account.chart.template" name="try_loading">
-            <value eval="[ref('l10n_fr_oca.l10n_fr_pcg_chart_template')]" />
-        </function>
-    </data>
+<odoo noupdate="1">
+    <function model="account.chart.template" name="try_loading">
+        <value eval="[ref('l10n_fr_oca.l10n_fr_pcg_chart_template')]" />
+    </function>
 </odoo>
diff --git a/l10n_fr_oca/data/account_chart_template_data.xml b/l10n_fr_oca/data/account_chart_template_data.xml
@@ -11,6 +11,8 @@
       <field name="property_tax_payable_account_id" ref="pcg_44551" />
       <field name="property_tax_receivable_account_id" ref="pcg_44567" />
       <field name="default_pos_receivable_account_id" ref="fr_pcg_recv_pos" />
+      <field name="account_journal_early_pay_discount_loss_account_id" ref="pcg_665" />
+      <field name="account_journal_early_pay_discount_gain_account_id" ref="pcg_765" />
       <field name="currency_id" ref="base.EUR" />
     </record>
 </odoo>
diff --git a/l10n_fr_oca/data/account_data.xml b/l10n_fr_oca/data/account_data.xml
@@ -1,31 +1,29 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
-        <!-- Account Tax Group -->
-        <record id="tax_group_tva_0" model="account.tax.group">
-            <field name="name">TVA 0%</field>
-        </record>
+    <!-- Account Tax Group -->
+    <record id="tax_group_tva_0" model="account.tax.group">
+        <field name="name">TVA 0%</field>
+    </record>
 
-        <record id="tax_group_tva_20" model="account.tax.group">
-            <field name="name">TVA 20%</field>
-        </record>
+    <record id="tax_group_tva_20" model="account.tax.group">
+        <field name="name">TVA 20%</field>
+    </record>
 
-        <record id="tax_group_tva_85" model="account.tax.group">
-            <field name="name">TVA 8,5%</field>
-        </record>
+    <record id="tax_group_tva_85" model="account.tax.group">
+        <field name="name">TVA 8,5%</field>
+    </record>
 
-        <record id="tax_group_tva_55" model="account.tax.group">
-            <field name="name">TVA 5,5%</field>
-        </record>
+    <record id="tax_group_tva_55" model="account.tax.group">
+        <field name="name">TVA 5,5%</field>
+    </record>
 
-        <record id="tax_group_tva_10" model="account.tax.group">
-            <field name="name">TVA 10%</field>
-        </record>
+    <record id="tax_group_tva_10" model="account.tax.group">
+        <field name="name">TVA 10%</field>
+    </record>
 
-        <record id="tax_group_tva_21" model="account.tax.group">
-            <field name="name">TVA 2,1%</field>
-        </record>
+    <record id="tax_group_tva_21" model="account.tax.group">
+        <field name="name">TVA 2,1%</field>
+    </record>
 
-    </data>
 </odoo>