diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 66ba78871fd..feda9b9a1e0 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -104,6 +104,8 @@ class account_move_line(osv.osv):
             s = -total_new
             data['debit'] = s>0  and s or 0.0
             data['credit'] = s<0  and -s or 0.0
+            del(data['analytic_account_id'])
+            del(data['account_tax_id'])
             return data
         # Ends: Manual entry from account.move form
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index f84f5181342..e66115f1f57 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -247,10 +247,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Journal">
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="type"/>
+                    <group colspan="4" col="6">
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="active" select="1"/>
+                        <field name="type"/>
+                        <field name="refund_journal" attrs="{'readonly':[('type','=','general'),('type','=','cash'),('type','=','situation')]}"/>
+                    </group>
+
                     <notebook colspan="4">
                         <page string="General Information">
                             <field name="view_id"/>
@@ -853,6 +857,8 @@
                             <field name="ref"/>
                             <field name="debit" sum="Total Debit"/>
                             <field name="credit" sum="Total Credit"/>
+                            <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
+                            <field name="analytic_account_id"/>
                             <field name="state"/>
                         </tree>
                     </field>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index d36d10b374f..a8c8b75b88c 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -171,6 +171,18 @@ your own chart of account.
             <field model="account.account" name="default_debit_account_id" search="[('type','=','receivable')]"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
+        <record id="refund_sales_journal" model="account.journal">
+            <field name="name">x Sales Credit Note Journal</field>
+            <field name="code">SCNJ</field>
+            <field name="type">sale</field>
+            <field name="refund_journal">True</field>
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="sequence_id" ref="sequence_sale_journal"/>
+            <field model="account.account" name="default_credit_account_id" search="[('type','=','receivable')]"/>
+            <field model="account.account" name="default_debit_account_id" search="[('type','=','receivable')]"/>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+
         <record id="expenses_journal" model="account.journal">
             <field name="name">x Expenses Journal</field>
             <field name="code">EXJ</field>
@@ -181,6 +193,17 @@ your own chart of account.
             <field model="account.account" name="default_credit_account_id" search="[('type','=','payable')]"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
+        <record id="refund_expenses_journal" model="account.journal">
+            <field name="name">x Expenses Credit Notes Journal</field>
+            <field name="code">ECNJ</field>
+            <field name="type">purchase</field>
+            <field name="refund_journal">True</field>
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="sequence_id" ref="sequence_purchase_journal"/>
+            <field model="account.account" name="default_debit_account_id" search="[('type','=','payable')]"/>
+            <field model="account.account" name="default_credit_account_id" search="[('type','=','payable')]"/>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
 
         <record id="bank_journal" model="account.journal">
             <field name="name">x Bank Journal</field>
@@ -192,6 +215,16 @@ your own chart of account.
             <field model="account.account" name="default_credit_account_id" ref="cash"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
+        <record id="check_journal" model="account.journal">
+            <field name="name">x Checks Journal</field>
+            <field name="code">CHK</field>
+            <field name="type">cash</field>
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="sequence_id" ref="sequence_journal"/>
+            <field model="account.account" name="default_debit_account_id" ref="cash"/>
+            <field model="account.account" name="default_credit_account_id" ref="cash"/>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
 
         <!--
 		Product income and expense accounts, default parameters