mirror of
https://github.com/OCA/bank-payment.git
synced 2025-02-02 10:37:31 +02:00
ccf9d3bc6b
The computation of partner_bank_id has not been migrated properly
since the move from account.invoice to account.move.
Before, we had an onchange on partner_id that did the following:
- If no partner or no company, remove payment mode
- If type = in_invoice, remove partner_bank_id as well
- If partner and company,
- If type = in_invoice, set payment mode from partner
- if payment mode's payment method has bank account required,
set the partner_bank_id to the commercial partner's bank
- else set partner_bank_id to False
- If type = out_invoice, set payment mode from partner and
do not assign partner_bank_id
We also had an onchange on payment_mode_id that did the following:
- If payment mode and its payment_type=outbound and its payment method
has bank account required, set partner_bank_id to False
- If no payment mode, set partner_bank_id to False
Now that partner_bank_id is a computed field, we shouldn't set its value
to False if the move is not a vendor bill or doesn't have a payment mode.
The computation of partner_bank_id must instead reflect the conditions we
used to have, that is:
- If we don't have a payment_mode, set value to False
- If we have a payment mode
- If type=in_invoice and payment mode's payment method has not bank
account required, set partner_bank_id to False (as setting the bank account
from the partner is done in the call to super)
- If type=out_invoice
- if payment mode's payment method has bank account required
- set partner_bank_id to the bank account linked to the fixed journal
of payment mode if defined
- do not set anything if that isn't the case since setting the bank account
from the company is done in the call to super)
- if payment mode's payment method does not have bank account required,
set partner_bank_id to False
Closes: #1091
174 lines
7.3 KiB
Python
174 lines
7.3 KiB
Python
# Copyright 2014-16 Akretion - Alexis de Lattre <alexis.delattre@akretion.com>
|
|
# Copyright 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza
|
|
# Copyright 2021 Tecnativa - Víctor Martínez
|
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
|
|
|
from odoo import api, fields, models
|
|
|
|
|
|
class AccountMove(models.Model):
|
|
_inherit = "account.move"
|
|
|
|
payment_mode_filter_type_domain = fields.Char(
|
|
compute="_compute_payment_mode_filter_type_domain"
|
|
)
|
|
partner_bank_filter_type_domain = fields.Many2one(
|
|
comodel_name="res.partner", compute="_compute_partner_bank_filter_type_domain"
|
|
)
|
|
payment_mode_id = fields.Many2one(
|
|
comodel_name="account.payment.mode",
|
|
compute="_compute_payment_mode_id",
|
|
store=True,
|
|
ondelete="restrict",
|
|
readonly=False,
|
|
check_company=True,
|
|
tracking=True,
|
|
)
|
|
bank_account_required = fields.Boolean(
|
|
related="payment_mode_id.payment_method_id.bank_account_required", readonly=True
|
|
)
|
|
partner_bank_id = fields.Many2one(
|
|
compute="_compute_partner_bank_id",
|
|
store=True,
|
|
ondelete="restrict",
|
|
readonly=False,
|
|
)
|
|
has_reconciled_items = fields.Boolean(
|
|
help="Technical field for supporting the editability of the payment mode",
|
|
compute="_compute_has_reconciled_items",
|
|
)
|
|
|
|
@api.depends("move_type")
|
|
def _compute_payment_mode_filter_type_domain(self):
|
|
for move in self:
|
|
if move.move_type in ("out_invoice", "in_refund"):
|
|
move.payment_mode_filter_type_domain = "inbound"
|
|
elif move.move_type in ("in_invoice", "out_refund"):
|
|
move.payment_mode_filter_type_domain = "outbound"
|
|
else:
|
|
move.payment_mode_filter_type_domain = False
|
|
|
|
@api.depends("partner_id", "move_type")
|
|
def _compute_partner_bank_filter_type_domain(self):
|
|
for move in self:
|
|
if move.move_type in ("out_invoice", "in_refund"):
|
|
move.partner_bank_filter_type_domain = move.bank_partner_id
|
|
elif move.move_type in ("in_invoice", "out_refund"):
|
|
move.partner_bank_filter_type_domain = move.commercial_partner_id
|
|
else:
|
|
move.partner_bank_filter_type_domain = False
|
|
|
|
@api.depends("partner_id", "company_id")
|
|
def _compute_payment_mode_id(self):
|
|
for move in self:
|
|
if move.company_id and move.payment_mode_id.company_id != move.company_id:
|
|
move.payment_mode_id = False
|
|
if move.partner_id:
|
|
partner = move.with_company(move.company_id.id).partner_id
|
|
if move.move_type == "in_invoice":
|
|
move.payment_mode_id = partner.supplier_payment_mode_id
|
|
elif move.move_type == "out_invoice":
|
|
move.payment_mode_id = partner.customer_payment_mode_id
|
|
elif (
|
|
move.move_type in ["out_refund", "in_refund"]
|
|
and move.reversed_entry_id
|
|
):
|
|
move.payment_mode_id = (
|
|
move.reversed_entry_id.payment_mode_id.refund_payment_mode_id
|
|
)
|
|
elif not move.reversed_entry_id:
|
|
if move.move_type == "out_refund":
|
|
move.payment_mode_id = (
|
|
partner.customer_payment_mode_id.refund_payment_mode_id
|
|
)
|
|
elif move.move_type == "in_refund":
|
|
move.payment_mode_id = (
|
|
partner.supplier_payment_mode_id.refund_payment_mode_id
|
|
)
|
|
|
|
@api.depends("bank_partner_id", "payment_mode_id")
|
|
def _compute_partner_bank_id(self):
|
|
res = super()._compute_partner_bank_id()
|
|
for move in self:
|
|
payment_mode = move.payment_mode_id
|
|
if payment_mode:
|
|
if (
|
|
move.move_type == "in_invoice"
|
|
and payment_mode.payment_type == "outbound"
|
|
and not payment_mode.payment_method_id.bank_account_required
|
|
):
|
|
move.partner_bank_id = False
|
|
continue
|
|
elif move.move_type == "out_invoice":
|
|
if payment_mode.payment_method_id.bank_account_required:
|
|
if (
|
|
payment_mode.bank_account_link == "fixed"
|
|
and payment_mode.fixed_journal_id.bank_account_id
|
|
):
|
|
move.partner_bank_id = (
|
|
payment_mode.fixed_journal_id.bank_account_id
|
|
)
|
|
continue
|
|
else:
|
|
move.partner_bank_id = False
|
|
else:
|
|
move.partner_bank_id = False
|
|
return res
|
|
|
|
@api.depends("line_ids.matched_credit_ids", "line_ids.matched_debit_ids")
|
|
def _compute_has_reconciled_items(self):
|
|
for record in self:
|
|
lines_to_consider = record.line_ids.filtered(
|
|
lambda x: x.account_id.account_type
|
|
in ("asset_receivable", "liability_payable")
|
|
)
|
|
record.has_reconciled_items = bool(
|
|
lines_to_consider.matched_credit_ids
|
|
+ lines_to_consider.matched_debit_ids
|
|
)
|
|
|
|
def _reverse_moves(self, default_values_list=None, cancel=False):
|
|
if not default_values_list:
|
|
default_values_list = [{} for _ in self]
|
|
for move, default_values in zip(self, default_values_list):
|
|
default_values[
|
|
"payment_mode_id"
|
|
] = move.payment_mode_id.refund_payment_mode_id.id
|
|
if move.move_type == "in_invoice":
|
|
default_values["partner_bank_id"] = move.partner_bank_id.id
|
|
return super()._reverse_moves(
|
|
default_values_list=default_values_list, cancel=cancel
|
|
)
|
|
|
|
def partner_banks_to_show(self):
|
|
self.ensure_one()
|
|
if self.partner_bank_id:
|
|
return self.partner_bank_id
|
|
if self.payment_mode_id.show_bank_account_from_journal:
|
|
if self.payment_mode_id.bank_account_link == "fixed":
|
|
return self.payment_mode_id.fixed_journal_id.bank_account_id
|
|
else:
|
|
return self.payment_mode_id.variable_journal_ids.mapped(
|
|
"bank_account_id"
|
|
)
|
|
if (
|
|
self.payment_mode_id.payment_method_id.code == "sepa_direct_debit"
|
|
): # pragma: no cover
|
|
return (
|
|
self.mandate_id.partner_bank_id
|
|
or self.partner_id.valid_mandate_id.partner_bank_id
|
|
)
|
|
# Return this as empty recordset
|
|
return self.partner_bank_id
|
|
|
|
@api.model_create_multi
|
|
def create(self, vals_list):
|
|
for vals in vals_list:
|
|
# Force compute partner_bank_id when invoice is created from SO
|
|
# to avoid that odoo _prepare_invoice method value will be set.
|
|
if self.env.context.get("active_model") == "sale.order": # pragma: no cover
|
|
virtual_move = self.new(vals)
|
|
virtual_move._compute_partner_bank_id()
|
|
vals["partner_bank_id"] = virtual_move.partner_bank_id.id
|
|
return super().create(vals_list)
|