Merge PR #557 into 14.0

Signed-off-by alexis-via
OCA · Sep 30, 2024 · d678f88 · d678f88
2 parents 38f68df + cb62c6c
commit d678f88
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 98 deletions.
diff --git a/l10n_fr_oca/__manifest__.py b/l10n_fr_oca/__manifest__.py
@@ -8,13 +8,13 @@
     "website": "https://github.com/OCA/l10n-france",
     "depends": [
         "account_tax_unece",
+        "l10n_fr",
     ],
     "data": [
         "data/l10n_fr_chart_data.xml",
         "data/account.account.template.csv",
         "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",

diff --git a/l10n_fr_oca/data/account_data.xml b/l10n_fr_oca/data/account_data.xml
diff --git a/l10n_fr_oca/data/account_tax_data.xml b/l10n_fr_oca/data/account_tax_data.xml
@@ -12,7 +12,7 @@
         <field name="sequence" eval="10" />
         <field name="type_tax_use">sale</field>
         <field name="include_base_amount" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_20" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_20" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -61,7 +61,7 @@
         <field name="type_tax_use">sale</field>
         <field name="active" eval="0" />
         <field name="include_base_amount" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_10" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_10" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -110,7 +110,7 @@
         <field name="type_tax_use">sale</field>
         <field name="include_base_amount" eval="1" />
         <field name="active" eval="0" />
-        <field name="tax_group_id" ref="tax_group_tva_85" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_85" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -159,7 +159,7 @@
         <field name="type_tax_use">sale</field>
         <field name="active" eval="0" />
         <field name="include_base_amount" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_55" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_55" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -208,7 +208,7 @@
         <field name="type_tax_use">sale</field>
         <field name="active" eval="0" />
         <field name="include_base_amount" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_21" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_21" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -257,7 +257,7 @@
         <field name="amount_type">percent</field>
         <field name="sequence" eval="50" />
         <field name="type_tax_use">sale</field>
-        <field name="tax_group_id" ref="tax_group_tva_20" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_20" />
         <field name="active" eval="0" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
@@ -305,7 +305,7 @@
         <field name="sequence" eval="60" />
         <field name="type_tax_use">sale</field>
         <field name="active" eval="0" />
-        <field name="tax_group_id" ref="tax_group_tva_10" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_10" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -353,7 +353,7 @@
         <field name="sequence" eval="70" />
         <field name="type_tax_use">sale</field>
         <field name="active" eval="0" />
-        <field name="tax_group_id" ref="tax_group_tva_85" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_85" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -401,7 +401,7 @@
         <field name="sequence" eval="80" />
         <field name="type_tax_use">sale</field>
         <field name="active" eval="0" />
-        <field name="tax_group_id" ref="tax_group_tva_55" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_55" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -450,7 +450,7 @@
         <field name="sequence" eval="90" />
         <field name="type_tax_use">sale</field>
         <field name="active" eval="0" />
-        <field name="tax_group_id" ref="tax_group_tva_21" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_21" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -499,7 +499,7 @@
         <field name="sequence" eval="100" />
         <field name="type_tax_use">sale</field>
         <field name="include_base_amount" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_0" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_0" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_k" />
         <field
@@ -543,7 +543,7 @@
         <field name="sequence" eval="110" />
         <field name="type_tax_use">sale</field>
         <field name="include_base_amount" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_0" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_0" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_g" />
         <field
@@ -587,7 +587,7 @@
         <field name="sequence" eval="120" />
         <field name="type_tax_use">sale</field>
         <field name="include_base_amount" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_0" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_0" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_e" />
         <field
@@ -632,7 +632,7 @@
         <field name="sequence" eval="200" />
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_20" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_20" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -680,7 +680,7 @@
         <field name="sequence" eval="210" />
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_10" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_10" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -728,7 +728,7 @@
         <field name="sequence" eval="220" />
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_55" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_55" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -776,7 +776,7 @@
         <field name="sequence" eval="230" />
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_21" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_21" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -825,7 +825,7 @@
         <field name="amount_type">percent</field>
         <field name="sequence" eval="240" />
         <field name="type_tax_use">purchase</field>
-        <field name="tax_group_id" ref="tax_group_tva_20" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_20" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -873,7 +873,7 @@
         <field name="amount_type">percent</field>
         <field name="sequence" eval="250" />
         <field name="type_tax_use">purchase</field>
-        <field name="tax_group_id" ref="tax_group_tva_10" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_10" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -921,7 +921,7 @@
         <field name="amount_type">percent</field>
         <field name="sequence" eval="260" />
         <field name="type_tax_use">purchase</field>
-        <field name="tax_group_id" ref="tax_group_tva_55" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_55" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -969,7 +969,7 @@
         <field name="amount_type">percent</field>
         <field name="sequence" eval="270" />
         <field name="type_tax_use">purchase</field>
-        <field name="tax_group_id" ref="tax_group_tva_21" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_21" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_s" />
         <field
@@ -1018,7 +1018,7 @@
         <field name="sequence" eval="280" />
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_20" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_20" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field
             name="invoice_repartition_line_ids"
@@ -1066,7 +1066,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
         <field name="active" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_10" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_10" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field
             name="invoice_repartition_line_ids"
@@ -1114,7 +1114,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
         <field name="active" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_55" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_55" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field
             name="invoice_repartition_line_ids"
@@ -1165,7 +1165,7 @@
         <field name="sequence" eval="310" />
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_20" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_20" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_k" />
         <field
@@ -1228,7 +1228,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
         <field name="active" eval="0" />
-        <field name="tax_group_id" ref="tax_group_tva_10" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_10" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_k" />
         <field
@@ -1291,7 +1291,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
         <field name="active" eval="0" />
-        <field name="tax_group_id" ref="tax_group_tva_55" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_55" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_k" />
         <field
@@ -1354,7 +1354,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
         <field name="active" eval="0" />
-        <field name="tax_group_id" ref="tax_group_tva_21" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_21" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_k" />
         <field
@@ -1419,7 +1419,7 @@
         <field name="sequence" eval="350" />
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_20" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_20" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_g" />
         <field
@@ -1484,7 +1484,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
         <field name="active" eval="0" />
-        <field name="tax_group_id" ref="tax_group_tva_10" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_10" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_g" />
         <field
@@ -1549,7 +1549,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
         <field name="active" eval="0" />
-        <field name="tax_group_id" ref="tax_group_tva_55" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_55" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_g" />
         <field
@@ -1614,7 +1614,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
         <field name="active" eval="0" />
-        <field name="tax_group_id" ref="tax_group_tva_21" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_21" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field name="unece_categ_id" ref="account_tax_unece.tax_categ_g" />
         <field
@@ -1679,7 +1679,7 @@
         <field name="sequence" eval="400" />
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_0" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_0" />
         <field name="active" eval="0" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field
@@ -1722,7 +1722,7 @@
         <field name="sequence" eval="500" />
         <field name="type_tax_use">purchase</field>
         <field name="include_base_amount" eval="1" />
-        <field name="tax_group_id" ref="tax_group_tva_20" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_20" />
         <field name="active" eval="0" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field
@@ -1786,7 +1786,7 @@
         <field name="sequence" eval="510" />
         <field name="price_include" eval="1" />
         <field name="type_tax_use">purchase</field>
-        <field name="tax_group_id" ref="tax_group_tva_20" />
+        <field name="tax_group_id" ref="l10n_fr.tax_group_tva_20" />
         <field name="active" eval="0" />
         <field name="unece_type_id" ref="account_tax_unece.tax_type_vat" />
         <field

diff --git a/l10n_fr_oca/i18n/l10n_fr_oca.pot b/l10n_fr_oca/i18n/l10n_fr_oca.pot
@@ -24,33 +24,3 @@ msgstr ""
 #: model:account.fiscal.position,note:l10n_fr_oca.4_fiscal_position_template_import_export
 msgid "French VAT exemption according to articles 291, 294 and 262 I of \"CGI\""
 msgstr ""
-
-#. module: l10n_fr_oca
-#: model:account.tax.group,name:l10n_fr_oca.tax_group_tva_0
-msgid "TVA 0%"
-msgstr ""
-
-#. module: l10n_fr_oca
-#: model:account.tax.group,name:l10n_fr_oca.tax_group_tva_10
-msgid "TVA 10%"
-msgstr ""
-
-#. module: l10n_fr_oca
-#: model:account.tax.group,name:l10n_fr_oca.tax_group_tva_21
-msgid "TVA 2,1%"
-msgstr ""
-
-#. module: l10n_fr_oca
-#: model:account.tax.group,name:l10n_fr_oca.tax_group_tva_20
-msgid "TVA 20%"
-msgstr ""
-
-#. module: l10n_fr_oca
-#: model:account.tax.group,name:l10n_fr_oca.tax_group_tva_55
-msgid "TVA 5,5%"
-msgstr ""
-
-#. module: l10n_fr_oca
-#: model:account.tax.group,name:l10n_fr_oca.tax_group_tva_85
-msgid "TVA 8,5%"
-msgstr ""