[16.0][IMP] Take allow_out_payment into account on payment order

A previous MR existed but only when payment order was triggered from invoices.
We added the case also directement from confirm button on payment order

original PR: #1177

Author: lmarion-source

account_payment_mode/demo/payment_demo.xml

@@ -44,13 +44,11 @@
         <field name="acc_number">FR66 1212 1212 1212 1212 1212 121</field>
         <field name="bank_id" ref="bank_fiducial" />
         <field name="partner_id" ref="base.res_partner_12" />
-        <field name="allow_out_payment" eval="True" />
     </record>
     <record id="res_partner_2_iban" model="res.partner.bank">
         <field name="acc_number">BE96 9988 7766 5544</field>
         <field name="bank_id" ref="bank_fortis" />
         <field name="partner_id" ref="base.res_partner_2" />
-        <field name="allow_out_payment" eval="True" />
     </record>
     <!-- Asustek already has a demo IBAN provided by base_iban -->
     <record id="payment_mode_outbound_ct1" model="account.payment.mode">

account_payment_order/models/account_move.py

@@ -5,7 +5,6 @@
 
 from odoo import _, api, fields, models
 from odoo.exceptions import UserError
-from odoo.fields import first
 
 
 class AccountMove(models.Model):
@@ -152,24 +151,6 @@ def create_account_payment_line(self):
                         "order": payment_lines.order_id.mapped("name"),
                     }
                 )
-
-            # Check that the bank allows out payments
-            for line in applicable_lines.filtered(
-                lambda l: l.account_id.account_type == "liability_payable"
-            ):
-                bank = line.partner_bank_id or first(line.partner_id.bank_ids)
-                if bank and not bank.allow_out_payment:
-                    raise UserError(
-                        _(
-                            'The option "Send Money" is not enabled on the bank '
-                            "account %(bank_account)s of partner %(partner)s."
-                        )
-                        % {
-                            "bank_account": bank.bank_name,
-                            "partner": line.partner_id.name,
-                        }
-                    )
-
             for payment_mode in payment_modes:
                 payorder = apoo.search(
                     move.get_account_payment_domain(payment_mode), limit=1

account_payment_order/models/account_move_line.py

@@ -71,10 +71,10 @@ def _prepare_payment_line_vals(self, payment_order):
             # in this case
         if payment_order.payment_type == "outbound":
             amount_currency *= -1
-        partner_bank_id = self.partner_bank_id.id or first(self.partner_id.bank_ids).id
+        partner_bank_id = self.partner_bank_id or first(self.partner_id.bank_ids)
         vals = {
             "order_id": payment_order.id,
-            "partner_bank_id": partner_bank_id,
+            "partner_bank_id": partner_bank_id.id,
             "partner_id": self.partner_id.id,
             "move_line_id": self.id,
             "communication": communication,

account_payment_order/models/account_payment_line.py

@@ -3,6 +3,7 @@
 
 from odoo import _, api, fields, models
 from odoo.exceptions import UserError
+from odoo.fields import first
 
 
 class AccountPaymentLine(models.Model):
@@ -249,3 +250,18 @@ def action_open_business_doc(self):
         if not self.move_line_id:
             return False
         return self.move_line_id.action_open_business_doc()
+
+    def _check_bank_allows_out_payments(self):
+        for line in self:
+            bank = line.partner_bank_id or first(line.partner_id.bank_ids)
+            if bank and not bank.allow_out_payment:
+                raise UserError(
+                    _(
+                        'The option "Send Money" is not enabled on the bank '
+                        "account %(bank_account)s of partner %(partner)s."
+                    )
+                    % {
+                        "bank_account": bank.acc_number,
+                        "partner": line.partner_id.name,
+                    }
+                )

account_payment_order/models/account_payment_order.py

@@ -8,6 +8,7 @@
 
 from odoo import _, api, fields, models
 from odoo.exceptions import UserError, ValidationError
+from odoo.tools import str2bool
 
 
 class AccountPaymentOrder(models.Model):
@@ -338,6 +339,12 @@ def draft2open(self):
             for payline in order.payment_line_ids:
                 try:
                     payline.draft2open_payment_line_check()
+                    if str2bool(
+                        self.env["ir.config_parameter"]
+                        .sudo()
+                        .get_param("account_payment_order.use_allow_out_payment")
+                    ):
+                        payline._check_bank_allows_out_payments()
                 except UserError as e:
                     payline_err_text.append(e.args[0])
                 # Compute requested payment date

account_payment_order/tests/test_payment_order_outbound.py

@@ -21,6 +21,10 @@ def setUpClass(cls, chart_template_ref=None):
         super().setUpClass(chart_template_ref=chart_template_ref)
         cls.env = cls.env(context=dict(cls.env.context, **DISABLED_MAIL_CONTEXT))
         cls.company = cls.company_data["company"]
+
+        cls.env["ir.config_parameter"].sudo().set_param(
+            "account_payment_order.use_allow_out_payment", True
+        )
         cls.env.user.company_id = cls.company.id
         cls.partner = cls.env["res.partner"].create(
             {
@@ -29,9 +33,7 @@ def setUpClass(cls, chart_template_ref=None):
                     (
                         0,
                         0,
-                        {
-                            "acc_number": "TEST-NUMBER",
-                        },
+                        {"acc_number": "TEST-NUMBER", "allow_out_payment": True},
                     )
                 ],
             }
@@ -234,7 +236,7 @@ def order_creation(self, date_prefered):
         order.payment_line_ids.partner_bank_id.action_unarchive()
         self.assertFalse(order.partner_banks_archive_msg)
         order.draft2open()
-        self.assertEqual(order.payment_ids[0].partner_bank_id, self.partner.bank_ids)
+        self.assertEqual(order.payment_ids[0].partner_bank_id, self.partner.bank_ids[0])
         order.open2generated()
         order.generated2uploaded()
         self.assertEqual(order.move_ids[0].date, order.payment_ids[0].date)
@@ -247,6 +249,7 @@ def _line_creation(self, outbound_order):
             "currency_id": outbound_order.payment_mode_id.company_id.currency_id.id,
             "amount_currency": 200.38,
             "move_line_id": self.invoice.invoice_line_ids[0].id,
+            "partner_bank_id": self.partner_bank.id,
         }
         return self.env["account.payment.line"].create(vals)
 
@@ -580,6 +583,7 @@ def test_action_open_business_document(self):
         self.assertEqual(invoice_action["res_id"], self.invoice.id)
         manual_line_action = order.payment_line_ids[1].action_open_business_doc()
         self.assertFalse(manual_line_action)
+
     def test_check_allow_out_payment(self):
         """Check that, in case option "Send Money" is not enabled on
         the bank, out payments are not allowed.
@@ -589,9 +593,37 @@ def test_check_allow_out_payment(self):
 
         # Do not allow out payments
         self.partner_bank.allow_out_payment = False
+        for line in self.invoice.line_ids:
+            for bank in line.partner_id.bank_ids:
+                bank.allow_out_payment = False
 
+        self.env["account.invoice.payment.line.multi"].with_context(
+            active_model="account.move", active_ids=self.invoice.ids
+        ).create({}).run()
+        payment_order = self.env["account.payment.order"].search(self.domain)
+        payment_order.write({"journal_id": self.bank_journal.id})
         # Add to payment order using the wizard: error raised
         with self.assertRaises(UserError):
-            self.env["account.invoice.payment.line.multi"].with_context(
-                active_model="account.move", active_ids=self.invoice.ids
-            ).create({}).run()
+            payment_order.draft2open()
+
+    def test_check_allow_out_payment_from_payment_order(self):
+        """Check that, in case option "Send Money" is not enabled on
+        the bank, out payments are not allowed.
+        """
+        self.partner_bank.allow_out_payment = False
+        outbound_order = self.env["account.payment.order"].create(
+            {
+                "date_prefered": "due",
+                "payment_type": "outbound",
+                "payment_mode_id": self.mode.id,
+                "journal_id": self.bank_journal.id,
+                "description": "order with manual line",
+            }
+        )
+        payment_line_1 = self._line_creation(outbound_order)
+
+        payment_line_1.partner_bank_id = self.partner_bank.id
+
+        # Add to payment order using the wizard: error raised
+        with self.assertRaises(UserError):
+            outbound_order.draft2open()

account_payment_order/wizard/res_config_settings.py

@@ -10,3 +10,7 @@ class ResConfigSettings(models.TransientModel):
     transfer_journal_id = fields.Many2one(
         related="company_id.transfer_journal_id", readonly=False
     )
+    use_allow_out_payment = fields.Boolean(
+        string=" Use allow out payment on partner bank",
+        config_parameter=("account_payment_order.use_allow_out_payment"),
+    )

account_payment_order/wizard/res_config_settings.xml

@@ -23,6 +23,19 @@
                         </div>
                     </div>
                 </div>
+                <div class="row mt16 o_settings_container" id="allow_out_payment_order">
+                    <div class="col-12 col-lg-6 o_setting_box">
+                        <div class="o_setting_left_pane">
+                            <field name="use_allow_out_payment" />
+                        </div>
+                        <div class="o_setting_right_pane">
+                            <label for="use_allow_out_payment" />
+                            <div class="text-muted">
+                                If checked, we will check that the account on payment order can be used for out payments
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </xpath>
         </field>
     </record>