diff --git a/account_mass_reconcile/models/base_reconciliation.py b/account_mass_reconcile/models/base_reconciliation.py index fe394f1c..2826a8e0 100644 --- a/account_mass_reconcile/models/base_reconciliation.py +++ b/account_mass_reconcile/models/base_reconciliation.py @@ -60,8 +60,11 @@ class MassReconcileBase(models.AbstractModel): ) return ["account_move_line.{}".format(col) for col in aml_cols] + def _selection_columns(self): + return self._base_columns() + def _select_query(self, *args, **kwargs): - return "SELECT %s" % ', '.join(self._base_columns()) + return "SELECT %s" % ', '.join(self._selection_columns()) def _from_query(self, *args, **kwargs): return ("FROM account_move_line ") diff --git a/account_mass_reconcile_by_purchase_line/models/base_advanced_reconciliation.py b/account_mass_reconcile_by_purchase_line/models/base_advanced_reconciliation.py index 13acfded..9c9d46e4 100644 --- a/account_mass_reconcile_by_purchase_line/models/base_advanced_reconciliation.py +++ b/account_mass_reconcile_by_purchase_line/models/base_advanced_reconciliation.py @@ -7,13 +7,8 @@ from odoo import models class MassReconcileAdvanced(models.AbstractModel): _inherit = 'mass.reconcile.advanced' - @staticmethod - def _base_columns(): - """ Mandatory columns for move lines queries - An extra column aliased as ``key`` should be defined - in each query.""" - aml_cols = super(MassReconcileAdvanced, MassReconcileAdvanced).\ - _base_columns() + def _selection_columns(self): + aml_cols = super(MassReconcileAdvanced, self)._selection_columns() aml_cols.append('account_move_line.purchase_line_id') aml_cols.append('account_move_line.product_id') return aml_cols diff --git a/account_mass_reconcile_by_purchase_line/models/mass_reconcile.py b/account_mass_reconcile_by_purchase_line/models/mass_reconcile.py index e11eb7a5..145ce52b 100644 --- a/account_mass_reconcile_by_purchase_line/models/mass_reconcile.py +++ b/account_mass_reconcile_by_purchase_line/models/mass_reconcile.py @@ -7,11 +7,8 @@ from odoo import models class AccountMassReconcileMethod(models.Model): _inherit = 'account.mass.reconcile.method' - @staticmethod - def _get_reconcilation_methods(): - methods = super( - AccountMassReconcileMethod, AccountMassReconcileMethod).\ - _get_reconcilation_methods() + def _selection_name(self): + methods = super(AccountMassReconcileMethod, self)._selection_name() methods += [ ('mass.reconcile.advanced.by.purchase.line', 'Advanced. Product, purchase order line.'),