From ab3ecc1a1b4c99df05b51b77ff2f7b9731a10779 Mon Sep 17 00:00:00 2001 From: Damien Crier Date: Fri, 26 Jun 2015 16:33:02 +0200 Subject: [PATCH] [FIX] can now open view of items reconciled from an history --- .../easy_reconcile_history.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/account_easy_reconcile/easy_reconcile_history.py b/account_easy_reconcile/easy_reconcile_history.py index 7bfaeca7..b8a2c010 100644 --- a/account_easy_reconcile/easy_reconcile_history.py +++ b/account_easy_reconcile/easy_reconcile_history.py @@ -38,13 +38,13 @@ class EasyReconcileHistory(models.Model): for reconcile in self.reconcile_ids: move_lines = reconcile.mapped('line_id') move_line_ids.extend(move_lines.ids) - self.reconcile_line_ids = (6, 0, move_line_ids) + self.reconcile_line_ids = move_line_ids move_line_ids = [] for reconcile in self.reconcile_partial_ids: move_lines = reconcile.mapped('line_partial_ids') move_line_ids.extend(move_lines.ids) - self.partial_line_ids = (6, 0, move_line_ids) + self.partial_line_ids = move_line_ids easy_reconcile_id = fields.Many2one( 'account.easy.reconcile', @@ -73,7 +73,7 @@ class EasyReconcileHistory(models.Model): ) partial_line_ids = fields.Many2many( comodel_name='account.move.line', - relation='account_move_line_history_rel', + relation='account_move_line_history_partial_rel', string='Partially Reconciled Items', multi='lines', _compute='_reconcile_line_ids' @@ -96,14 +96,19 @@ class EasyReconcileHistory(models.Model): """ assert rec_type in ('full', 'partial'), \ "rec_type must be 'full' or 'partial'" - history = self + move_line_ids = [] if rec_type == 'full': - field = 'reconcile_line_ids' + move_line_ids = [] + for reconcile in self.reconcile_ids: + move_lines = reconcile.mapped('line_id') + move_line_ids.extend(move_lines.ids) name = _('Reconciliations') else: - field = 'partial_line_ids' + move_line_ids = [] + for reconcile in self.reconcile_partial_ids: + move_lines = reconcile.mapped('line_partial_ids') + move_line_ids.extend(move_lines.ids) name = _('Partial Reconciliations') - move_line_ids = history.mapped(field).ids return { 'name': name, 'view_mode': 'tree,form',