From bb58b65d0dcf296d7fea36f54c50163008b8af08 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Sat, 14 Aug 2010 15:13:51 +0530
Subject: [PATCH] [FIX]: fix a xml view data format

bzr revid: mga@tinyerp.com-20100814094351-r2rf630h9ppkgkfu
---
 addons/account/wizard/account_chart_view.xml  |  2 +-
 ...nt_compare_account_balance_report_view.xml | 84 +++++++++----------
 .../wizard/account_fiscalyear_close_state.xml | 28 +++----
 .../wizard/account_fiscalyear_close_view.xml  | 44 +++++-----
 .../account_move_bank_reconcile_view.xml      | 18 ++--
 ...ccount_move_line_reconcile_select_view.xml |  4 +-
 ...ount_move_line_unreconcile_select_view.xml | 26 +++---
 .../account_open_closed_fiscalyear_view.xml   | 24 +++---
 .../wizard/account_pay_invoice_view.xml       |  2 +-
 .../wizard/account_period_close_view.xml      | 32 +++----
 ...account_reconcile_partner_process_view.xml | 56 ++++++-------
 .../account/wizard/account_reconcile_view.xml |  2 +-
 .../account_report_account_balance_view.xml   | 80 +++++++++---------
 ...count_report_aged_partner_balance_view.xml | 48 +++++------
 .../account_report_balance_sheet_view.xml     | 26 +++---
 .../account_report_central_journal_view.xml   | 10 +--
 .../account_report_general_journal_view.xml   | 10 +--
 .../account_report_general_ledger_view.xml    | 22 ++---
 .../account_report_partner_balance_view.xml   | 20 ++---
 .../account_report_partner_ledger_view.xml    | 28 +++----
 .../account_report_profit_loss_view.xml       |  8 +-
 .../wizard/account_state_open_view.xml        | 33 ++++----
 .../account_statement_from_invoice_view.xml   |  1 +
 .../wizard/account_unreconcile_view.xml       | 38 ++++-----
 .../account/wizard/account_use_model_view.xml |  8 +-
 .../wizard/account_validate_move_view.xml     |  2 +-
 addons/account/wizard/account_vat_view.xml    | 40 ++++-----
 27 files changed, 343 insertions(+), 353 deletions(-)

diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index d29bffb833d..62f5c225a81 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -14,7 +14,7 @@
                     </group>
                     <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                       <label string ="" colspan="2"/>
+                        <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>
diff --git a/addons/account/wizard/account_compare_account_balance_report_view.xml b/addons/account/wizard/account_compare_account_balance_report_view.xml
index 2467928a584..22a9ff01cc7 100644
--- a/addons/account/wizard/account_compare_account_balance_report_view.xml
+++ b/addons/account/wizard/account_compare_account_balance_report_view.xml
@@ -1,51 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
      <data>
-
         <record id="account_compare_account_balance_report_view" model="ir.ui.view">
-             <field name="name">account.compare.account.balance.report.form</field>
-             <field name="model">account.compare.account.balance.report</field>
-             <field name="type">form</field>
-             <field name="arch" type="xml">
-              	<form string="Customize Report">
-					    <notebook tabpos="up">
-					        <page string="Report Options">
-					            <separator string="Select Fiscal Year(s)(Maximum Three Years)" colspan="4"/>
-					            <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
-					            <field name="fiscalyear" colspan="5" nolabel="1"/>
-					            <field name="landscape" colspan="4"/>
-					            <field name="show_columns" colspan="4"/>
-					            <field name="format_perc" colspan="4"/>
-					            <field name="select_account" colspan="4"/>
-					            <field name="account_choice" colspan="4"/>
-					            <field name="compare_pattern" colspan="4"/>
-
-					        </page>
-
-					        <page string="Select Period">
-					            <field name="period_manner" colspan="4"/>
-					            <separator string="Select Period(s)" colspan="4"/>
-					            <field name="periods" colspan="4" nolabel="1"/>
-					        </page>
-					    </notebook>
-
-				    <newline/>
-     				<group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="check" string="Print" type="object" icon="gtk-print" default_focus="1"/>
- 					</group>
-				</form>
+            <field name="name">account.compare.account.balance.report.form</field>
+            <field name="model">account.compare.account.balance.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Customize Report">
+                    <notebook tabpos="up">
+                        <page string="Report Options">
+                            <separator string="Select Fiscal Year(s)(Maximum Three Years)" colspan="4"/>
+                            <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
+                            <field name="fiscalyear" colspan="5" nolabel="1"/>
+                            <field name="landscape" colspan="4"/>
+                            <field name="show_columns" colspan="4"/>
+                            <field name="format_perc" colspan="4"/>
+                            <field name="select_account" colspan="4"/>
+                            <field name="account_choice" colspan="4"/>
+                            <field name="compare_pattern" colspan="4"/>
+                        </page>
+                        <page string="Select Period">
+                            <field name="period_manner" colspan="4"/>
+                            <separator string="Select Period(s)" colspan="4"/>
+                            <field name="periods" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                    <newline/>
+                    <group colspan="4" col="6">
+                        <label string ="" colspan="2"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="check" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+                    </group>
+                </form>
              </field>
- 		</record>
+         </record>
 
-		<act_window name="Account balance-Compare Years"
-				res_model="account.compare.account.balance.report"
-				src_model="account.account"
-				view_mode="form"
-				target="new"
-				key2="client_print_multi"
-			id="action_view_account_compare_account_balance_report"/>
+        <act_window name="Account balance-Compare Years"
+            res_model="account.compare.account.balance.report"
+            src_model="account.account"
+            view_mode="form"
+            target="new"
+            key2="client_print_multi"
+            id="action_view_account_compare_account_balance_report"/>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index 370aacbf2e3..c0944dd8472 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_account_fiscalyear_close_state" model="ir.ui.view">
+        <record id="view_account_fiscalyear_close_state" model="ir.ui.view">
             <field name="name">account.fiscalyear.close.state.form</field>
             <field name="model">account.fiscalyear.close.state</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close states of Fiscal year and periods">
-                	<group colspan="4" >
-                		 <field name="fy_id"  domain = "[('state','=','draft')]"/>
-              			 <separator string="Are you sure you want to close the fiscal year ?" colspan="4"/>
-                		 <field name="sure"/>
+                    <group colspan="4" >
+                        <field name="fy_id"  domain = "[('state','=','draft')]"/>
+                        <separator string="Are you sure you want to close the fiscal year ?" colspan="4"/>
+                        <field name="sure"/>
                     </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="gtk-close" string="Close states" name="data_save" type="object"/>
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-close" string="Close states" name="data_save" type="object"/>
                    </group>
                </form>
             </field>
@@ -27,13 +27,13 @@
             <field name="res_model">account.fiscalyear.close.state</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_account_fiscalyear_close_state"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_account_fiscalyear_close_state"/>
+            <field name="target">new</field>
         </record>
 
         <menuitem action="action_account_fiscalyear_close_state"
-        	id="menu_wizard_fy_close_state"
-        	parent="menu_account_end_year_treatments" />
+            id="menu_wizard_fy_close_state"
+            parent="menu_account_end_year_treatments" />
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 20547cde235..b151f7188a9 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_account_fiscalyear_close" model="ir.ui.view">
+        <record id="view_account_fiscalyear_close" model="ir.ui.view">
             <field name="name">account.fiscalyear.close.form</field>
             <field name="model">account.fiscalyear.close</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Fiscal Year Opening Entries Close a Fiscal Year with new entries">
-                	<group colspan="4" >
-	                	<field name="fy_id"  domain = "[('state','=','draft')]"/>
-	                	<field name="fy2_id"  domain = "[('state','=','draft')]"/>
-	                	<field name="journal_id" />
-	                	<field name="period_id" domain ="[('fiscalyear_id','=',fy2_id)]" />
-                	</group>
-                	<group colspan="4" >
-                		<field name="report_name" />
-                	</group>
-                	<group colspan="4" >
-              			 <separator string="Are you sure you want to create entries?" colspan="4"/>
-                		 <field name="sure"/>
+                    <group colspan="4" >
+                        <field name="fy_id"  domain = "[('state','=','draft')]"/>
+                        <field name="fy2_id"  domain = "[('state','=','draft')]"/>
+                        <field name="journal_id" />
+                        <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id)]" />
                     </group>
-                  	<separator string="" colspan="4" />
+                    <group colspan="4" >
+                        <field name="report_name" />
+                    </group>
+                    <group colspan="4" >
+                    <separator string="Are you sure you want to create entries?" colspan="4"/>
+                    <field name="sure"/>
+                    </group>
+                    <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Create" name="data_save" type="object"/>
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
                    </group>
                </form>
             </field>
         </record>
 
-		<record id="action_account_fiscalyear_close" model="ir.actions.act_window">
+        <record id="action_account_fiscalyear_close" model="ir.actions.act_window">
             <field name="name">Generate Opening Entries</field>
             <field name="res_model">account.fiscalyear.close</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_account_fiscalyear_close"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_account_fiscalyear_close"/>
+            <field name="target">new</field>
         </record>
 
         <menuitem action="action_account_fiscalyear_close"
-        	id="menu_wizard_fy_close"
-        	parent="menu_account_end_year_treatments" />
+            id="menu_wizard_fy_close"
+            parent="menu_account_end_year_treatments" />
 
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index d41993733df..7fd65d00f4e 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_account_move_bank_reconcile" model="ir.ui.view">
+        <record id="view_account_move_bank_reconcile" model="ir.ui.view">
             <field name="name">account.move.bank.reconcile.form</field>
             <field name="model">account.move.bank.reconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bank reconciliation">
-                	<group colspan="4" >
-                		 <field name="journal_id"/>
+                    <group colspan="4" >
+                        <field name="journal_id"/>
                     </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 for bank reconciliation" name="action_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 for bank reconciliation" name="action_open_window" type="object"/>
                    </group>
                 </form>
             </field>
-    	</record>
+        </record>
 
-    	<record id="action_account_bank_reconcile_tree" model="ir.actions.act_window">
+        <record id="action_account_bank_reconcile_tree" model="ir.actions.act_window">
             <field name="name">Bank reconciliation</field>
             <field name="res_model">account.move.bank.reconcile</field>
             <field name="view_type">form</field>
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 1ce7d5f3dab..c4c06dcf28b 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -14,9 +14,7 @@
                     <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 for Reconciliation" name="action_open_window"
-                            type="object" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" />
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index ae1b069a1dc..33e96b93185 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -1,38 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_account_move_line_unreconcile_select" model="ir.ui.view">
+        <record id="view_account_move_line_unreconcile_select" model="ir.ui.view">
             <field name="name">account.move.line.unreconcile.select.form</field>
             <field name="model">account.move.line.unreconcile.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Unreconciliation">
-                	<group colspan="4" >
-                		 <field name="account_id"/>
+                    <group colspan="4" >
+                        <field name="account_id"/>
                     </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 For Unreconciliation" name="action_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 For Unreconciliation" name="action_open_window" type="object" />
                    </group>
                </form>
             </field>
-    	</record>
+        </record>
 
         <record id="action_account_unreconcile_select" model="ir.actions.act_window">
             <field name="name">Unreconcile Entries</field>
             <field name="res_model">account.move.line.unreconcile.select</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_account_move_line_unreconcile_select"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_account_move_line_unreconcile_select"/>
+            <field name="target">new</field>
         </record>
 
       <!--  <menuitem action="action_account_unreconcile_select"
-        	id="menu_unreconcile_select" parent="periodical_processing_reconciliation" /> -->
+            id="menu_unreconcile_select" parent="periodical_processing_reconciliation" /> -->
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index 435f15388c1..d4c3509d47e 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_account_open_closed_fiscalyear" model="ir.ui.view">
+        <record id="view_account_open_closed_fiscalyear" model="ir.ui.view">
             <field name="name">account.open.closed.fiscalyear.form</field>
             <field name="model">account.open.closed.fiscalyear</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Choose Fiscal Year ">
-                	<group colspan="4" >
-                		 <field name="fyear_id"  domain = "[('state','=','draft')]"/>
+                    <group colspan="4" >
+                        <field name="fyear_id"  domain = "[('state','=','draft')]"/>
                     </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" name="remove_entries" type="object"/>
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
                     </group>
                 </form>
             </field>
@@ -25,13 +25,13 @@
             <field name="res_model">account.open.closed.fiscalyear</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_account_open_closed_fiscalyear"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_account_open_closed_fiscalyear"/>
+            <field name="target">new</field>
         </record>
 
 <!--        <menuitem action="action_account_open_closed_fiscalyear"-->
-<!--        	id="menu_wizard_open_closed_fy"  sequence="2"-->
-<!--        	parent="account.menu_account_end_year_treatments" />-->
+<!--            id="menu_wizard_open_closed_fy"  sequence="2"-->
+<!--            parent="account.menu_account_end_year_treatments" />-->
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_pay_invoice_view.xml b/addons/account/wizard/account_pay_invoice_view.xml
index 3601daaef06..78254a90bbe 100644
--- a/addons/account/wizard/account_pay_invoice_view.xml
+++ b/addons/account/wizard/account_pay_invoice_view.xml
@@ -52,7 +52,7 @@
                         <field name="analytic_id"/>
                     </group>
                     <group colspan="4" col="6">
-                           <label string ="" colspan="2"/>
+                        <label string ="" colspan="2"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-execute" string="Pay and reconcile" name="pay_and_reconcile_writeoff" type="object"/>
                    </group>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 7d1b048546f..161a3f424fc 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -8,21 +8,21 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close Period">
-                	<group colspan="4" >
-                    	 <separator string="Are you sure ?" colspan="4"/>
-                    	 <field name="sure"/>
+                    <group colspan="4" >
+                        <separator string="Are you sure ?" colspan="4"/>
+                        <field name="sure"/>
                     </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="Close Period" name="data_save" type="object"/>
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button  icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object"/>
                    </group>
                </form>
             </field>
         </record>
 
-		<record id="action_account_period_close" model="ir.actions.act_window">
+        <record id="action_account_period_close" model="ir.actions.act_window">
             <field name="name">Close a Period</field>
             <field name="res_model">account.period.close</field>
             <field name="view_type">form</field>
@@ -32,14 +32,14 @@
         </record>
 
         <record id="action_idea_post_vote_values" model="ir.values">
-	            <field name="model_id" ref="model_account_period" />
-	            <field name="object" eval="1" />
-	            <field name="name"></field>
-	            <field name="key2">client_action_multi</field>
-	            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_period_close'))"/>
-	            <field name="key">action</field>
-	            <field name="model">account.period</field>
-	    </record>
+            <field name="model_id" ref="model_account_period" />
+            <field name="object" eval="1" />
+            <field name="name"></field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_period_close'))"/>
+            <field name="key">action</field>
+            <field name="model">account.period</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index f119243a470..05a50e671c2 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -1,39 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
      <data>
-
-
-           <record id="account_partner_reconcile_view" model="ir.ui.view">
-             <field name="name">Partner Reconcilation Process</field>
-             <field name="model">account.partner.reconcile.process</field>
-             <field name="type">form</field>
-             <field name="arch" type="xml">
-	       <form string="Partner Reconciliation">
-                  <field name="progress" widget="progressbar" colspan="4"/>
-                  <field name="today_reconciled"/>
-                  <field name="to_reconcile"/>
-                  <newline/>
-                  <field name="next_partner_id" colspan="4"/>
-                  <newline/>
-                  <group colspan="4" col="4">
-     	             <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                     <button name="next_partner" icon="gtk-go-forward" type="object" string="Go to next partner" />
-                  </group>
+        <record id="account_partner_reconcile_view" model="ir.ui.view">
+            <field name="name">Partner Reconcilation Process</field>
+            <field name="model">account.partner.reconcile.process</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Partner Reconciliation">
+                    <field name="progress" widget="progressbar" colspan="4"/>
+                    <field name="today_reconciled"/>
+                    <field name="to_reconcile"/>
+                    <newline/>
+                    <field name="next_partner_id" colspan="4"/>
+                    <newline/>
+                    <group colspan="4" col="4">
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="next_partner" icon="gtk-go-forward" type="object" string="Go to next partner" />
+                    </group>
                </form>
-             </field>
-           </record>
+            </field>
+        </record>
 
         <record id="action_account_partner_reconcile" model="ir.actions.act_window">
-             <field name="name">Reconciliation: Go to Next Partner</field>
-             <field name="res_model">account.partner.reconcile.process</field>
-             <field name="type">ir.actions.act_window</field>
-             <field name="view_type">form</field>
-             <field name="view_mode">tree,form</field>
-             <field name="view_id" ref="account_partner_reconcile_view"/>
-             <field name="context">{'record_id':active_id}</field>
-             <field name="target">new</field>
+            <field name="name">Reconciliation: Go to Next Partner</field>
+            <field name="res_model">account.partner.reconcile.process</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="account_partner_reconcile_view"/>
+            <field name="context">{'record_id':active_id}</field>
+            <field name="target">new</field>
        </record>
-                <record model="ir.values" id="action_partner_reconcile_actino">
+            <record model="ir.values" id="action_partner_reconcile_actino">
             <field name="model_id" ref="account.model_account_move_line" />
             <field name="object" eval="1" />
             <field name="name">Partner reconciliation</field>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 49d194af792..673203478e8 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -141,7 +141,7 @@
                     <separator string="Analytic" colspan="4"/>
                     <field name="analytic_id"/>
                     <group colspan="4" col="6">
-                           <label string ="" colspan="2"/>
+                        <label string ="" colspan="2"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
                    </group>
diff --git a/addons/account/wizard/account_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml
index 548469ebce1..e107b7a2cfb 100644
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@ -3,46 +3,46 @@
 <openerp>
     <data>
 
-     <record id="account_report_balance_view" model="ir.ui.view">
+         <record id="account_report_balance_view" model="ir.ui.view">
+                <field name="name">Account Balance</field>
+                <field name="model">account.balance.report</field>
+                <field name="type">form</field>
+                <field name="inherit_id" ref="account_common_report_view" />
+                <field name="arch" type="xml">
+                   <field name="fiscalyear_id" position="after">
+                       <field name="display_account"/>
+                       <newline/>
+                   </field>
+                </field>
+        </record>
+
+        <record id="action_account_balance_menu" model="ir.actions.act_window">
+                <field name="name">Account Balance</field>
+                <field name="type">ir.actions.act_window</field>
+                <field name="res_model">account.balance.report</field>
+                <field name="view_type">form</field>
+                <field name="view_mode">form</field>
+                <field name="view_id" ref="account_report_balance_view"/>
+                <field name="target">new</field>
+            </record>
+
+        <menuitem
+                icon="STOCK_PRINT"
+                name="Account Balance"
+                parent="account.final_accounting_reports"
+                action="action_account_balance_menu"
+                id="menu_general_Balance_report"
+               />
+
+        <record model="ir.values" id="action_account_balance_report_values1">
+            <field name="model_id" ref="account.model_account_account" />
+            <field name="object" eval="1" />
             <field name="name">Account Balance</field>
-            <field name="model">account.balance.report</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account_common_report_view" />
-            <field name="arch" type="xml">
-               <field name="fiscalyear_id" position="after">
-                   <field name="display_account"/>
-                   <newline/>
-               </field>
-            </field>
-    </record>
-
-	<record id="action_account_balance_menu" model="ir.actions.act_window">
-            <field name="name">Account Balance</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.balance.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="account_report_balance_view"/>
-            <field name="target">new</field>
-    	</record>
-
-    <menuitem
-        	icon="STOCK_PRINT"
-	        name="Account Balance"
-	        parent="account.final_accounting_reports"
-	        action="action_account_balance_menu"
-	        id="menu_general_Balance_report"
-	       />
-
-	<record model="ir.values" id="action_account_balance_report_values1">
-        <field name="model_id" ref="account.model_account_account" />
-        <field name="object" eval="1" />
-        <field name="name">Account Balance</field>
-        <field name="key2">client_print_multi</field>
-        <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_balance_menu'))" />
-        <field name="key">action</field>
-        <field name="model">account.account</field>
-	</record>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_balance_menu'))" />
+            <field name="key">action</field>
+            <field name="model">account.account</field>
+        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index 8bb3a43938c..ad9c90b2e36 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -2,33 +2,33 @@
 <openerp>
      <data>
 
-     	<record id="account_aged_balance_view" model="ir.ui.view">
+        <record id="account_aged_balance_view" model="ir.ui.view">
             <field name="name">Aged Partner Balance</field>
             <field name="model">account.aged.trial.balance</field>
             <field name="type">form</field>
             <!--<field name="inherit_id" ref="account_common_report_view" />-->
             <field name="arch" type="xml">
-            	<form string="Report Options">
-				    <field name="chart_account_id" widget='selection'/>
-				    <field name="fiscalyear_id"/>
-				    <newline/>
-				    <field name="date_from"/>
-				    <field name="period_length"/>
-				    <newline/>
-				    <field name="result_selection"/>
-				    <field name="direction_selection"/>
-				    <field name="journal_ids"/>
-				    <newline/>
-     				<separator colspan="4"/>
+                <form string="Report Options">
+                    <field name="chart_account_id" widget='selection'/>
+                    <field name="fiscalyear_id"/>
+                    <newline/>
+                    <field name="date_from"/>
+                    <field name="period_length"/>
+                    <newline/>
+                    <field name="result_selection"/>
+                    <field name="direction_selection"/>
+                    <field name="journal_ids"/>
+                    <newline/>
+                    <separator colspan="4"/>
                     <group col="4" colspan="4">
                         <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
                         <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1"/>
- 					</group>
-				</form>
+                     </group>
+                </form>
             </field>
         </record>
 
- 		<record id="action_account_aged_balance_view" model="ir.actions.act_window">
+         <record id="action_account_aged_balance_view" model="ir.actions.act_window">
              <field name="name">Aged Partner Balance</field>
              <field name="res_model">account.aged.trial.balance</field>
              <field name="type">ir.actions.act_window</field>
@@ -37,14 +37,14 @@
              <field name="view_id" ref="account_aged_balance_view"/>
              <field name="context">{'record_id':active_id}</field>
              <field name="target">new</field>
-			<field name="help">Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. </field>
+            <field name="help">Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. </field>
        </record>
 
- 	   <menuitem icon="STOCK_PRINT"
- 	   		name="Aged Partner Balance"
- 	   		action="action_account_aged_balance_view"
- 			id="menu_aged_trial_balance"
- 			parent="account.next_id_22"/>
+        <menuitem icon="STOCK_PRINT"
+            name="Aged Partner Balance"
+            action="action_account_aged_balance_view"
+            id="menu_aged_trial_balance"
+            parent="account.next_id_22"/>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml
index a83ab469af0..3a4bfab0b64 100644
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ b/addons/account/wizard/account_report_balance_sheet_view.xml
@@ -2,23 +2,23 @@
 <openerp>
      <data>
 
-		<record id="account_bs_report_view" model="ir.ui.view">
+        <record id="account_bs_report_view" model="ir.ui.view">
             <field name="name">Account Balance Sheet</field>
             <field name="model">account.bs.report</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="account.account_common_report_view" />
             <field name="arch" type="xml">
                <field name="fiscalyear_id" position="after">
-<!--               		<field name="reserve_account_id"/>-->
-<!--               		<newline/>-->
-                   <field name="display_account"/>
-                   <field name="display_type"/>
-                   <newline/>
+<!--                <field name="reserve_account_id"/>-->
+<!--                <newline/>-->
+                    <field name="display_account"/>
+                    <field name="display_type"/>
+                    <newline/>
                </field>
             </field>
         </record>
 
- 		<record id="action_account_bs_report" model="ir.actions.act_window">
+        <record id="action_account_bs_report" model="ir.actions.act_window">
              <field name="name">Balance Sheet</field>
              <field name="res_model">account.bs.report</field>
              <field name="type">ir.actions.act_window</field>
@@ -28,11 +28,11 @@
              <field name="target">new</field>
        </record>
 
- 	   <menuitem icon="STOCK_PRINT"
- 	   		name="Balance Sheet"
- 	   		action="action_account_bs_report"
- 			id="menu_account_bs_report"
- 			parent="final_accounting_reports"/>
+       <menuitem icon="STOCK_PRINT"
+            name="Balance Sheet"
+            action="action_account_bs_report"
+            id="menu_account_bs_report"
+            parent="final_accounting_reports"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account/wizard/account_report_central_journal_view.xml b/addons/account/wizard/account_report_central_journal_view.xml
index 9920a5fa80d..91c550dfdca 100644
--- a/addons/account/wizard/account_report_central_journal_view.xml
+++ b/addons/account/wizard/account_report_central_journal_view.xml
@@ -8,11 +8,11 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="type">form</field>
             <field name="arch" type="xml">
-               <field name="fiscalyear_id" position="after">
-               		<field name="amount_currency"/>
-               		<newline/>
-                 <!-- we don't change the view but have to define a view for this specific object otherelse openerp will try to build a fedault one without using the one from the parent object -->
-               </field>
+                <field name="fiscalyear_id" position="after">
+                    <field name="amount_currency"/>
+                    <newline/>
+                    <!-- we don't change the view but have to define a view for this specific object otherelse openerp will try to build a fedault one without using the one from the parent object -->
+                </field>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_report_general_journal_view.xml b/addons/account/wizard/account_report_general_journal_view.xml
index 519543f37d5..b36f9ee27db 100644
--- a/addons/account/wizard/account_report_general_journal_view.xml
+++ b/addons/account/wizard/account_report_general_journal_view.xml
@@ -8,11 +8,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
-               <field name="fiscalyear_id" position="after">
-               	<field name="amount_currency"/>
-               	<newline/>
-                 <!-- we don't change the view but have to define a view for this specific object otherelse openerp will try to build a fedault one without using the one from the parent object -->
-               </field>
+                <field name="fiscalyear_id" position="after">
+                <field name="amount_currency"/>
+                <newline/>
+                <!-- we don't change the view but have to define a view for this specific object otherelse openerp will try to build a fedault one without using the one from the parent object -->
+                </field>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index 68e51e33dcc..87953a367df 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -26,12 +26,12 @@
             <field name="inherit_id" ref="account_report_general_ledger_view" />
             <field name="arch" type="xml">
                <field name="fiscalyear_id" position="replace">
-               		<field name="fiscalyear_id" on_change="onchange_fiscalyear(fiscalyear_id)"/>
+               <field name="fiscalyear_id" on_change="onchange_fiscalyear(fiscalyear_id)"/>
                </field>
             </field>
         </record>
 
-	<record id="action_account_general_ledger_menu" model="ir.actions.act_window">  <!-- rename id -->
+        <record id="action_account_general_ledger_menu" model="ir.actions.act_window">  <!-- rename id -->
             <field name="name">General Ledger</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.report.general.ledger</field>
@@ -39,9 +39,9 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="account_report_general_ledger_view"/>
             <field name="target">new</field>
-    	</record>
+        </record>
 
-		<record model="ir.values" id="action_account_general_ledger_values">
+        <record model="ir.values" id="action_account_general_ledger_values">
             <field name="model_id" ref="account.model_account_account" />
             <field name="object" eval="1" />
             <field name="name">General Ledger</field>
@@ -49,15 +49,15 @@
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_general_ledger_menu'))" />
             <field name="key">action</field>
             <field name="model">account.account</field>
-		</record>
+        </record>
 
         <menuitem
-        	icon="STOCK_PRINT"
-	        name="General Ledger"
-	        parent="account.final_accounting_reports"
-	        action="action_account_general_ledger_menu"
-	        id="menu_general_ledger"
-	       />
+            icon="STOCK_PRINT"
+            name="General Ledger"
+            parent="account.final_accounting_reports"
+            action="action_account_general_ledger_menu"
+            id="menu_general_ledger"
+           />
 
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_report_partner_balance_view.xml b/addons/account/wizard/account_report_partner_balance_view.xml
index c78d2f3f594..72e94b767c3 100644
--- a/addons/account/wizard/account_report_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_partner_balance_view.xml
@@ -2,21 +2,21 @@
 <openerp>
      <data>
 
-     	<record id="account_partner_balance_view" model="ir.ui.view">
+        <record id="account_partner_balance_view" model="ir.ui.view">
             <field name="name">Partner Balance</field>
             <field name="model">account.partner.balance</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
                <field name="fiscalyear_id" position="after">
-					<field name="result_selection"/>
-					<field name="initial_balance"/>
-					<newline/>
+                    <field name="result_selection"/>
+                    <field name="initial_balance"/>
+                    <newline/>
                </field>
             </field>
         </record>
 
- 		<record id="action_account_partner_balance" model="ir.actions.act_window">
+         <record id="action_account_partner_balance" model="ir.actions.act_window">
              <field name="name">Partner Balance</field>
              <field name="res_model">account.partner.balance</field>
              <field name="type">ir.actions.act_window</field>
@@ -28,11 +28,11 @@
              <field name="help">This report is analysis by partner. It is a PDF report containing one line per partner representing the cumulative credit balance.</field>
        </record>
 
- 	   <menuitem icon="STOCK_PRINT"
- 	   		name="Partner Balance"
- 	   		action="action_account_partner_balance"
- 			id="menu_account_partner_balance_report"
- 			parent="account.next_id_22"/>
+        <menuitem icon="STOCK_PRINT"
+            name="Partner Balance"
+            action="action_account_partner_balance"
+            id="menu_account_partner_balance_report"
+            parent="account.next_id_22"/>
 
      </data>
  </openerp>
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index 7203c05918f..c3a3c5ed50f 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -2,24 +2,24 @@
 <openerp>
      <data>
 
-     	<record id="account_partner_ledger_view" model="ir.ui.view">
+         <record id="account_partner_ledger_view" model="ir.ui.view">
             <field name="name">Partner Ledger</field>
             <field name="model">account.partner.ledger</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
                <field name="fiscalyear_id" position="after">
-               		<field name="result_selection"/>
-					<field name="initial_balance"/>
-					<field name="reconcil"/>
-					<field name="amount_currency"/>
-					<field name="page_split"/>
-					<newline/>
+                    <field name="result_selection"/>
+                    <field name="initial_balance"/>
+                    <field name="reconcil"/>
+                    <field name="amount_currency"/>
+                    <field name="page_split"/>
+                    <newline/>
                </field>
             </field>
         </record>
 
- 		<record id="action_account_partner_ledger" model="ir.actions.act_window">
+         <record id="action_account_partner_ledger" model="ir.actions.act_window">
              <field name="name">Select Period</field>
              <field name="res_model">account.partner.ledger</field>
              <field name="type">ir.actions.act_window</field>
@@ -31,11 +31,11 @@
              <field name="help">To get detailed information about a partner you can ask for the Partner Ledgers.</field>
        </record>
 
- 	   <menuitem icon="STOCK_PRINT"
- 	   		name="Partner Ledger"
- 	   		action="action_account_partner_ledger"
- 			id="menu_account_partner_ledger"
- 			parent="account.next_id_22"/>
+        <menuitem icon="STOCK_PRINT"
+            name="Partner Ledger"
+            action="action_account_partner_ledger"
+            id="menu_account_partner_ledger"
+            arent="account.next_id_22"/>
 
      </data>
- </openerp>
\ No newline at end of file
+ </openerp>
diff --git a/addons/account/wizard/account_report_profit_loss_view.xml b/addons/account/wizard/account_report_profit_loss_view.xml
index 86d0c65f975..39937ec59bc 100644
--- a/addons/account/wizard/account_report_profit_loss_view.xml
+++ b/addons/account/wizard/account_report_profit_loss_view.xml
@@ -2,7 +2,7 @@
 <openerp>
      <data>
 
-		<record id="account_pl_report_view" model="ir.ui.view">
+        <record id="account_pl_report_view" model="ir.ui.view">
             <field name="name">Profit and Loss</field>
             <field name="model">account.pl.report</field>
             <field name="type">form</field>
@@ -33,8 +33,8 @@
         <menuitem icon="STOCK_PRINT"
                 name="Profit And Loss"
                 action="action_account_pl_report"
-             	id="menu_account_pl_report"
-             	parent="final_accounting_reports"/>
+                id="menu_account_pl_report"
+                parent="final_accounting_reports"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
index 3ed71949b2a..a14d4b66007 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -2,35 +2,34 @@
 <openerp>
     <data>
 
-    	<record id="view_account_state_open" model="ir.ui.view">
+        <record id="view_account_state_open" model="ir.ui.view">
             <field name="name">Account State Open</field>
             <field name="model">account.state.open</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-					<form string="Open Invoice">
-				    <label string="Are you sure you want to open this invoice ?"/>
-				    <newline/>
-				    <label string="(Invoice should be unreconciled if you want to open it)"/>
-				    <separator colspan="4"/>
-              		<group colspan="2" col="4">
-            			<button special="cancel" string="No"  icon="gtk-no"/>
-            			<button name="change_inv_state" string="Yes" type="object" icon="gtk-yes"/>
-                	</group>
-				</form>
+                    <form string="Open Invoice">
+                    <label string="Are you sure you want to open this invoice ?"/>
+                    <newline/>
+                    <label string="(Invoice should be unreconciled if you want to open it)"/>
+                    <separator colspan="4"/>
+                    <group colspan="2" col="4">
+                        <button special="cancel" string="No"  icon="gtk-no"/>
+                        <button name="change_inv_state" string="Yes" type="object" icon="gtk-yes"/>
+                    </group>
+                </form>
             </field>
-		</record>
+        </record>
 
-		<record id="action_account_state_open" model="ir.actions.act_window">
+        <record id="action_account_state_open" model="ir.actions.act_window">
             <field name="name">Account State Open</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.state.open</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_account_state_open"/>
-	        <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{'record_id' : active_id}</field>
             <field name="target">new</field>
-    	</record>
-
+        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_statement_from_invoice_view.xml b/addons/account/wizard/account_statement_from_invoice_view.xml
index fce2eb1b18c..2d8d74826f3 100644
--- a/addons/account/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account/wizard/account_statement_from_invoice_view.xml
@@ -48,6 +48,7 @@
                </form>
             </field>
         </record>
+        
         <record id="action_view_account_statement_from_invoice_lines" model="ir.actions.act_window">
             <field name="name">Import Entries</field>
             <field name="res_model">account.statement.from.invoice.lines</field>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index 3ac038329d9..4d5a9da623a 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -7,14 +7,14 @@
             <field name="model">account.unreconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Unreconciliation">
-			    <separator string="Unreconciliation transactions" colspan="4"/>
-			    <image name="gtk-dialog-info"/>
-			    <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
-			    <separator colspan="4"/>
+            <form string="Unreconciliation">
+                <separator string="Unreconciliation transactions" colspan="4"/>
+                <image name="gtk-dialog-info"/>
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
+                <separator colspan="4"/>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
@@ -29,7 +29,7 @@
            <field name="target">new</field>
         </record>
 
-		<record model="ir.values" id="account_unreconcile_values">
+        <record model="ir.values" id="account_unreconcile_values">
             <field name="model_id" ref="account.model_account_move_line" />
             <field name="object" eval="1" />
             <field name="name">Unreconcile Entries</field>
@@ -44,31 +44,31 @@
             <field name="model">account.unreconcile.reconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Unreconciliation">
-			    <separator string="Unreconciliation transactions" colspan="4"/>
-			    <image name="gtk-dialog-info"/>
-			    <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
-			    <separator colspan="4"/>
+            <form string="Unreconciliation">
+                <separator string="Unreconciliation transactions" colspan="4"/>
+                <image name="gtk-dialog-info"/>
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
+                <separator colspan="4"/>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
         </record>
 
-		<record id="action_account_unreconcile_reconcile" model="ir.actions.act_window">
+        <record id="action_account_unreconcile_reconcile" model="ir.actions.act_window">
             <field name="name">Unreconcile Entries</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.unreconcile.reconcile</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="account_unreconcile_reconcile_view"/>
-	        <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{'record_id' : active_id}</field>
             <field name="target">new</field>
-    	</record>
+        </record>
 
-		<record model="ir.values" id="account_unreconcile_reconcile_values">
+        <record model="ir.values" id="account_unreconcile_reconcile_values">
             <field name="model_id" ref="account.model_account_move_reconcile" />
             <field name="object" eval="1" />
             <field name="name">Unreconcile Entries</field>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index f4cd436c9a2..54efb585b95 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -52,8 +52,8 @@
             <field name="arch" type="xml">
                 <form string="Use Model">
                     <group colspan="4" col="6" width="300" height="70">
-                           <label string = "Entry Lines Created." colspan="2"/>
-                           <newline/>
+                        <label string = "Entry Lines Created." colspan="2"/>
+                        <newline/>
                         <button icon="gtk-ok" special="cancel" string="Ok"/>
                         <button icon="terp-gtk-go-back-rtl" string="Open" name="open_moves" type="object" default_focus='1'/>
                    </group>
@@ -68,8 +68,8 @@
             <field name="arch" type="xml">
                 <form string="Use Model">
                     <group colspan="4" col="6" width="300" height="70">
-                           <label string = "Are you sure you want to create entries?" colspan="2"/>
-                           <newline/>
+                        <label string = "Are you sure you want to create entries?" colspan="2"/>
+                        <newline/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
                    </group>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 094304d25af..69e26c90f9a 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -39,7 +39,7 @@
             id="menu_validate_account_moves"
            />
 
-<!--Account Move lines-->
+        <!--Account Move lines-->
         <record id="validate_account_move_line_view" model="ir.ui.view">
             <field name="name">Validate Ledger Postings</field>
             <field name="model">validate.account.move.lines</field>
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 748e4313803..c8a6645f744 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -2,23 +2,23 @@
 <openerp>
     <data>
 
-		<record id="view_account_vat_declaration" model="ir.ui.view">
+        <record id="view_account_vat_declaration" model="ir.ui.view">
             <field name="name">Account Vat Declaration</field>
             <field name="model">account.vat.declaration</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Select Period">
-		        <field name="company_id" groups="base.group_multi_company" widget='selection'/>
-				<newline/>
-				<field name="based_on"/>
-				<newline/>
-				<separator string="Select Period(s)" colspan="4"/>
-				<field name="periods" nolabel="1" colspan="2"/>
-			    <group col="2" colspan="4">
-	                <button icon='gtk-cancel' special="cancel"  string="Cancel" />
-					<button name="create_vat" string="Print VAT Decl." colspan="1" type="object" icon="gtk-ok"/>
-				</group>
-			</form>
+            <form string="Select Period">
+                <field name="company_id" groups="base.group_multi_company" widget='selection'/>
+                <newline/>
+                <field name="based_on"/>
+                <newline/>
+                <separator string="Select Period(s)" colspan="4"/>
+                <field name="periods" nolabel="1" colspan="2"/>
+                <group col="2" colspan="4">
+                    <button icon='gtk-cancel' special="cancel"  string="Cancel" />
+                    <button name="create_vat" string="Print VAT Decl." colspan="1" type="object" icon="gtk-ok"/>
+                </group>
+            </form>
             </field>
         </record>
 
@@ -32,12 +32,12 @@
             <field name="help">This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.</field>
         </record>
 
-		<menuitem
-	        name="Taxes Report"
-	        parent="menu_tax_report"
-	        action="action_account_vat_declaration"
-	        id="menu_account_vat_declaration"
-	        icon="STOCK_PRINT"/>
+        <menuitem
+            name="Taxes Report"
+            parent="menu_tax_report"
+            action="action_account_vat_declaration"
+            id="menu_account_vat_declaration"
+            icon="STOCK_PRINT"/>
 
-	</data>
+    </data>
 </openerp>