mirror of
https://github.com/OCA/bank-payment.git
synced 2025-02-02 10:37:31 +02:00
0c571a2028
- fix set partner_bank_id in account move lines Case: The bank account isn't set properly in the payment order lines, because the bank account is only got from account.move.line or the first bank account in the partner_id, but never from the invoice (account.move). Solution: With this fix, the bank account will be get from account.move when matching the criteria. - fix payment orders from invoice tree view Case: User can't add invoices to payment/debit orders from the tree view but it's still possible to add them one by one from the form view. Solution: Remove binding_views="form": by default are "tree & form". With this fix, users can add payment/debit orders from the invoice tree view - fix the attachment file name & dowload. Case: After the configuration of a debit order and generating the .xml file, user can't download it from the next step screen using the download link. Solution: This fix makes the .xml file downloadable from the .xml file name as it was in older versions
97 lines
3.8 KiB
Python
97 lines
3.8 KiB
Python
# © 2014-2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
|
|
# © 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza
|
|
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
|
|
|
from odoo import api, fields, models
|
|
from odoo.fields import first
|
|
|
|
|
|
class AccountMoveLine(models.Model):
|
|
_inherit = "account.move.line"
|
|
|
|
partner_bank_id = fields.Many2one(
|
|
comodel_name="res.partner.bank",
|
|
string="Partner Bank Account",
|
|
compute="_compute_partner_bank_id",
|
|
readonly=False,
|
|
store=True,
|
|
help="Bank account on which we should pay the supplier",
|
|
)
|
|
bank_payment_line_id = fields.Many2one(
|
|
comodel_name="bank.payment.line", readonly=True, index=True
|
|
)
|
|
payment_line_ids = fields.One2many(
|
|
comodel_name="account.payment.line",
|
|
inverse_name="move_line_id",
|
|
string="Payment lines",
|
|
)
|
|
|
|
@api.depends(
|
|
"move_id", "move_id.invoice_partner_bank_id", "move_id.payment_mode_id"
|
|
)
|
|
def _compute_partner_bank_id(self):
|
|
for ml in self:
|
|
if (
|
|
ml.move_id.type in ("in_invoice", "in_refund")
|
|
and not ml.reconciled
|
|
and ml.payment_mode_id.payment_order_ok
|
|
and ml.account_id.internal_type in ("receivable", "payable")
|
|
and not any(
|
|
p_state in ("draft", "open", "generated")
|
|
for p_state in ml.payment_line_ids.mapped("state")
|
|
)
|
|
):
|
|
ml.partner_bank_id = ml.move_id.invoice_partner_bank_id.id
|
|
|
|
def _prepare_payment_line_vals(self, payment_order):
|
|
self.ensure_one()
|
|
assert payment_order, "Missing payment order"
|
|
aplo = self.env["account.payment.line"]
|
|
# default values for communication_type and communication
|
|
communication_type = "normal"
|
|
communication = self.ref or self.name
|
|
# change these default values if move line is linked to an invoice
|
|
if self.move_id.is_invoice():
|
|
if self.move_id.reference_type != "none":
|
|
communication = self.move_id.ref
|
|
ref2comm_type = aplo.invoice_reference_type2communication_type()
|
|
communication_type = ref2comm_type[self.move_id.reference_type]
|
|
else:
|
|
if (
|
|
self.move_id.type in ("in_invoice", "in_refund")
|
|
and self.move_id.ref
|
|
):
|
|
communication = self.move_id.ref
|
|
elif "out" in self.move_id.type:
|
|
# Force to only put invoice number here
|
|
communication = self.move_id.name
|
|
if self.currency_id:
|
|
currency_id = self.currency_id.id
|
|
amount_currency = self.amount_residual_currency
|
|
else:
|
|
currency_id = self.company_id.currency_id.id
|
|
amount_currency = self.amount_residual
|
|
# TODO : check that self.amount_residual_currency is 0
|
|
# 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
|
|
vals = {
|
|
"order_id": payment_order.id,
|
|
"partner_bank_id": partner_bank_id,
|
|
"partner_id": self.partner_id.id,
|
|
"move_line_id": self.id,
|
|
"communication": communication,
|
|
"communication_type": communication_type,
|
|
"currency_id": currency_id,
|
|
"amount_currency": amount_currency,
|
|
# date is set when the user confirms the payment order
|
|
}
|
|
return vals
|
|
|
|
def create_payment_line_from_move_line(self, payment_order):
|
|
vals_list = []
|
|
for mline in self:
|
|
vals_list.append(mline._prepare_payment_line_vals(payment_order))
|
|
return self.env["account.payment.line"].create(vals_list)
|