[FIX] Move code from donation to donation_direct_debit

This is a forward-port of PR #122 from 14.0 to 16.0
OCA · May 27, 2024 · da507f4 · da507f4
1 parent cb98666
commit da507f4
Show file tree

Hide file tree

Showing 15 changed files with 88 additions and 47 deletions.
diff --git a/donation/__manifest__.py b/donation/__manifest__.py
@@ -22,7 +22,6 @@
         "wizard/res_config_settings.xml",
         "data/donation_sequence.xml",
         "views/account_payment_mode.xml",
-        "views/account_journal.xml",
         "views/donation_campaign.xml",
         "views/donation_thanks_template.xml",
         "views/res_users.xml",

diff --git a/donation/models/__init__.py b/donation/models/__init__.py
@@ -5,7 +5,6 @@
 from . import donation_thanks_template
 from . import account_bank_statement_line
 from . import account_analytic_applicability
-from . import account_journal
 from . import res_partner
 from . import res_users
 from . import res_company
diff --git a/donation/models/donation.py b/donation/models/donation.py
@@ -269,13 +269,6 @@ def _prepare_counterpart_move_line(
             debit = 0
         if self.bank_statement_line_id:
             account_id = company.donation_account_id.id
-        elif self.payment_mode_id.payment_order_ok:
-            if not journal.donation_debit_order_account_id:
-                raise UserError(
-                    _("Missing Donation by Debit Order Account on journal '%s'.")
-                    % journal.display_name
-                )
-            account_id = journal.donation_debit_order_account_id.id
         else:
             if not company.account_journal_payment_debit_account_id:
                 raise UserError(

diff --git a/donation/static/description/index.html b/donation/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>

diff --git a/donation/views/account_journal.xml b/donation/views/account_journal.xml
diff --git a/donation_direct_debit/__init__.py b/donation_direct_debit/__init__.py
@@ -1 +1,2 @@
 from . import models
+from . import wizards
diff --git a/donation_direct_debit/__manifest__.py b/donation_direct_debit/__manifest__.py
@@ -15,6 +15,7 @@
     "depends": ["account_banking_sepa_direct_debit", "donation"],
     "data": [
         "views/donation.xml",
+        "wizards/res_config_settings.xml",
     ],
     "demo": ["demo/donation_demo.xml"],
     "installable": True,

diff --git a/donation_direct_debit/models/__init__.py b/donation_direct_debit/models/__init__.py
@@ -1 +1,2 @@
 from . import donation
+from . import res_company
diff --git a/donation_direct_debit/models/donation.py b/donation_direct_debit/models/donation.py
@@ -43,6 +43,23 @@ def donation_partner_direct_debit_change(self):
             if mandate:
                 self.mandate_id = mandate
 
+    # Mathod inherited from donation module
+    # TODO migration: remove 'journal' argument and use self.payment_mode_id.fixed_journal_id
+    def _prepare_counterpart_move_line(
+        self, total_company_cur, total_currency, journal
+    ):
+        vals = super()._prepare_counterpart_move_line(
+            total_company_cur, total_currency, journal
+        )
+        if not self.bank_statement_line_id and self.payment_mode_id.payment_order_ok:
+            if not self.company_id.donation_debit_order_account_id:
+                raise UserError(
+                    _("Missing Donation by Debit Order Account on company '%s'.")
+                    % self.company_id.display_name
+                )
+            vals["account_id"] = self.company_id.donation_debit_order_account_id.id
+        return vals
+
     def _prepare_donation_move(self):
         vals = super()._prepare_donation_move()
         vals.update(

diff --git a/donation/models/account_journal.py → donation_direct_debit/models/res_company.py b/donation/models/account_journal.py → donation_direct_debit/models/res_company.py
@@ -6,18 +6,19 @@
 from odoo.exceptions import ValidationError
 
 
-class AccountJournal(models.Model):
-    _inherit = "account.journal"
+class ResCompany(models.Model):
+    _inherit = "res.company"
 
     donation_debit_order_account_id = fields.Many2one(
         "account.account",
         check_company=True,
         copy=False,
         ondelete="restrict",
-        domain="[('reconcile', '=', True), ('deprecated', '=', False), "
-        "('company_id', '=', company_id), "
-        "('account_type', '=', 'asset_receivable'), "
-        "('id', 'not in', (default_account_id, suspense_account_id))]",
+        # domain is in res.config.settings
+        # domain="[('reconcile', '=', True), ('deprecated', '=', False), "
+        # "('company_id', '=', company_id), "
+        # "('account_type', '=', 'asset_receivable'), "
+        # "('id', 'not in', (default_account_id, suspense_account_id))]",
         string="Donation by Debit Order Account",
         help="Transfer account for donations by debit order. "
         "Leave empty if you don't handle donations by debit order on this bank account."
@@ -31,27 +32,27 @@ def _check_donation_accounts(self):
                 "account_type"
             ]["selection"]
         )
-        for journal in self:
-            ddo_account = journal.donation_debit_order_account_id
+        for company in self:
+            ddo_account = company.donation_debit_order_account_id
             if ddo_account:
                 if not ddo_account.reconcile:
                     raise ValidationError(
                         _(
-                            "The Donation by Debit Order Account of journal "
-                            "'%(journal)s' must be reconciliable, but the account "
+                            "The Donation by Debit Order Account of company "
+                            "'%(company)s' must be reconciliable, but the account "
                             "'%(account)s' is not reconciliable.",
-                            journal=journal.display_name,
+                            company=company.display_name,
                             account=ddo_account.display_name,
                         )
                     )
                 if ddo_account.account_type != "asset_receivable":
                     raise ValidationError(
                         _(
-                            "The Donation by Debit Order Account of journal "
-                            "'%(journal)s' must be a receivable account, "
+                            "The Donation by Debit Order Account of company "
+                            "'%(company)s' must be a receivable account, "
                             "but the account '%(account)s' is configured with "
                             "account type '%(account_type)s'.",
-                            journal=journal.display_name,
+                            company=company.display_name,
                             account=ddo_account.display_name,
                             account_type=acc_type2label[ddo_account.account_type],
                         )

diff --git a/donation_direct_debit/static/description/index.html b/donation_direct_debit/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>

diff --git a/donation_direct_debit/tests/test_direct_debit.py b/donation_direct_debit/tests/test_direct_debit.py
@@ -8,6 +8,15 @@
 class TestDirectDebit(TransactionCase):
     def test_direct_debit(self):
         donation = self.env.ref("donation_direct_debit.donation6")
+        account = self.env["account.account"].create(
+            {
+                "company_id": donation.company_id.id,
+                "code": "TESTDD1",
+                "name": "Test donation by direct debit",
+                "account_type": "asset_receivable",
+            }
+        )
+        donation.company_id.write({"donation_debit_order_account_id": account.id})
         dd_payment_mode = self.env.ref(
             "account_banking_sepa_direct_debit.payment_mode_inbound_sepa_dd1"
         )

diff --git a/donation_direct_debit/wizards/__init__.py b/donation_direct_debit/wizards/__init__.py
@@ -0,0 +1 @@
+from . import res_config_settings
diff --git a/donation_direct_debit/wizards/res_config_settings.py b/donation_direct_debit/wizards/res_config_settings.py
@@ -0,0 +1,17 @@
+# Copyright 2016-2021 Akretion France (http://www.akretion.com/)
+# @author: Alexis de Lattre <[email protected]>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = "res.config.settings"
+
+    donation_debit_order_account_id = fields.Many2one(
+        related="company_id.donation_debit_order_account_id",
+        readonly=False,
+        domain="[('reconcile', '=', True), ('deprecated', '=', False), "
+        "('company_id', '=', company_id), "
+        "('account_type', '=', 'asset_receivable')]",
+    )
diff --git a/donation_direct_debit/wizards/res_config_settings.xml b/donation_direct_debit/wizards/res_config_settings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  Copyright 2021 Akretion France (http://www.akretion.com/)
+  @author: Alexis de Lattre <[email protected]>
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+<odoo>
+    <record id="res_config_settings_donation" model="ir.ui.view">
+        <field name="name">donation_direct_debit.res.config.settings.form</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="donation.res_config_settings_donation" />
+        <field name="arch" type="xml">
+            <div id="donation-settings" position="inside">
+                <div class="o_setting_left_pane" />
+                <div class="o_setting_right_pane">
+                    <label for="donation_debit_order_account_id" class="col-md-5" />
+                    <field
+                        name="donation_debit_order_account_id"
+                        context="{'default_reconcile': True, 'default_account_type': 'asset_receivable'}"
+                    />
+                </div>
+            </div>
+        </field>
+    </record>
+
+</odoo>