audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

[MERGE]

Browse Source
This commit is contained in:
Alexandre Fayolle
2013-06-22 10:13:15 -04:00
committed by Maxime Chambreuil
parent caabefc691 2fcb2b75a5
commit 3b31d34476
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
analytic_hours_block/report/hours_block.py
View File

@@ -2,7 +2,7 @@
##############################################################################
#
# Author: Vincent Renaville, ported by Joel Grand-Guillaume
# Copyright 2010-2012 Camptocamp SA
# Copyright 2010-2013 Camptocamp SA
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -27,8 +27,7 @@ from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
class account_hours_block(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context=None):
super(account_hours_block, self).__init__(cr, uid, name, context=context)
self.localcontext.update({
'time': time,
self.localcontext.update({'time': time,
'date_format': DEFAULT_SERVER_DATE_FORMAT,
'analytic_lines': self._get_analytic_lines,
})
@@ -36,12 +35,19 @@ class account_hours_block(report_sxw.rml_parse):
def _get_analytic_lines(self, hours_block):
al_pool = self.pool.get('account.analytic.line')
al_ids = al_pool.search(
self.cr,
aj_pool = self.pool.get('account.analytic.journal')
tcj_ids = aj_pool.search(self.cr, self.uid,
[('type', '=', 'general')])
al_ids = al_pool.search(self.cr,
self.uid,
[('invoice_id', '=', hours_block.invoice_id.id)],
[('invoice_id', '=', hours_block.invoice_id.id),
('journal_id', 'in', tcj_ids),
],
order='date desc',
context=self.context)
return al_pool.browse(self.cr, self.uid, al_ids, context=self.context)
report_sxw.report_sxw('report.account.hours.block', 'account.hours.block', 'addons/analytic_hours_block/report/hours_block.rml', parser=account_hours_block)
report_sxw.report_sxw('report.account.hours.block',
'account.hours.block',
'addons/analytic_hours_block/report/hours_block.rml',
parser=account_hours_block)