Skip to content

Commit

Permalink
Merge PR #275 into 11.0
Browse files Browse the repository at this point in the history
Signed-off-by yvaucher
  • Loading branch information
OCA-git-bot committed Feb 4, 2020
2 parents e9fbfb7 + 7baa214 commit 5953e07
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion account_mass_reconcile/models/mass_reconcile.py
Expand Up @@ -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:
Expand Down
@@ -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
Expand Up @@ -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.'),
Expand Down
1 change: 1 addition & 0 deletions account_mass_reconcile_transaction_ref/tests/__init__.py
@@ -0,0 +1 @@
from . import test_account_reconcile_transaction_ref

0 comments on commit 5953e07

Please sign in to comment.