pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] override read_group of account.move.line to be coherent with overridden search. Solves OPW 575885

Browse Source 
bzr revid: xmo@openerp.com-20120727120851-m73roahetthf7shj
This commit is contained in:
Xavier Morel
2012-07-27 14:08:51 +02:00
parent d62c46d505 ee6d0d5bb0
commit ac54e1405e
1 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_move_line.py
+38 -16
View File
@@ -698,18 +698,44 @@ class account_move_line(osv.osv):
# writeoff; entry generated for the difference between the lines
#
def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
if context is None:
context = {}
if context and context.get('next_partner_only', False):
if not context.get('partner_id', False):
partner = self.get_next_partner_only(cr, uid, offset, context)
else:
partner = context.get('partner_id', False)
if not partner:
return []
args.append(('partner_id', '=', partner[0]))
partner_domain = self._partner_domain(cr, uid, offset, context=context)
if partner_domain is None:
return []
args.extend(partner_domain)
return super(account_move_line, self).search(cr, uid, args, offset, limit, order, context, count)
def read_group(self, cr, uid, domain, fields, groupby, offset=0,
limit=None, context=None, orderby=False):
partner_domain = self._partner_domain(
cr, uid, offset, context=context)
if partner_domain is None:
# Always false domain, to return an empty groupby (no
# groups). Should create an empty groupby directly but no
# API and can't be arsed.
partner_domain = [('move_id', '=', False)]
domain.extend(partner_domain)
return super(account_move_line, self).read_group(
cr, uid, domain, fields, groupby,
offset, limit, context, orderby)
def _partner_domain(self, cr, uid, offset, context=None):
""" Returns a (complete) domain for the next partner with
unreconciled entries, to add to the existing domain.
May return an empty list if there is no filtering to be done
(``next_partner_only`` is not enabled).
Will return ``None`` if there is no partner with unreconciled
entries left, for the caller to handle as desired.
"""
if context and context.get('next_partner_only'):
partner = context.get('partner_id', False) \
or self.get_next_partner_only(cr, uid, offset, context)
if not partner:
return None
return [('partner_id', '=', partner[0])]
return []
def get_next_partner_only(self, cr, uid, offset=0, context=None):
cr.execute(
"""
@@ -738,8 +764,7 @@ class account_move_line(osv.osv):
total = 0.0
merges_rec = []
company_list = []
if context is None:
context = {}
for line in self.browse(cr, uid, ids, context=context):
if company_list and not line.company_id.id in company_list:
raise osv.except_osv(_('Warning !'), _('To reconcile the entries company should be the same for all entries'))
@@ -809,10 +834,7 @@ class account_move_line(osv.osv):
writeoff = debit - credit
# Ifdate_p in context => take this date
if context.has_key('date_p') and context['date_p']:
date=context['date_p']
else:
date = time.strftime('%Y-%m-%d')
date = context.get('date_p') or time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
cr.execute('SELECT account_id, reconcile_id '\
'FROM account_move_line '\