From fda32c5f786ffde71cd82e10185db593657aad7f Mon Sep 17 00:00:00 2001 From: "atp (Open ERP)" Date: Thu, 4 Nov 2010 16:44:23 +0530 Subject: [PATCH] [FIX]: Fix account_id problem in project_planning module. bzr revid: atp@tinyerp.co.in-20101104111423-ge5fvsn3y9fbf1ln --- addons/project_planning/project_planning.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py index 72b94c69dec..83c9cd6dff5 100644 --- a/addons/project_planning/project_planning.py +++ b/addons/project_planning/project_planning.py @@ -434,7 +434,7 @@ class report_account_analytic_planning_account(osv.osv): SELECT id FROM report_account_analytic_planning_line WHERE planning_id = %s AND account_id=%s - )""", (line.planning_id.id,line.account_id.id )) + )""", (line.planning_id.id, line.account_id and line.account_id.id or None)) result[line.id] = cr.fetchall()[0][0] / div * div2 return result @@ -452,7 +452,7 @@ class report_account_analytic_planning_account(osv.osv): cr.execute(""" SELECT SUM(unit_amount/uom.factor) FROM account_analytic_line acc LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id) - WHERE acc.date>=%s and acc.date<=%s and acc.account_id=%s""", (line.planning_id.date_from, line.planning_id.date_to, line.account_id.id, )) + WHERE acc.date>=%s and acc.date<=%s and acc.account_id=%s""", (line.planning_id.date_from, line.planning_id.date_to, line.account_id and line.account_id.id or None)) res = cr.fetchall()[0][0] if res: result[line.id] = res * div2 @@ -526,9 +526,9 @@ class report_account_analytic_planning_stat(osv.osv): if line.user_id: cr.execute('''SELECT sum(acc.unit_amount/uom.factor) FROM account_analytic_line acc LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id) -WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.id, line.account_id.id, line.planning_id.date_from, line.planning_id.date_to)) +WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.id, line.account_id and line.account_id.id or None, line.planning_id.date_from, line.planning_id.date_to)) else: - cr.execute('SELECT sum(unit_amount) FROM account_analytic_line WHERE account_id=%s AND date>=%s AND date<=%s', (line.account_id.id, line.planning_id.date_from, line.planning_id.date_to)) + cr.execute('SELECT sum(unit_amount) FROM account_analytic_line WHERE account_id=%s AND date>=%s AND date<=%s', (line.account_id and line.account_id.id or None, line.planning_id.date_from, line.planning_id.date_to)) sum = cr.fetchone() if sum and sum[0]: @@ -563,7 +563,7 @@ WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.i project_id IN (select id from project_project where analytic_account_id=%s) AND date_end>=%s AND date_end<=%s''', ( - line.account_id.id, + line.account_id and line.account_id.id or None, line.planning_id.date_from, line.planning_id.date_to) )