From 8bf26e5d80f4d02d631dee3fda54b74e90e4c0bc Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 19 Jun 2007 18:43:04 +0000 Subject: [PATCH] Adding note in planning lines bzr revid: fp@tinyerp.com-6a15bdd758b1566bfc9f852deb8a62a441f0d79b --- .../report_analytic_line/report_analytic_planning.py | 11 +++++++++-- .../report_analytic_planning_view.xml | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/addons/report_analytic_line/report_analytic_planning.py b/addons/report_analytic_line/report_analytic_planning.py index eae8f01c75e..3dba649d852 100644 --- a/addons/report_analytic_line/report_analytic_planning.py +++ b/addons/report_analytic_line/report_analytic_planning.py @@ -64,6 +64,7 @@ class report_account_analytic_planning_line(osv.osv): 'user_id': fields.many2one('res.users', 'User'), 'amount': fields.float('Quantity', required=True), 'amount_unit':fields.many2one('product.uom', 'Qty UoM', required=True), + 'note':fields.text('Note', size=64), } _order = 'user_id,account_id' report_account_analytic_planning_line() @@ -106,18 +107,24 @@ class report_account_analytic_planning_stat(osv.osv): def _sum_amount_real(self, cr, uid, ids, name, args, context): result = {} for line in self.browse(cr, uid, ids, context): - cr.execute('select sum(unit_amount) from account_analytic_line where user_id=%d and account_id=%d and date>=%s and date<=%s', (line.user_id.id,line.account_id.id,line.planning_id.date_from,line.planning_id.date_to)) + if line.user_id: + cr.execute('select sum(unit_amount) from account_analytic_line where user_id=%d and account_id=%d and date>=%s and date<=%s', (line.user_id.id,line.account_id.id,line.planning_id.date_from,line.planning_id.date_to)) + else: + cr.execute('select sum(unit_amount) from account_analytic_line where account_id=%d and date>=%s and date<=%s', (line.account_id.id,line.planning_id.date_from,line.planning_id.date_to)) result[line.id] = cr.fetchone()[0] return result def _sum_amount_tasks(self, cr, uid, ids, name, args, context): result = {} for line in self.browse(cr, uid, ids, context): + where = '' + if line.user_id: + where='user_id='+str(line.user_id.id)+' and ' cr.execute('''select sum(planned_hours) from project_task where - user_id=%d and + '''+where+''' project_id in (select id from project_project where category_id=%d) and date_close>=%s and date_close<=%s''', ( diff --git a/addons/report_analytic_line/report_analytic_planning_view.xml b/addons/report_analytic_line/report_analytic_planning_view.xml index 0ba5f81c877..f226ecbf33e 100644 --- a/addons/report_analytic_line/report_analytic_planning_view.xml +++ b/addons/report_analytic_line/report_analytic_planning_view.xml @@ -33,6 +33,7 @@ +