Merge PR #283 into 16.0

Signed-off-by sbidoul
OCA · Oct 30, 2024 · d4a8fb5 · d4a8fb5
2 parents 581ecf1 + 4ecf536
commit d4a8fb5
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 1 deletion.
diff --git a/account_cutoff_base/i18n/fr.po b/account_cutoff_base/i18n/fr.po
@@ -379,10 +379,22 @@ msgstr "La date de provision n'est pas définie."
 msgid "Default Account for Accrued Expenses"
 msgstr "Compte par défaut pour les charges à payer"
 
+#. module: account_cutoff_base
+#: model:ir.model.fields,field_description:account_cutoff_base.field_res_company__default_accrued_revenue_return_account_id
+#: model:ir.model.fields,field_description:account_cutoff_base.field_res_config_settings__dft_accrued_revenue_return_account_id
+msgid "Default Account for Accrued Revenues"
+msgstr "Compte par défaut pour les notes de crédit à établir"
+
+#. module: account_cutoff_base
+#: model:ir.model.fields,field_description:account_cutoff_base.field_res_company__default_accrued_expense_return_account_id
+#: model:ir.model.fields,field_description:account_cutoff_base.field_res_config_settings__dft_accrued_expense_return_account_id
+msgid "Default Account for Accrued Expenses Refunds"
+msgstr "Compte par défaut pour les notes de crédit à recevoir"
+
 #. module: account_cutoff_base
 #: model:ir.model.fields,field_description:account_cutoff_base.field_res_company__default_accrued_revenue_account_id
 #: model:ir.model.fields,field_description:account_cutoff_base.field_res_config_settings__dft_accrued_revenue_account_id
-msgid "Default Account for Accrued Revenues"
+msgid "Default Account for Accrued Revenues Refunds"
 msgstr "Compte par défaut pour les produits à recevoir"
 
 #. module: account_cutoff_base

diff --git a/account_cutoff_base/models/res_company.py b/account_cutoff_base/models/res_company.py
@@ -50,3 +50,13 @@ class ResCompany(models.Model):
         string="Default Account for Prepaid Expense",
         check_company=True,
     )
+    default_accrued_revenue_return_account_id = fields.Many2one(
+        "account.account",
+        string="Default Account for Accrued Revenues Refunds",
+        check_company=True,
+    )
+    default_accrued_expense_return_account_id = fields.Many2one(
+        "account.account",
+        string="Default Account for Accrued Expenses Refunds",
+        check_company=True,
+    )
diff --git a/account_cutoff_base/views/res_config_settings.xml b/account_cutoff_base/views/res_config_settings.xml
@@ -128,6 +128,32 @@
                                     options="{'no_create_edit': True, 'no_open': True}"
                                 />
                                 </div>
+                                <div
+                                class="row"
+                                id="dft_accrued_revenue_return_account_id"
+                            >
+                                    <label
+                                    for="dft_accrued_revenue_return_account_id"
+                                    class="col-md-5"
+                                />
+                                    <field
+                                    name="dft_accrued_revenue_return_account_id"
+                                    options="{'no_create_edit': True, 'no_open': True}"
+                                />
+                                </div>
+                                <div
+                                class="row"
+                                id="dft_accrued_expense_return_account_id"
+                            >
+                                    <label
+                                    for="dft_accrued_expense_return_account_id"
+                                    class="col-md-5"
+                                />
+                                    <field
+                                    name="dft_accrued_expense_return_account_id"
+                                    options="{'no_create_edit': True, 'no_open': True}"
+                                />
+                                </div>
                             </div>
                     </div>
                 </div>

diff --git a/account_cutoff_base/wizards/res_config_settings.py b/account_cutoff_base/wizards/res_config_settings.py
@@ -52,3 +52,13 @@ class ResConfigSettings(models.TransientModel):
         readonly=False,
         domain="[('deprecated', '=', False), ('company_id', '=', company_id)]",
     )
+    dft_accrued_revenue_return_account_id = fields.Many2one(
+        related="company_id.default_accrued_revenue_return_account_id",
+        readonly=False,
+        domain="[('deprecated', '=', False), ('company_id', '=', company_id)]",
+    )
+    dft_accrued_expense_return_account_id = fields.Many2one(
+        related="company_id.default_accrued_expense_return_account_id",
+        readonly=False,
+        domain="[('deprecated', '=', False), ('company_id', '=', company_id)]",
+    )