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

[FIX] account: reconciliation wizard, improve calculattion of pert. 

bzr revid: hmo@tinyerp.com-20120830103954-mueab873pcunqjod
This commit is contained in:
Harry (OpenERP) 2012-08-30 16:09:54 +05:30
parent 20eb0a5e88
commit ca60348209
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
addons/account/account_move_reconciliation.py
View File

@ -50,14 +50,37 @@ class account_move_reconciliation(osv.osv):
def _rec_progress(self, cr, uid, ids, prop, unknow_none, context=None):
res = {}
to_reconcile_ids = self.search(cr, uid, [], context=context)
to_reconcile = to_reconcile_ids and len(to_reconcile_ids) or 0
today_reconcile_ids = self.search(cr, uid, [('last_reconciliation_date','=',time.strftime('%Y-%m-%d'))], context=context)
today_reconcile = today_reconcile_ids and len(today_reconcile_ids) or 0
if context is None:
context = {}
ctx = dict(context)
ctx['next_partner_only'] = False
move_line_obj = self.pool.get("account.move.line")
to_reconcile_ids = move_line_obj.search(cr, uid, [
('reconcile_id','=',False),
('account_id.reconcile','=',True),
('state','!=', 'draft'),
('partner_id','!=', False),
'|', ('partner_id.last_reconciliation_date', '=', False),('partner_id.last_reconciliation_date','<',time.strftime('%Y-%m-%d 00:00:00')),
'|', ('debit', '>' ,0), ('credit', '>' ,0)
],
context=ctx)
partner_ids = []
for move_line in move_line_obj.browse(cr, uid, to_reconcile_ids, context=ctx):
partner = move_line.partner_id
if move_line.date > partner.last_reconciliation_date and partner.id not in partner_ids:
partner_ids.append(move_line.partner_id.id)
to_reconcile = len(partner_ids)
today_reconciled_ids = self.pool.get('res.partner').search(cr, uid, [
('last_reconciliation_date','>=',time.strftime('%Y-%m-%d 00:00:00')),
('last_reconciliation_date','<=',time.strftime('%Y-%m-%d 23:59:59'))
], context=ctx)
today_reconciled = today_reconciled_ids and len(today_reconciled_ids) or 0 # total partners which reconciled today
if to_reconcile < 0:
reconciliation_progress = 100
else:
reconciliation_progress = (100 / (float( to_reconcile + today_reconcile) or 1.0)) * today_reconcile
reconciliation_progress = (100 / (float( to_reconcile + today_reconciled) or 1.0)) * today_reconciled
for id in ids:
res[id] = reconciliation_progress
return res

7
addons/account/static/src/js/account_move_reconciliation.js
View File

@ -67,12 +67,13 @@ instance.account.extend_form_view = instance.web.FormView.extend({
var viewmanager = this.getParent();
this.dataset.read_slice().done(function(){
if (_.isEmpty(self.dataset.ids)){
self.$el.hide();
viewmanager.action.context.next_partner_only = true;
/*self.$el.hide();
viewmanager.action.context.next_partner_only = false;
viewmanager.searchview.do_search();
viewmanager.searchview.do_search();*/
}
else{
self.on_pager_action('next');
self.on_pager_action('first');
}
});
},