diff --git a/addons/account/account.py b/addons/account/account.py
index 35302850b51..c45386db99c 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -369,6 +369,7 @@ class account_account(osv.osv):
             ('other', 'Regular'),
             ('receivable', 'Receivable'),
             ('payable', 'Payable'),
+            ('liquidity','Liquidity'),
             ('consolidation', 'Consolidation'),
             ('closed', 'Closed'),
         ], 'Internal Type', required=True, help="This type is used to differentiate types with "\
diff --git a/addons/account_voucher/report/report_voucher.rml b/addons/account_voucher/report/report_voucher.rml
index cec3972358a..6237874205f 100755
--- a/addons/account_voucher/report/report_voucher.rml
+++ b/addons/account_voucher/report/report_voucher.rml
@@ -174,10 +174,10 @@
     <blockTable colWidths="52.0,123.0,50.0,92.0,83.0,124.0" style="Table4">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Type:</para>
+          <para style="terp_default_Bold_9">Journal:</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ voucher.type ]]</para>
+          <para style="terp_default_9">[[ voucher.journal_id.name ]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Number:</para>
diff --git a/addons/account_voucher/report/report_voucher_amount.rml b/addons/account_voucher/report/report_voucher_amount.rml
index c23c94a792d..828ca6ebc13 100755
--- a/addons/account_voucher/report/report_voucher_amount.rml
+++ b/addons/account_voucher/report/report_voucher_amount.rml
@@ -160,7 +160,7 @@
           <para style="terp_default_Bold_9">Type:</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ voucher.type ]]</para>
+          <para style="terp_default_9">[[ voucher.journal_id.nme ]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Number:</para>
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 6d4e6dc871e..ca4c4286034 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -57,6 +57,9 @@ class account_voucher(osv.osv):
         journal_pool = self.pool.get('account.journal')
         if context.get('journal_id', False):
             return context.get('journal_id')
+        if not context.get('journal_id', False) and context.get('search_default_journal_id', False):
+            return context.get('search_default_journal_id')
+            
         ttype = context.get('type', 'bank')
         res = journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1)
         return res and res[0] or False
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 18817b8c6e3..6e8e4ffe690 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -139,8 +139,8 @@
                     </group>
                     <newline/>
                     <group col='8' colspan='4'>
-                        <field name="journal_id" widget="selection" select="1"/>
-                        <field name="period_id" select="1"/>
+                        <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
+                        <field name="period_id" groups="base.group_extended"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="12" col="10">