diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index bcec9209d22..a7055862cf7 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -66,9 +66,16 @@ class account_analytic_account(osv.osv):
         return r
 
     def _balance_calc(self, cr, uid, ids, name, arg, context={}):
+        res = {}
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         acc_set = ",".join(map(str, ids2))
         
+        for i in ids:
+            res.setdefault(i,0.0)
+            
+        if not acc_set:
+            return res
+        
         where_date = ''
         if context.get('from_date',False):
             where_date += " AND l.date >= '" + context['from_date'] + "'"
@@ -76,7 +83,7 @@ class account_analytic_account(osv.osv):
             where_date += " AND l.date <= '" + context['to_date'] + "'"
             
         cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id %s) WHERE a.id IN (%s) GROUP BY a.id" % (where_date,acc_set))
-        res = {}
+        
         for account_id, sum in cr.fetchall():
             res[account_id] = sum
 
@@ -86,10 +93,12 @@ class account_analytic_account(osv.osv):
 
         res_currency= self.pool.get('res.currency')
         for id in ids:
+            if id not in ids2:
+                continue
             for child in self.search(cr, uid, [('parent_id', 'child_of', [id])]):
                 if child <> id:
                     res.setdefault(id, 0.0)
-                    if  currency[child]<>currency[id] :
+                    if  currency[child]<>currency[id]:
                         res[id] += res_currency.compute(cr, uid, currency[child], currency[id], res.get(child, 0.0), context=context)
                     else:
                         res[id] += res.get(child, 0.0)
@@ -97,15 +106,23 @@ class account_analytic_account(osv.osv):
         cur_obj = res_currency.browse(cr,uid,currency.values(),context)
         cur_obj = dict([(o.id, o) for o in cur_obj])
         for id in ids:
-            res[id] = res_currency.round(cr,uid,cur_obj[currency[id]],res.get(id,0.0))
+            if id in ids2:
+                res[id] = res_currency.round(cr,uid,cur_obj[currency[id]],res.get(id,0.0))
 
         return dict([(i, res[i]) for i in ids ])
 
     def _quantity_calc(self, cr, uid, ids, name, arg, context={}):
         #XXX must convert into one uom
+        res = {}
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         acc_set = ",".join(map(str, ids2))
         
+        for i in ids:
+            res.setdefault(i,0.0)
+            
+        if not acc_set:
+            return res
+        
         where_date = ''
         if context.get('from_date',False):
             where_date += " AND l.date >= '" + context['from_date'] + "'"
@@ -116,11 +133,13 @@ class account_analytic_account(osv.osv):
                 FROM account_analytic_account a \
                     LEFT JOIN account_analytic_line l ON (a.id = l.account_id ' + where_date + ') \
                 WHERE a.id IN ('+acc_set+') GROUP BY a.id')
-        res = {}
+
         for account_id, sum in cr.fetchall():
             res[account_id] = sum
 
         for id in ids:
+            if id not in ids2:
+                continue
             for child in self.search(cr, uid, [('parent_id', 'child_of', [id])]):
                 if child <> id:
                     res.setdefault(id, 0.0)