odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
RGA(OpenERP) 2012-08-22 18:26:16 +05:30
parent c9a718b98a
commit b4a38f16ac
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/account_move_reconciliation.py
View File

@ -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 = {

3
addons/account/wizard/account_reconcile.py
View File

@ -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)