diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 14912715b9c..de9c9b7c630 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -1096,14 +1096,20 @@ class account_move_line(osv.osv): if res: res = _('Entries: ')+ (res[0] or '') return res - if (not context.get('journal_id', False)) or (not context.get('period_id', False)): + if (not (context.get('journal_id', False) or context.get('journal_name', False))) or (not context.get('period_id', False)): return False 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 '' + if context.get('journal_name', False): + cr.execute('SELECT code FROM account_journal WHERE name ilike %s', (context['journal_name'], )) + else: + cr.execute('SELECT code FROM account_journal WHERE id = %s', (context['journal_id'], )) + + j = cr.fetchone() + j = (j and j[0]) or '' cr.execute('SELECT code FROM account_period WHERE id = %s', (context['period_id'], )) - p = cr.fetchone()[0] or '' + p = cr.fetchone() + p = (p and p[0]) or '' if j or p: return j + (p and (':' + p) or '') return False diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 3886f61d214..576b3347b66 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1253,7 +1253,7 @@ - +