diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 78c7e103946..4d7dd3d7acf 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -98,6 +98,10 @@ class account_analytic_account(osv.osv):
 
     def name_get(self, cr, uid, ids, context=None):
         res = []
+        if not ids:
+            return []
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         for id in ids:
             elmt = self.browse(cr, uid, id, context=context)
             res.append((id, self._get_one_full_name(elmt)))