[MERGE] merge with trunk addons
authorqdp-launchpad@tinyerp.com <>
Mon, 28 Jun 2010 07:50:55 +0000 (09:50 +0200)
committerqdp-launchpad@tinyerp.com <>
Mon, 28 Jun 2010 07:50:55 +0000 (09:50 +0200)
bzr revid: qdp-launchpad@tinyerp.com-20100628075055-uldxx5qhzjp2g9rr

1  2 
addons/account/wizard/account_common_report.py

@@@ -119,9 -122,13 +122,12 @@@ class account_common_report(osv.osv_mem
          data['model'] = context.get('active_model', 'ir.ui.menu')
          data['form'] = self.read(cr, uid, ids, ['date_from',  'date_to',  'fiscalyear_id', 'journal_ids', 'period_from', 'period_to',  'filter',  'chart_account_id'])[0]
          used_context = self._build_context(cr, uid, ids, data, context)
 +        query_line = obj_acc_move_line._query_get(cr, uid, obj='l', context=used_context)
-         return self._print_report(cr, uid, ids, data, query_line, context)
+         if used_context.get('periods', False):
+             data['form']['periods'] = used_context['periods']
+         else:
+             data['form']['periods'] = []
 -        query_line = self.pool.get('account.move.line')._query_get(cr, uid, obj='l', context=used_context)
+         return self._print_report(cr, uid, ids, data, query_line, context=context)
 -
  account_common_report()
  
 -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: