diff --git a/addons/account/account.py b/addons/account/account.py
index e5e29f178a3..c409d82645b 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -836,6 +836,10 @@ class account_journal(osv.osv):
 
         @return: Returns a list of tupples containing id, name
         """
+        if not ids:
+            return []
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         result = self.browse(cr, user, ids, context=context)
         res = []
         for rs in result:
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 18ab1a779a3..cf3c1e31a82 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -926,12 +926,14 @@ class account_move_line(osv.osv):
             return res
         if (not context.get('journal_id', False)) or (not context.get('period_id', False)):
             return False
-        cr.execute('SELECT code FROM account_journal WHERE id = %s', (context['journal_id'], ))
-        j = cr.fetchone()[0] or ''
-        cr.execute('SELECT code FROM account_period WHERE id = %s', (context['period_id'], ))
-        p = cr.fetchone()[0] or ''
-        if j or p:
-            return j + (p and (':' + p) or '')
+        if context.get('search_default_journal_id', False):
+            context['journal_id'] = context.get('search_default_journal_id')
+            cr.execute('SELECT code FROM account_journal WHERE id = %s', (context['journal_id'], ))
+            j = cr.fetchone()[0] or ''
+            cr.execute('SELECT code FROM account_period WHERE id = %s', (context['period_id'], ))
+            p = cr.fetchone()[0] or ''
+            if j or p:
+                return j + (p and (':' + p) or '')
         return False
 
     def onchange_date(self, cr, user, ids, date, context=None):