Add module account_payment_line_manual_account

account_payment_line_manual_account/models/__init__.py

@@ -0,0 +1,2 @@
+from . import account_payment_line
+from . import account_payment_order

account_payment_line_manual_account/models/account_payment_line.py

@@ -0,0 +1,33 @@
+# Copyright 2024 Akretion France (https://www.akretion.com/)
+# @author: Alexis de Lattre <alexis.delattre@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class AccountPaymentLine(models.Model):
+    _inherit = "account.payment.line"
+
+    account_id = fields.Many2one(
+        'account.account',
+        compute="_compute_account_id", store=True, readonly=False, check_company=True,
+        domain="[('company_id', '=', company_id), ('deprecated', '=', False)]")
+
+    @api.depends('move_line_id', 'partner_id')
+    def _compute_account_id(self):
+        for line in self:
+            account_id = False
+            if not line.move_line_id and line.partner_id:
+                partner = line.partner_id.with_company(line.order_id.company_id.id)
+                if line.order_id.payment_type == "inbound":
+                    account_id = partner.property_account_receivable_id.id
+                else:
+                    account_id = partner.property_account_payable_id.id
+            line.account_id = account_id
+
+    # take info account account_id for grouping
+    def payment_line_hashcode(self):
+        hashcode = super().payment_line_hashcode()
+        account_str = str(self.account_id.id or False)
+        hashcode = '-'.join([hashcode, account_str])
+        return hashcode

account_payment_line_manual_account/models/account_payment_order.py

@@ -0,0 +1,15 @@
+# Copyright 2024 Akretion France (https://www.akretion.com/)
+# @author: Alexis de Lattre <alexis.delattre@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class AccountPaymentOrder(models.Model):
+    _inherit = "account.payment.order"
+
+    def _prepare_move_line_partner_account(self, bank_line):
+        vals = super()._prepare_move_line_partner_account(bank_line)
+        if not bank_line.payment_line_ids[0].move_line_id:
+            vals['account_id'] = bank_line.payment_line_ids[0].account_id.id
+        return vals