[MERGE] forward port branch saas-12.4 up to fe59754c520

closes odoo/odoo#36721

Signed-off-by: Christophe Simonis <chs@odoo.com>

2 files changed, 17 insertions, 8 deletions

diff --git a/addons/l10n_ma/data/account_tax_data.xml b/addons/l10n_ma/data/account_tax_data.xml
index 0842eeb1076..3309e6959f3 100644
--- a/addons/l10n_ma/data/account_tax_data.xml
+++ b/addons/l10n_ma/data/account_tax_data.xml
@@ -2,10 +2,10 @@
 <odoo>
     <!-- account chart  -->
     <record id="l10n_kzc_temp_chart" model="account.chart.template">
-        <field name="property_account_receivable_id" ref="pcg_3488"/>
-        <field name="property_account_payable_id" ref="pcg_4488"/>
+        <field name="property_account_receivable_id" ref="pcg_34211"/>
+        <field name="property_account_payable_id" ref="pcg_4411"/>
         <field name="property_account_income_categ_id" ref="pcg_7111"/>
-        <field name="property_account_expense_categ_id" ref="pcg_1486"/>
+        <field name="property_account_expense_categ_id" ref="pcg_6111"/>
         <field name="income_currency_exchange_account_id" ref="pcg_733"/>
         <field name="expense_currency_exchange_account_id" ref="pcg_633"/>
         <field name="default_pos_receivable_account_id" ref="pcg_3489" />
diff --git a/addons/l10n_ma/data/l10n_ma_chart_data.xml b/addons/l10n_ma/data/l10n_ma_chart_data.xml
index d15a3bc99c3..76c0d257799 100644
--- a/addons/l10n_ma/data/l10n_ma_chart_data.xml
+++ b/addons/l10n_ma/data/l10n_ma_chart_data.xml
@@ -1190,13 +1190,15 @@
   <record id="pcg_34211" model="account.account.template">
     <field name="name">Clients - catégorie A</field>
     <field name="code">34211</field>
-    <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+    <field name="user_type_id" ref="account.data_account_type_receivable"/>
+    <field name="reconcile" eval='True'/>
     <field name="chart_template_id" ref="l10n_kzc_temp_chart"/>
   </record>
   <record id="pcg_34212" model="account.account.template">
     <field name="name">Clients - catégorie B</field>
     <field name="code">34212</field>
-    <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+    <field name="user_type_id" ref="account.data_account_type_receivable"/>
+    <field name="reconcile" eval='True'/>
     <field name="chart_template_id" ref="l10n_kzc_temp_chart"/>
   </record>
   <record id="pcg_3423" model="account.account.template">
@@ -1370,7 +1372,7 @@
   <record id="pcg_3488" model="account.account.template">
     <field name="name">Divers débiteurs</field>
     <field name="code">3488</field>
-    <field name="user_type_id" ref="account.data_account_type_receivable"/>
+    <field name="user_type_id" ref="account.data_account_type_current_assets"/>
     <field name="reconcile" eval='True'/>
     <field name="chart_template_id" ref="l10n_kzc_temp_chart"/>
   </record>
@@ -1522,7 +1524,8 @@
   <record id="pcg_4411" model="account.account.template">
     <field name="name">Fournisseurs</field>
     <field name="code">4411</field>
-    <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
+    <field name="user_type_id" ref="account.data_account_type_payable"/>
+    <field name="reconcile" eval='True'/>
     <field name="chart_template_id" ref="l10n_kzc_temp_chart"/>
   </record>
   <record id="pcg_4413" model="account.account.template">
@@ -1768,7 +1771,7 @@
   <record id="pcg_4488" model="account.account.template">
     <field name="name">Divers créanciers</field>
     <field name="code">4488</field>
-    <field name="user_type_id" ref="account.data_account_type_payable"/>
+    <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
     <field name="chart_template_id" ref="l10n_kzc_temp_chart"/>
     <field name="reconcile" eval='True'/>
   </record>
@@ -2072,6 +2075,12 @@
     <field name="user_type_id" ref="account.data_account_type_expenses"/>
     <field name="chart_template_id" ref="l10n_kzc_temp_chart"/>
   </record>
+  <record id="pcg_61263" model="account.account.template">
+    <field name="name">Achats des prestations de service</field>
+    <field name="code">61263</field>
+    <field name="user_type_id" ref="account.data_account_type_expenses"/>
+    <field name="chart_template_id" ref="l10n_kzc_temp_chart"/>
+  </record>
   <record id="pcg_6128" model="account.account.template">
     <field name="name">Achats de matières et de fournitures des exercices antérieurs</field>
     <field name="code">6128</field>