From 8006ab71ca6e73f4f01c3aa371a82ee20c86e1d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 3 Oct 2021 13:48:43 +0200 Subject: [PATCH] Rename getter of has_payments to avoid name collision issue10810 review339021002 --- payment.py | 8 ++++---- tests/test_account_payment_sepa.py | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/payment.py b/payment.py index 3ff0a8f45d..37b7f7297c 100644 --- a/payment.py +++ b/payment.py @@ -482,7 +482,7 @@ class Mandate(Workflow, ModelSQL, ModelView): ], 'State', readonly=True) payments = fields.One2Many('account.payment', 'sepa_mandate', 'Payments') has_payments = fields.Function(fields.Boolean('Has Payments'), - 'has_payments') + 'get_has_payments') @classmethod def __setup__(cls): @@ -650,10 +650,10 @@ class Mandate(Workflow, ModelSQL, ModelView): return 'RCUR' @classmethod - def has_payments(cls, mandates, name): + def get_has_payments(cls, mandates, name): pool = Pool() Payment = pool.get('account.payment') - payment = Payment.__table__ + payment = Payment.__table__() cursor = Transaction().connection.cursor() has_payments = dict.fromkeys([m.id for m in mandates], False) @@ -664,7 +664,7 @@ class Mandate(Workflow, ModelSQL, ModelView): group_by=payment.sepa_mandate)) has_payments.update(cursor) - return {'has_payments': has_payments} + return has_payments @classmethod @ModelView.button diff --git a/tests/test_account_payment_sepa.py b/tests/test_account_payment_sepa.py index c7f7ee31fd..1fb65d569d 100644 --- a/tests/test_account_payment_sepa.py +++ b/tests/test_account_payment_sepa.py @@ -299,6 +299,7 @@ class AccountPaymentSepaTestCase(CompanyTestMixin, ModuleTestCase): journal = setup_journal('pain.008.001.02', 'receivable', company, company_account) + self.assertFalse(mandate.has_payments) self.assertEqual(mandate.sequence_type, 'FRST') mandate.sequence_type_rcur = True self.assertEqual(mandate.sequence_type, 'RCUR') @@ -322,6 +323,7 @@ class AccountPaymentSepaTestCase(CompanyTestMixin, ModuleTestCase): _, data = process_payment.do_process(None) self.assertEqual(payment.sepa_mandate_sequence_type, 'FRST') + self.assertTrue(payment.sepa_mandate.has_payments) payments = Payment.create([{ 'company': company,