From c89f66a42b9968fb8c50bbb615a0e88e26c4bdcd Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Sun, 6 Nov 2022 14:00:59 +0100 Subject: [PATCH] [REF] account_banking_mandate: Adapt module to native payment refactoring --- account_banking_mandate/__manifest__.py | 5 ++- account_banking_mandate/models/__init__.py | 1 - .../models/bank_payment_line.py | 23 ------------- .../tests/test_invoice_mandate.py | 16 ++------- .../views/bank_payment_line_view.xml | 34 ------------------- 5 files changed, 5 insertions(+), 74 deletions(-) delete mode 100644 account_banking_mandate/models/bank_payment_line.py delete mode 100644 account_banking_mandate/views/bank_payment_line_view.xml diff --git a/account_banking_mandate/__manifest__.py b/account_banking_mandate/__manifest__.py index 86fd7697d..1ee7d628c 100644 --- a/account_banking_mandate/__manifest__.py +++ b/account_banking_mandate/__manifest__.py @@ -1,7 +1,7 @@ # Copyright 2014 Compassion CH - Cyril Sester -# Copyright 2014 Tecnativa - Pedro M. Baeza # Copyright 2015-2020 Akretion - Alexis de Lattre -# Copyright 2017 Tecnativa - Carlos Dauden +# Copyright 2017 Tecnativa - Carlos Dauden +# Copyright 2014-2022 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { @@ -23,7 +23,6 @@ "views/account_payment_line.xml", "views/res_partner_bank_view.xml", "views/res_partner.xml", - "views/bank_payment_line_view.xml", "data/mandate_reference_sequence.xml", "security/mandate_security.xml", "security/ir.model.access.csv", diff --git a/account_banking_mandate/models/__init__.py b/account_banking_mandate/models/__init__.py index 096b524b8..0de456248 100644 --- a/account_banking_mandate/models/__init__.py +++ b/account_banking_mandate/models/__init__.py @@ -4,5 +4,4 @@ from . import account_move from . import res_partner_bank from . import res_partner from . import account_payment_line -from . import bank_payment_line from . import account_move_line diff --git a/account_banking_mandate/models/bank_payment_line.py b/account_banking_mandate/models/bank_payment_line.py deleted file mode 100644 index 5eb6c80ba..000000000 --- a/account_banking_mandate/models/bank_payment_line.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2014 Compassion CH - Cyril Sester -# Copyright 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza -# Copyright 2015-16 Akretion - Alexis de Lattre -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). - -from odoo import api, fields, models - - -class BankPaymentLine(models.Model): - _inherit = "bank.payment.line" - - mandate_id = fields.Many2one( - comodel_name="account.banking.mandate", - string="Direct Debit Mandate", - related="payment_line_ids.mandate_id", - check_company=True, - ) - - @api.model - def same_fields_payment_line_and_bank_payment_line(self): - res = super().same_fields_payment_line_and_bank_payment_line() - res.append("mandate_id") - return res diff --git a/account_banking_mandate/tests/test_invoice_mandate.py b/account_banking_mandate/tests/test_invoice_mandate.py index f7d302120..517be642d 100644 --- a/account_banking_mandate/tests/test_invoice_mandate.py +++ b/account_banking_mandate/tests/test_invoice_mandate.py @@ -1,4 +1,5 @@ # Copyright 2017 Creu Blanca +# Copyright 2017-2022 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from odoo import fields @@ -9,27 +10,16 @@ from odoo.tests.common import TransactionCase class TestInvoiceMandate(TransactionCase): def test_post_invoice_01(self): self.invoice._onchange_partner_id() - + prev_orders = self.env["account.payment.order"].search([]) self.assertEqual(self.invoice.mandate_id, self.mandate) - self.invoice.action_post() - - payable_move_lines = self.invoice.line_ids.filtered( - lambda s: s.account_id == self.invoice_account - ) - if payable_move_lines: - self.assertEqual(payable_move_lines[0].move_id.mandate_id, self.mandate) - 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([]) + payment_order = self.env["account.payment.order"].search([]) - prev_orders self.assertEqual(len(payment_order.ids), 1) payment_order.payment_mode_id_change() payment_order.draft2open() - payment_order.open2generated() - payment_order.generated2uploaded() self.assertEqual(self.mandate.payment_line_ids_count, 1) def test_post_invoice_02(self): diff --git a/account_banking_mandate/views/bank_payment_line_view.xml b/account_banking_mandate/views/bank_payment_line_view.xml deleted file mode 100644 index d4f19a113..000000000 --- a/account_banking_mandate/views/bank_payment_line_view.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - banking.mandate.bank.payment.line.form - bank.payment.line - - - - - - - - - banking.mandate.bank.payment.line.tree - bank.payment.line - - - - - - - -