From f14466aef877d40447359a7ae6471eb83082b687 Mon Sep 17 00:00:00 2001 From: mreficent Date: Mon, 30 Oct 2017 17:07:53 +0100 Subject: [PATCH] [FIX] issue with mass_reconcile --- account_mass_reconcile/models/base_reconciliation.py | 4 +--- .../models/__init__.py | 2 +- ...conciliation.py => base_advanced_reconciliation.py} | 10 ++++------ 3 files changed, 6 insertions(+), 10 deletions(-) rename account_mass_reconcile_by_purchase_line/models/{base_reconciliation.py => base_advanced_reconciliation.py} (71%) diff --git a/account_mass_reconcile/models/base_reconciliation.py b/account_mass_reconcile/models/base_reconciliation.py index 7e07e328..a0c2e84b 100644 --- a/account_mass_reconcile/models/base_reconciliation.py +++ b/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): diff --git a/account_mass_reconcile_by_purchase_line/models/__init__.py b/account_mass_reconcile_by_purchase_line/models/__init__.py index f4d36637..98605de2 100644 --- a/account_mass_reconcile_by_purchase_line/models/__init__.py +++ b/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 diff --git a/account_mass_reconcile_by_purchase_line/models/base_reconciliation.py b/account_mass_reconcile_by_purchase_line/models/base_advanced_reconciliation.py similarity index 71% rename from account_mass_reconcile_by_purchase_line/models/base_reconciliation.py rename to account_mass_reconcile_by_purchase_line/models/base_advanced_reconciliation.py index 09861e45..423f8a65 100644 --- a/account_mass_reconcile_by_purchase_line/models/base_reconciliation.py +++ b/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