diff --git a/addons/account/account_unit_test.xml b/addons/account/account_unit_test.xml
index 77b461a6fdd..97fba380214 100644
--- a/addons/account/account_unit_test.xml
+++ b/addons/account/account_unit_test.xml
@@ -52,6 +52,8 @@
             <!-- writeoff_acc_id = -->        <value eval="ref('cash')"/>
             <!-- writeoff_period_id = -->    <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
             <!-- writeoff_journal_id = -->    <value eval="ref('bank_journal')"/>
+            <!-- context = -->              <value eval="{}"/>
+            <!-- name = -->                 <value eval="str('Payment from ASUStek')"/>
         </function>
         
         <assert id="test_invoice_1" model="account.invoice" string="Test invoice 1 is now paid">
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 78cb6cadd7e..21b13a244d8 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -196,13 +196,33 @@
                 </search>
             </field>
         </record>
-
+        
+        <record id="view_account_list" model="ir.ui.view">
+            <field name="name">account.account.list</field>
+            <field name="model">account.account</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_id</field>
+            <field name="arch" type="xml">
+                <tree string="Chart of accounts" toolbar="1" colors="blue:type in ('view');black:type not in ('view')">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="user_type" invisible="1"/>
+                    <field name="debit"/>
+                    <field name="credit"/>
+                    <field name="balance"/>
+                    <field name="type"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_currency_id"/>
+                </tree>
+            </field>
+        </record>
         <record id="action_account_form" model="ir.actions.act_window">
             <field name="name">Accounts</field>
             <field name="res_model">account.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="search_view_id" ref="view_account_search"/>
+            <field name="view_id" ref="view_account_list"/>
         </record>
         <menuitem id="account_account_menu" name="Accounts" parent="menu_finance_accounting"/>
         <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
@@ -216,14 +236,12 @@
                 <tree string="Chart of accounts" toolbar="1" colors="blue:type in ('view');black:type not in ('view')">
                     <field name="code"/>
                     <field name="name"/>
-                    <field name="parent_id" invisible="1"/>
-                    <field name="user_type" invisible="1"/>
                     <field name="debit"/>
                     <field name="credit"/>
                     <field name="balance"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="company_currency_id"/>
-                    <field name="type" invisible="1"/>
+                    <field name="type"/>
                 </tree>
             </field>
         </record>
@@ -237,10 +255,10 @@
 <!--        <menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.account_account_menu"/>-->
 
         <!--
-    Journal
+        Journal
 
-    Account Journal Columns
-    -->
+        Account Journal Columns
+        -->
 
         <record id="view_journal_column_form" model="ir.ui.view">
             <field name="name">account.journal.column.form</field>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index a1f3204b7f0..abae5562b2c 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -62,92 +62,218 @@
         <!--
         Chart of Account
         -->
-        <record id="minimal_0" model="account.account">
-            <field name="code">x 0</field>
+        
+        <record id="chart0" model="account.account">
+            <field name="code">X0</field>
             <field name="name">Chart For Automated Tests</field>
-            <field eval="False" name="parent_id"/>
+            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own accounts.
-            </field>
             <field name="user_type" ref="account_type_root"/>
         </record>
-        <record id="a_recv" model="account.account">
-            <field name="name">Main Receivable</field>
-            <field name="code">x 40000</field>
-            <field name="type">receivable</field>
-            <field eval="ref('minimal_0')" name="parent_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_receivable"/>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own chart of account.
-</field>
+
+        <!-- Balance Sheet -->
+
+        <record id="bal" model="account.account">
+            <field name="code">X1</field>
+            <field name="name">Balance Sheet - (test)</field>
+            <field ref="chart0" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_root"/>
         </record>
-        <record id="a_pay" model="account.account">
-            <field name="name">Main Payable</field>
-            <field name="code">x 44000</field>
-            <field name="type">payable</field>
-            <field eval="ref('minimal_0')" name="parent_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_payable"/>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own chart of account.
-</field>
+        
+        <record model="account.account" id="assets_view">
+                <field name="name">Assets - (test)</field>
+                <field name="code">X10</field>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_asset"/>
+                <field name="reconcile" eval="False"/>
+                <field name="parent_id" ref="bal"/>
         </record>
-        <record id="cash" model="account.account">
-            <field name="name">Petty Cash</field>
-            <field name="code">x 57000</field>
-            <field name="type">other</field>
-            <field eval="ref('minimal_0')" name="parent_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="user_type" ref="account_type_cash_moves"/>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own chart of account.
-</field>
+        
+        <record model="account.account" id="liabilities_view">
+                <field name="name">Liabilities - (test)</field>
+                <field name="code">X11</field>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_liability"/>
+                <field name="reconcile" eval="False"/>
+                <field name="parent_id" ref="bal"/>
         </record>
-        <record id="a_expense" model="account.account">
-            <field name="name">Products Purchase</field>
-            <field name="code">x 60000</field>
-            <field name="type">other</field>
-            <field eval="ref('minimal_0')" name="parent_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="user_type" ref="account_type_expense"/>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own chart of account.
-</field>
-        </record>
-        <record id="a_sale" model="account.account">
-            <field name="name">Products Sales</field>
-            <field name="code">x 70000</field>
-            <field name="type">other</field>
-            <field eval="ref('minimal_0')" name="parent_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="user_type" ref="account_type_income"/>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own chart of account.
-</field>
+            
+        <record id="fas" model="account.account">
+            <field name="code">X100</field>
+            <field name="name">Fixed Assets - (test)</field>
+            <field ref="assets_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_asset"/>
         </record>
 
+        <record id="xfa" model="account.account">
+            <field name="code">X1000</field>
+            <field name="name">Fixed Asset Account - (test)</field>
+            <field ref="fas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="nca" model="account.account">
+            <field name="code">X101</field>
+            <field name="name">Net Current Assets - (test)</field>
+            <field ref="assets_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="cas" model="account.account">
+            <field name="code">X1100</field>
+            <field name="name">Current Assets - (test)</field>
+            <field ref="nca" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="stk" model="account.account">
+            <field name="code">X11001</field>
+            <field name="name">Purchased Stocks - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="a_recv" model="account.account">
+            <field name="code">X11002</field>
+            <field name="name">Debtors - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">receivable</field>
+            <field eval="True" name="reconcile"/>
+            <field name="user_type" ref="account_type_receivable"/>
+        </record>
+
+        <record id="ova" model="account.account">
+            <field name="code">X11003</field>
+            <field name="name">Output VAT - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_receivable"/>
+        </record>
+
+        <record id="bnk" model="account.account">
+            <field name="code">X11004</field>
+            <field name="name">Bank Current Account - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="cash" model="account.account">
+            <field name="code">X11005</field>
+            <field name="name">Cash - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="cli" model="account.account">
+            <field name="code">X110</field>
+            <field name="name">Current Liabilities - (test)</field>
+            <field ref="liabilities_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_liability"/>
+        </record>
+
+        <record id="a_pay" model="account.account">
+            <field name="code">X1111</field>
+            <field name="name">Creditors - (test)</field>
+            <field ref="cli" name="parent_id"/>
+            <field name="type">payable</field>
+            <field eval="True" name="reconcile"/>
+            <field name="user_type" ref="account_type_payable"/>
+        </record>
+
+        <record id="iva" model="account.account">
+            <field name="code">X1112</field>
+            <field name="name">Input VAT - (test)</field>
+            <field ref="cli" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_payable"/>
+        </record>
+
+        <!-- Profit and Loss -->
+
+        <record id="gpf" model="account.account">
+            <field name="code">X2</field>
+            <field name="name">Profit and Loss - (test)</field>
+            <field ref="chart0" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_root"/>
+        </record>
+        
+        <record model="account.account" id="income_view">
+                <field name="name">Income - (test)</field>
+                <field name="code">X20</field>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_income"/>
+                <field name="reconcile" eval="False"/>
+                <field name="parent_id" ref="gpf"/>
+        </record>
+        
+        <record model="account.account" id="expense_view">
+                <field name="name">Expense - (test)</field>
+                <field name="code">X21</field>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_expense"/>
+                <field name="reconcile" eval="False"/>
+                <field name="parent_id" ref="gpf"/>
+        </record>
+            
+        <record id="rev" model="account.account">
+            <field name="code">X200</field>        
+            <field name="name">Revenue - (test)</field>
+            <field ref="income_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_income"/>
+        </record>
+
+        <record id="a_sale" model="account.account">
+            <field name="code">X2001</field>
+            <field name="name">Product Sales - (test)</field>
+            <field ref="rev" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_income"/>
+        </record>
+
+        <record id="cos" model="account.account">
+            <field name="code">X210</field>
+            <field name="name">Cost of Sales - (test)</field>
+            <field ref="expense_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_expense"/>
+        </record>
+
+        <record id="cog" model="account.account">
+            <field name="code">X2100</field>
+            <field name="name">Cost of Goods Sold - (test)</field>
+            <field ref="cos" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense"/>
+        </record>
+
+        <record id="ovr" model="account.account">
+            <field name="code">X211</field>
+            <field name="name">Overheads - (test)</field>
+            <field ref="expense_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_expense"/>
+        </record>
+
+        <record id="a_expense" model="account.account">
+            <field name="code">X2110</field>
+            <field name="name">Expenses - (test)</field>
+            <field ref="ovr" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense"/>
+        </record>
+        
+        
         <!-- Properties -->
         <record forcecreate="True" id="property_account_receivable" model="ir.property">
             <field name="name">property_account_receivable</field>
@@ -174,7 +300,7 @@ your own chart of account.
         -->
 
         <record id="sales_journal" model="account.journal">
-            <field name="name">x Sales Journal</field>
+            <field name="name">Sales Journal - (test)</field>
             <field name="code">SAJ</field>
             <field name="type">sale</field>
             <field name="view_id" ref="account_sp_journal_view"/>
@@ -185,7 +311,7 @@ your own chart of account.
             <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="name">Sales Credit Note Journal - (test)</field>
             <field name="code">SCNJ</field>
             <field name="type">sale_refund</field>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
@@ -196,7 +322,7 @@ your own chart of account.
         </record>
 
         <record id="expenses_journal" model="account.journal">
-            <field name="name">x Expenses Journal</field>
+            <field name="name">Expenses Journal - (test)</field>
             <field name="code">EXJ</field>
             <field name="type">purchase</field>
             <field name="view_id" ref="account_sp_journal_view"/>
@@ -207,7 +333,7 @@ your own chart of account.
             <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="name">Expenses Credit Notes Journal - (test)</field>
             <field name="code">ECNJ</field>
             <field name="type">purchase_refund</field>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
@@ -218,7 +344,7 @@ your own chart of account.
         </record>
 
         <record id="bank_journal" model="account.journal">
-            <field name="name">x Bank Journal</field>
+            <field name="name">Bank Journal - (test)</field>
             <field name="code">BNK</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account_journal_bank_view"/>
@@ -228,7 +354,7 @@ your own chart of account.
             <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="name">Checks Journal - (test)</field>
             <field name="code">CHK</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account_journal_bank_view"/>
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index 440dbd407ec..c9cc5ff7bd5 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -33,7 +33,7 @@ class account_chart(osv.osv_memory):
                                     help = 'Keep empty for all open fiscal years'),
        'target_move': fields.selection([('all', 'All Entries'),
                                         ('posted', 'All Posted Entries')], 'Target Moves', required = True),
-              }
+    }
 
     def _get_fiscalyear(self, cr, uid, context=None):
         """Return default Fiscalyear value"""
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index b621019dbe6..d29bffb833d 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -1,36 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-          <record id="view_account_chart" model="ir.ui.view">
+        <record id="view_account_chart" model="ir.ui.view">
             <field name="name">account.chart.form</field>
             <field name="model">account.chart</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account charts">
                     <group colspan="4" >
-                         <field name="fiscalyear"/>
-                           <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
-                         <field name="target_move"/>
+                        <field name="fiscalyear"/>
+                        <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
+                        <field name="target_move"/>
                     </group>
-                            <separator string="" colspan="4" />
+                    <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
-                    	<button icon="terp-gtk-go-back-rtl" string="Open Charts"
-                    		name="account_chart_open_window" type="object" />
+                       <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object" />
                     </group>
                 </form>
             </field>
-          </record>
+        </record>
 
         <record id="action_account_chart" model="ir.actions.act_window">
             <field name="name">Chart of Accounts</field>
             <field name="res_model">account.chart</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_account_chart"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_account_chart"/>
+            <field name="target">new</field>
         </record>
 
         <menuitem icon="STOCK_INDENT" action="action_account_chart"
diff --git a/addons/l10n_ch_chart_c2c_pcg/wizard/config.py b/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
index dbef21389bf..a0e080def06 100644
--- a/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
+++ b/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
@@ -62,14 +62,12 @@ class Tax_template(osv.osv_memory):
         }
 
     def _on_change(self, cr, uid, id, tax, vals):
-        if account:
-            self.pool.get('account.tax.template').write(
-                cr, uid, tax, vals=vals)
+        if tax:
+            self.pool.get('account.tax.template').write(cr, uid, tax, vals=vals)
         return {}
 
-    def on_change_collected(self, cr, uid, id, tax, account):
-        return self._on_change(
-            cr, uid, ids, tax, vals={'account_collected_id': account})
+    def on_change_collected(self, cr, uid, ids, tax, account):
+        return self._on_change(cr, uid, ids, tax, vals={'account_collected_id': account})
 
     def on_change_paid(self, cr, uid, id, tax, account):
         return self._on_change(