Merge pull request #189 from Eficent/9.0-fix-mass_reconcile

[9.0][FIX] issue with mass_reconcile

account_mass_reconcile/models/base_reconciliation.py

@@ -45,7 +45,6 @@ class MassReconcileBase(models.AbstractModel):
         """
         raise NotImplementedError
 
-    @api.model
     def _base_columns(self):
         """ Mandatory columns for move lines queries
         An extra column aliased as ``key`` should be defined
@@ -65,8 +64,7 @@ class MassReconcileBase(models.AbstractModel):
 
     @api.multi
     def _select(self, *args, **kwargs):
-        return "SELECT %s" % ', '.join(
-            self.env["mass.reconcile.base"]._base_columns())
+        return "SELECT %s" % ', '.join(self._base_columns())
 
     @api.multi
     def _from(self, *args, **kwargs):

account_mass_reconcile_by_purchase_line/models/__init__.py

@@ -3,4 +3,4 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 from . import mass_reconcile
-from . import base_reconciliation
+from . import base_advanced_reconciliation

account_mass_reconcile_by_purchase_line/models/base_advanced_reconciliation.py

@@ -1,19 +1,17 @@
 # -*- coding: utf-8 -*-
 # © 2015-17 Eficent Business and IT Consulting Services S.L. (www.eficent.com)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
-
-from openerp import api, models
+from openerp import models
 
 
-class MassReconcileBase(models.AbstractModel):
-    _inherit = 'mass.reconcile.base'
+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(MassReconcileBase, self)._base_columns()
+        aml_cols = super(MassReconcileAdvanced, self)._base_columns()
         aml_cols.append('account_move_line.purchase_line_id')
         aml_cols.append('account_move_line.product_id')
         return aml_cols