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] added check for size before list access + corrected base columns for transaction ref

Browse Source
This commit is contained in:
Matthieu Dietrich
2014-07-21 12:08:34 +02:00
committed by Guewen Baconnier
parent c4a1f50e50
commit b5e62298ae
2 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
account_advanced_reconcile_transaction_ref/base_advanced_reconciliation.py
View File

@@ -30,16 +30,8 @@ class EasyReconcileAdvanced(orm.AbstractModel):
""" Mandatory columns for move lines queries """ Mandatory columns for move lines queries
An extra column aliased as ``key`` should be defined An extra column aliased as ``key`` should be defined
in each query.""" in each query."""
aml_cols = ( aml_cols = super(easy_reconcile_advanced, self).\
'id', _base_columns(rec)
'debit', aml_cols += ['account_move_line.transaction_ref']
'credit', return aml_cols
'date',
'period_id',
'ref',
'name',
'partner_id',
'account_id',
'move_id',
'transaction_ref')
return ["account_move_line.%s" % col for col in aml_cols]

17
account_easy_reconcile/base_reconciliation.py
View File

@@ -200,14 +200,15 @@ class EasyReconcileBase(orm.AbstractModel):
# reconciled and if all the lines were the same, in such # reconciled and if all the lines were the same, in such
# case, just skip the group and consider it as partially # case, just skip the group and consider it as partially
# reconciled (no change). # reconciled (no change).
existing_partial_id = lines[0]['reconcile_partial_id'] if lines:
if existing_partial_id: existing_partial_id = lines[0]['reconcile_partial_id']
partial_line_ids = set(ml_obj.search( if existing_partial_id:
cr, uid, partial_line_ids = set(ml_obj.search(
[('reconcile_partial_id', '=', existing_partial_id)], cr, uid,
context=context)) [('reconcile_partial_id', '=', existing_partial_id)],
if set(line_ids) == partial_line_ids: context=context))
return True, False if set(line_ids) == partial_line_ids:
return True, False
ml_obj.reconcile_partial( ml_obj.reconcile_partial(
cr, uid, cr, uid,