diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index f9512cd4e83..dee402d7f5d 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -177,7 +177,7 @@
 				
 			        <record id="conf_ova" model="account.account.template">
 			            <field name="code">1103</field>
-			            <field name="name">Output VAT</field>
+			            <field name="name">Tax Paid</field>
 			            <field ref="conf_cas" name="parent_id"/>
 			            <field name="type">other</field>
 			            <field name="user_type" ref="conf_account_type_asset"/>
@@ -210,7 +210,7 @@
 			
 			        <record id="conf_iva" model="account.account.template">
 			            <field name="code">1112</field>
-			            <field name="name">Input VAT</field>
+			            <field name="name">Tax Received</field>
 			            <field ref="conf_cli" name="parent_id"/>
 			            <field name="type">other</field>
 			            <field name="user_type" ref="conf_account_type_liability"/>
@@ -308,55 +308,55 @@
 
 			<!-- Input TAX -->
 	        <record id="tax_code_input" model="account.tax.code.template">
-	            <field name="name">Input TAX</field>
+	            <field name="name">Tax Received</field>
 	            <field name="parent_id" ref="tax_code_balance_net"/>
 	            <field eval="-1" name="sign"/>
 	        </record>
 
 		        <record id="tax_code_input_S" model="account.tax.code.template">
-		            <field name="name">Input TAX Rate S (15%)</field>
+		            <field name="name">Tax Received Rate S (15%)</field>
 		            <field name="parent_id" ref="tax_code_input"/>
 		        </record>
 	
 		        <record id="tax_code_input_R" model="account.tax.code.template">
-		            <field name="name">Input TAX Rate R (5%)</field>
+		            <field name="name">Tax Received Rate R (5%)</field>
 		            <field name="parent_id" ref="tax_code_input"/>
 		        </record>
 
 		        <record id="tax_code_input_X" model="account.tax.code.template">
-		            <field name="name">Input TAX Rate X (Exempt)</field>
+		            <field name="name">Tax Received Rate X (Exempt)</field>
 		            <field name="parent_id" ref="tax_code_input"/>
 		        </record>
 	
 		        <record id="tax_code_input_O" model="account.tax.code.template">
-		            <field name="name">Input TAX Rate O (Out of scope)</field>
+		            <field name="name">Tax Received Rate O (Out of scope)</field>
 		            <field name="parent_id" ref="tax_code_input"/>
 		        </record>
 
 	        <!-- Output TAX -->
 	
 	        <record id="tax_code_output" model="account.tax.code.template">
-	            <field name="name">Output TAX</field>
+	            <field name="name">Tax Paid</field>
 	            <field name="parent_id" ref="tax_code_balance_net"/>
 	        </record>
 
 		        <record id="tax_code_output_S" model="account.tax.code.template">
-		            <field name="name">Output TAX Rate S (15%)</field>
+		            <field name="name">Tax Paid Rate S (15%)</field>
 		            <field name="parent_id" ref="tax_code_output"/>
 		        </record>
 		
 		        <record id="tax_code_output_R" model="account.tax.code.template">
-		            <field name="name">Output TAX Rate R (5%)</field>
+		            <field name="name">Tax Paid Rate R (5%)</field>
 		            <field name="parent_id" ref="tax_code_output"/>
 		        </record>
 
 		        <record id="tax_code_output_X" model="account.tax.code.template">
-		            <field name="name">Output TAX Rate X (Exempt)</field>
+		            <field name="name">Tax Paid Rate X (Exempt)</field>
 		            <field name="parent_id" ref="tax_code_output"/>
 		        </record>
 		
 		        <record id="tax_code_output_O" model="account.tax.code.template">
-		            <field name="name">Output TAX Rate O (Out of scope)</field>
+		            <field name="name">Tax Paid Rate O (Out of scope)</field>
 		            <field name="parent_id" ref="tax_code_output"/>
 		        </record>
 
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 54ef92b8fb9..f56aadd3d17 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -495,6 +495,8 @@ class account_installer(osv.osv_memory):
                 sal_tax_parent_id = mod_obj.read(cr, uid, [sal_tax_parent], ['res_id'])[0]['res_id']
 
                 if s_tax*100 > 0.0:
+                    tax_account_ids = obj_acc.search(cr, uid, [('name','=','Tax Received')], context=context)
+                    sales_tax_account_id = tax_account_ids and tax_account_ids[0] or False
                     vals_tax_code = {
                         'name': 'TAX%s%%'%(s_tax*100),
                         'code': 'TAX%s%%'%(s_tax*100),
@@ -509,11 +511,18 @@ class account_installer(osv.osv_memory):
                                             'amount':s_tax,
                                             'base_code_id':new_tax_code,
                                             'tax_code_id':new_tax_code,
-                                            'type_tax_use':'sale'
+                                            'type_tax_use':'sale',
+                                            'account_collected_id':sales_tax_account_id,
+                                            'account_paid_id':sales_tax_account_id
                                             })
+                    default_account_ids = obj_acc.search(cr, uid, [('name','=','Product Sales')],context=context)
+                    if default_account_ids:
+                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids':[(6,0,[sales_tax])]})
                     tax_val.update({'taxes_id':[(6,0,[sales_tax])]})
                     default_tax.append(('taxes_id',sales_tax))
                 if p_tax*100 > 0.0:
+                    tax_account_ids = obj_acc.search(cr, uid, [('name','=','Tax Paid')], context=context)
+                    purchase_tax_account_id = tax_account_ids and tax_account_ids[0] or False
                     vals_tax_code = {
                         'name': 'TAX%s%%'%(p_tax*100),
                         'code': 'TAX%s%%'%(p_tax*100),
@@ -528,8 +537,13 @@ class account_installer(osv.osv_memory):
                                              'amount':p_tax,
                                              'base_code_id':new_tax_code,
                                             'tax_code_id':new_tax_code,
-                                            'type_tax_use':'purchase'
+                                            'type_tax_use':'purchase',
+                                            'account_collected_id':purchase_tax_account_id,
+                                            'account_paid_id':purchase_tax_account_id
                                              })
+                    default_account_ids = obj_acc.search(cr, uid, [('name','=','Expenses')], context=context)
+                    if default_account_ids:
+                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids':[(6,0,[purchase_tax])]})
                     tax_val.update({'supplier_taxes_id':[(6,0,[purchase_tax])]})
                     default_tax.append(('supplier_taxes_id',purchase_tax))
                 if len(tax_val):