From b4a38f16ace679f5c84b80ea9fe0edca7e96ae78 Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Wed, 22 Aug 2012 18:26:16 +0530 Subject: [PATCH] [FIX] last_reconciliation_date should write on reconcilation and change according to get correct partner based on last reconciliation date bzr revid: rgaopenerp-20120822125616-bxkrh4le71yg2dod --- addons/account/account_move_reconciliation.py | 4 ++-- addons/account/wizard/account_reconcile.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/account/account_move_reconciliation.py b/addons/account/account_move_reconciliation.py index 0590440b861..a6675825ce8 100644 --- a/addons/account/account_move_reconciliation.py +++ b/addons/account/account_move_reconciliation.py @@ -68,7 +68,7 @@ class account_move_reconciliation(osv.osv): if not last_reconciliation_date: res_ids.append(id) else: - move_ids = obj_move_line.search(cr, uid, [('partner_id','=', id),('create_date','>', last_reconciliation_date)]) + move_ids = obj_move_line.search(cr, uid, [('partner_id','=', id),('date','>', last_reconciliation_date)]) if move_ids: res_ids.append(id) return res_ids @@ -76,7 +76,7 @@ class account_move_reconciliation(osv.osv): def skip_partner(self, cr, uid, ids, context): res_partner = self.pool.get('res.partner') for partner in self.browse(cr, uid, ids, context=context): - res_partner.write(cr, uid, [partner.id] ,{'last_reconciliation_date':time.strftime("%Y-%m-%d %H:%M:%S")}) + res_partner.write(cr, uid, [partner.id] ,{'last_reconciliation_date':time.strftime("%Y-%m-%d")}) _columns = { diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py index 729792e2222..ceed4c267df 100644 --- a/addons/account/wizard/account_reconcile.py +++ b/addons/account/wizard/account_reconcile.py @@ -92,12 +92,13 @@ class account_move_line_reconcile(osv.osv_memory): partner_id = tmp_ml_id.partner_id and tmp_ml_id.partner_id.id or False debit_ml_ids = account_move_line_obj.search(cr, uid, [('partner_id', '=', partner_id), ('account_id.reconcile', '=', True), ('reconcile_id', '=', False), ('debit', '>', 0)], context=context) credit_ml_ids = account_move_line_obj.search(cr, uid, [('partner_id', '=', partner_id), ('account_id.reconcile', '=', True), ('reconcile_id', '=', False), ('credit', '>', 0)], context=context) + print 'REREWREW',credit_ml_ids, debit_ml_ids, context for ml_id in context['active_ids']: if ml_id in debit_ml_ids: debit_ml_ids.remove(ml_id) if ml_id in credit_ml_ids: credit_ml_ids.remove(ml_id) - if not debit_ml_ids and credit_ml_ids: + if not debit_ml_ids and not credit_ml_ids: context.update({'stop_reconcile': True}) account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id, period_id, journal_id, context=context)