From 0d3267f261c50e2e0c7600fd5887ab38e713ca5c Mon Sep 17 00:00:00 2001 From: Iryna Vushnevska Date: Sun, 21 Jul 2019 21:57:06 +0300 Subject: [PATCH 1/2] [FIX] apropriate method calls, import tests --- .../models/base_advanced_reconciliation.py | 5 +++-- .../models/mass_reconcile.py | 4 ++-- account_mass_reconcile_transaction_ref/tests/__init__.py | 1 + .../tests/test_account_reconcile_transaction_ref.py | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/account_mass_reconcile_transaction_ref/models/base_advanced_reconciliation.py b/account_mass_reconcile_transaction_ref/models/base_advanced_reconciliation.py index 4e232651..2c1b783b 100644 --- a/account_mass_reconcile_transaction_ref/models/base_advanced_reconciliation.py +++ b/account_mass_reconcile_transaction_ref/models/base_advanced_reconciliation.py @@ -1,16 +1,17 @@ # Copyright 2013-2018 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) -from odoo import models +from odoo import models, api class MassReconcileAdvanced(models.AbstractModel): _inherit = 'mass.reconcile.advanced' + @api.model def _base_columns(self): """ Mandatory columns for move lines queries An extra column aliased as ``key`` should be defined in each query.""" - aml_cols = super(MassReconcileAdvanced, self)._base_columns() + aml_cols = super()._base_columns() aml_cols.append('account_move_line.transaction_ref') return aml_cols diff --git a/account_mass_reconcile_transaction_ref/models/mass_reconcile.py b/account_mass_reconcile_transaction_ref/models/mass_reconcile.py index 9aa22ba8..0fca2f09 100644 --- a/account_mass_reconcile_transaction_ref/models/mass_reconcile.py +++ b/account_mass_reconcile_transaction_ref/models/mass_reconcile.py @@ -8,8 +8,8 @@ class AccountMassReconcileMethod(models.Model): _inherit = 'account.mass.reconcile.method' @api.model - def _get_all_rec_method(self): - methods = super(AccountMassReconcileMethod, self)._get_all_rec_method() + def _get_reconcilation_methods(self): + methods = super()._get_reconcilation_methods() methods += [ ('mass.reconcile.advanced.transaction_ref', 'Advanced. Partner and Transaction Ref.'), diff --git a/account_mass_reconcile_transaction_ref/tests/__init__.py b/account_mass_reconcile_transaction_ref/tests/__init__.py index e69de29b..215eeeb6 100644 --- a/account_mass_reconcile_transaction_ref/tests/__init__.py +++ b/account_mass_reconcile_transaction_ref/tests/__init__.py @@ -0,0 +1 @@ +from . import test_account_reconcile_transaction_ref diff --git a/account_mass_reconcile_transaction_ref/tests/test_account_reconcile_transaction_ref.py b/account_mass_reconcile_transaction_ref/tests/test_account_reconcile_transaction_ref.py index f173b426..d5684819 100644 --- a/account_mass_reconcile_transaction_ref/tests/test_account_reconcile_transaction_ref.py +++ b/account_mass_reconcile_transaction_ref/tests/test_account_reconcile_transaction_ref.py @@ -72,6 +72,7 @@ class TestAccountReconcileTransactionRef(SavepointCase): }) count = reconcile.unreconciled_count reconcile.run_reconcile() + reconcile._get_total_unrec() self.assertEqual(self.cust_invoice.state, 'paid') self.assertEqual(reconcile.unreconciled_count, count - 2) @@ -114,5 +115,6 @@ class TestAccountReconcileTransactionRef(SavepointCase): }) count = reconcile.unreconciled_count reconcile.run_reconcile() + reconcile._get_total_unrec() self.assertEqual(self.cust_invoice.state, 'paid') self.assertEqual(reconcile.unreconciled_count, count - 2) From 7baa2147eb0fb816b431db474001824b357e8148 Mon Sep 17 00:00:00 2001 From: Iryna Vyshnevska Date: Mon, 22 Jul 2019 14:49:27 +0300 Subject: [PATCH 2/2] [IMP] aditional depndency to trigger recompute properly --- account_mass_reconcile/models/mass_reconcile.py | 2 +- .../tests/test_account_reconcile_transaction_ref.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/account_mass_reconcile/models/mass_reconcile.py b/account_mass_reconcile/models/mass_reconcile.py index 5f202f98..7c8d8bc2 100644 --- a/account_mass_reconcile/models/mass_reconcile.py +++ b/account_mass_reconcile/models/mass_reconcile.py @@ -116,7 +116,7 @@ class AccountMassReconcile(models.Model): _description = 'account mass reconcile' @api.multi - @api.depends('account') + @api.depends('account', 'history_ids') def _get_total_unrec(self): obj_move_line = self.env['account.move.line'] for rec in self: diff --git a/account_mass_reconcile_transaction_ref/tests/test_account_reconcile_transaction_ref.py b/account_mass_reconcile_transaction_ref/tests/test_account_reconcile_transaction_ref.py index d5684819..f173b426 100644 --- a/account_mass_reconcile_transaction_ref/tests/test_account_reconcile_transaction_ref.py +++ b/account_mass_reconcile_transaction_ref/tests/test_account_reconcile_transaction_ref.py @@ -72,7 +72,6 @@ class TestAccountReconcileTransactionRef(SavepointCase): }) count = reconcile.unreconciled_count reconcile.run_reconcile() - reconcile._get_total_unrec() self.assertEqual(self.cust_invoice.state, 'paid') self.assertEqual(reconcile.unreconciled_count, count - 2) @@ -115,6 +114,5 @@ class TestAccountReconcileTransactionRef(SavepointCase): }) count = reconcile.unreconciled_count reconcile.run_reconcile() - reconcile._get_total_unrec() self.assertEqual(self.cust_invoice.state, 'paid') self.assertEqual(reconcile.unreconciled_count, count - 2)