audrius/account-reconcile
1
0
Fork 1
mirror of https://github.com/OCA/account-reconcile.git synced 2025-01-20 12:27:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] can now open view of items reconciled from an history

Browse Source
This commit is contained in:
Damien Crier
2015-06-26 16:33:02 +02:00
parent 721defc290
commit ab3ecc1a1b
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
account_easy_reconcile/easy_reconcile_history.py
View File

@@ -38,13 +38,13 @@ class EasyReconcileHistory(models.Model):
for reconcile in self.reconcile_ids: for reconcile in self.reconcile_ids:
move_lines = reconcile.mapped('line_id') move_lines = reconcile.mapped('line_id')
move_line_ids.extend(move_lines.ids) 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 = [] move_line_ids = []
for reconcile in self.reconcile_partial_ids: for reconcile in self.reconcile_partial_ids:
move_lines = reconcile.mapped('line_partial_ids') move_lines = reconcile.mapped('line_partial_ids')
move_line_ids.extend(move_lines.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( easy_reconcile_id = fields.Many2one(
'account.easy.reconcile', 'account.easy.reconcile',
@@ -73,7 +73,7 @@ class EasyReconcileHistory(models.Model):
) )
partial_line_ids = fields.Many2many( partial_line_ids = fields.Many2many(
comodel_name='account.move.line', comodel_name='account.move.line',
relation='account_move_line_history_rel', relation='account_move_line_history_partial_rel',
string='Partially Reconciled Items', string='Partially Reconciled Items',
multi='lines', multi='lines',
_compute='_reconcile_line_ids' _compute='_reconcile_line_ids'
@@ -96,14 +96,19 @@ class EasyReconcileHistory(models.Model):
""" """
assert rec_type in ('full', 'partial'), \ assert rec_type in ('full', 'partial'), \
"rec_type must be 'full' or 'partial'" "rec_type must be 'full' or 'partial'"
history = self move_line_ids = []
if rec_type == 'full': 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') name = _('Reconciliations')
else: 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') name = _('Partial Reconciliations')
move_line_ids = history.mapped(field).ids
return { return {
'name': name, 'name': name,
'view_mode': 'tree,form', 'view_mode': 'tree,form',