diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 48e0e27e59a..56d83debe4c 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -2,30 +2,30 @@
 <openerp>
     <data>
 
-    	<menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"/>
+        <menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"/>
         <menuitem id="menu_finance_receivables" name="Receivables" parent="menu_finance" sequence="1"/>
         <menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="2"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
 <!--        <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
         <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/>
-        	<menuitem id="periodical_processing_journal_entries_validation" name="Journal Entries Validation" parent="menu_finance_periodical_processing"/>
-        	<menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
-<!--        	<menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
-        	<menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
-<!--        	<menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
+            <menuitem id="periodical_processing_journal_entries_validation" name="Journal Entries Validation" parent="menu_finance_periodical_processing"/>
+            <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
+<!--            <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
+            <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
+<!--            <menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
         <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5"/>
         <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
-        	<menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
-        	<menuitem id="menu_generic_report" name="Management Reports" parent="menu_finance_reporting"/>
-        	<menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
-        	<menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
+            <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
+            <menuitem id="menu_generic_report" name="Management Reports" parent="menu_finance_reporting"/>
+            <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
+            <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13"/>
-        	<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
-        	<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
-        		<menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
-        		<menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting"/>
-        	<menuitem id="menu_configuration_misc" name="Miscelleanous" parent="menu_finance_configuration"/>
-				<menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
+            <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
+            <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
+                <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
+                <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting"/>
+            <menuitem id="menu_configuration_misc" name="Miscelleanous" parent="menu_finance_configuration"/>
+                <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
 <!--        <menuitem id="menu_finance_configuration1" name="Configuration" parent="menu_finance" sequence="80"/>-->
 <!--        <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>-->
 <!--        <menuitem id="menu_finance_accounting1" name="Financial Accounting" parent="menu_finance_configuration" sequence="80"/>-->
@@ -38,7 +38,7 @@
 
         <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4"
             groups="group_account_user"/>
-        <menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing" sequence="15"/>
+        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15"/>
 
 <!--        <menuitem id="menu_finance_periodical_processing11" name="Periodical Processing" parent="account.menu_finance"-->
 <!--            sequence="3"-->
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index fc622d8f0c0..8b4aa147a95 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -61,21 +61,6 @@
             parent="menu_tax_report"
             type="wizard"/> -->
 
-
-        <record id="action_tax_code_tree" model="ir.actions.act_window">
-            <field name="name">Chart of Taxes</field>
-            <field name="res_model">account.tax.code</field>
-            <field name="domain">[('parent_id','=',False)]</field>
-            <field name="view_type">tree</field>
-            <field name="view_id" ref="view_tax_code_tree"/>
-        </record>
-        <menuitem
-            action="action_tax_code_tree"
-            id="menu_action_tax_code_tree"
-            parent="menu_tax_report"
-            sequence="12"/>
-
-
         <report id="account_account_balance_compare"
             string="Account balance"
             model="account.account"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 29665939072..22d47ca540e 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -632,7 +632,7 @@
             <field name="view_id" ref="view_tax_code_tree"/>
         </record>
        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_accounting"/>
-        <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="menu_low_level" sequence="12"/>
+       <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="menu_low_level" sequence="12"/>
 
 
         <!--
@@ -714,7 +714,19 @@
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
         <menuitem action="action_tax_form" id="menu_action_tax_form" parent="next_id_27"/>
-
+        
+        <record id="action_tax_code_tree" model="ir.actions.act_window">
+            <field name="name">Chart of Taxes</field>
+            <field name="res_model">account.tax.code</field>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_tax_code_tree"/>
+        </record>
+        <menuitem
+            action="action_tax_code_tree"
+            id="menu_action_tax_code_tree"
+            parent="menu_finance_charts"
+            sequence="12"/>
 <!--       <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Entries by Line"/-->
         
         <!--
@@ -1287,7 +1299,7 @@
             <field name="model">account.model.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Entry Model Line">
+                <tree string="Entry Model Line" editable="bottom">
                     <field name="sequence"/>
                     <field name="ref"/>
                     <field name="name"/>
@@ -1295,6 +1307,8 @@
                     <field name="partner_id"/>
                     <field name="debit"/>
                     <field name="credit"/>
+                    <field name="date"/>
+                    <field name="date_maturity"/>
                 </tree>
             </field>
         </record>
@@ -1330,10 +1344,10 @@
                     <field name="name" select="1"/>
                     <field name="ref" select="1"/>
                     <field name="journal_id" select="1"/>
-                    <field colspan="4" name="lines_id" widget="one2many_list"/>
+                    <field colspan="4" nolabel="1" name="lines_id" height="250" widget="one2many_list"/>
                     <separator string="Legend" colspan="4"/>
                     <field name="legend" colspan="4" nolabel="1"/>
-                    <group col="1" colspan="4">
+                    <group col="1" colspan="4"> 
                         <button name="%(action_account_use_model_create_entry)d" string="Create entries" type="action" icon="gtk-execute"/>
                     </group>
                 </form>
@@ -1351,17 +1365,16 @@
             </field>
         </record>
         <record id="action_model_form" model="ir.actions.act_window">
-            <field name="name">Define Models</field>
+            <field name="name">Define Recurring</field>
             <field name="res_model">account.model</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_model_form" id="menu_action_model_form" parent="account.menu_finance_recurrent_entries"/>
-
+        <menuitem action="action_model_form" id="menu_action_model_form" parent="account.menu_configuration_misc"/>
 
         <!--
-    # Payment Terms
--->
+            # Payment Terms
+        -->
 
         <record id="view_payment_term_line_tree" model="ir.ui.view">
             <field name="name">account.payment.term.line.tree</field>
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 260876a98eb..8fa4b8065fb 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-<!--		<wizard-->
-<!--			string="Account balance-Compare Years"-->
-<!--			model="account.account"-->
-<!--			name="account.balance.account.balance.report"-->
-<!--			keyword="client_print_multi"-->
-<!--			id="wizard_account_balance_compare_report"/>-->
+<!--        <wizard-->
+<!--            string="Account balance-Compare Years"-->
+<!--            model="account.account"-->
+<!--            name="account.balance.account.balance.report"-->
+<!--            keyword="client_print_multi"-->
+<!--            id="wizard_account_balance_compare_report"/>-->
 
      <!--     <wizard id="wizard_invoice_refund" model="account.invoice" name="account.invoice.refund" string="Credit Note" groups="base.group_user"/>   -->
 
@@ -75,7 +75,7 @@
         <!-- report-related wizards -->
 <!--        <wizard id="wizard_partner_balance_report" menu="False" model="res.partner" name="account.partner.balance.report" string="Partner Balance"/>
         <menuitem icon="STOCK_PRINT" action="wizard_partner_balance_report" id="menu_partner_balance" parent="account.next_id_22" type="wizard"/> -->
-		<menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/>
+        <menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/>
         <!--<wizard id="wizard_third_party_ledger" menu="False" model="res.partner" name="account.third_party_ledger.report" string="Partner Ledger"/>
         <menuitem icon="STOCK_PRINT" action="wizard_third_party_ledger" id="menu_third_party_ledger" parent="account.next_id_22" type="wizard"/> -->
 
@@ -94,30 +94,30 @@
 
         <wizard id="wizard_validate_account_moves_line" menu="True" model="account.move.line" name="account.move_line.validate" string="Validate Ledger Postings"/>-->
 
-		<!-- Use Models -->
+        <!-- Use Models -->
 <!--        <wizard string="Create Entries From Models" model="account.model" name="account_use_models" menu="False" id="wizard_account_use_model"/>-->
 <!--        <menuitem action="wizard_account_use_model" type="wizard" parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>-->
 
 <!--        <wizard string="Create Entries From Models" model="account.move.line" name="account_use_models" menu="True" id="wizard_line_account_use_model"/>-->
 
-		<!-- account.invoice -->
+        <!-- account.invoice -->
 <!--    <wizard string="Open State" model="account.invoice" name="account.wizard_paid_open" menu="False" id="wizard_paid_open" groups="base.group_user"/> -->
 
-	    <!-- generic report wizard -->
-<!--	    <wizard id="wizard_account_balance_report" menu="False" model="account.account" name="account.account.balance.report" string="Account Balance"/>-->
+        <!-- generic report wizard -->
+<!--        <wizard id="wizard_account_balance_report" menu="False" model="account.account" name="account.account.balance.report" string="Account Balance"/>-->
 <!--        <menuitem icon="STOCK_PRINT" action="wizard_account_balance_report" id="menu_account_balance_report" parent="account.menu_generic_report" type="wizard"/>-->
 
-<!--		<wizard id="wizard_general_ledger" menu="False" model="account.account" name="account.general.ledger.report" string="General Ledger"/>
+<!--        <wizard id="wizard_general_ledger" menu="False" model="account.account" name="account.general.ledger.report" string="General Ledger"/>
         <menuitem icon="STOCK_PRINT" action="wizard_general_ledger" id="menu_general_ledger" parent="account.menu_generic_report" type="wizard"/>-->
 
 <!--        <wizard id="wizard_print_journal" menu="False" model="account.journal.period" name="account.print.journal.report" string="Print Journal" />
-		<menuitem icon="STOCK_PRINT" action="wizard_print_journal" id="menu_print_journal" parent="account.menu_generic_report" type="wizard" />
+        <menuitem icon="STOCK_PRINT" action="wizard_print_journal" id="menu_print_journal" parent="account.menu_generic_report" type="wizard" />
 
         <wizard id="wizard_central_journal" menu="False" model="account.journal.period" name="account.central.journal.report" string="Print Central Journal" />
-		<menuitem icon="STOCK_PRINT" action="wizard_central_journal" id="menu_central_journal" parent="account.menu_generic_report" type="wizard" />
+        <menuitem icon="STOCK_PRINT" action="wizard_central_journal" id="menu_central_journal" parent="account.menu_generic_report" type="wizard" />
 
         <wizard id="wizard_general_journal" menu="False" model="account.journal.period" name="account.general.journal.report" string="Print General Journal" />
-		<menuitem icon="STOCK_PRINT" action="wizard_general_journal" id="menu_general_journal" parent="account.menu_generic_report" type="wizard" />-->
+        <menuitem icon="STOCK_PRINT" action="wizard_general_journal" id="menu_general_journal" parent="account.menu_generic_report" type="wizard" />-->
 
 <!--        <wizard id="wizard_invoice_currency_change" model="account.invoice" name="account.invoice.currency_change" string="Change Currency" groups="base.group_user"/>-->
     </data>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index ad0e4f958d1..aeb6aef8324 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -2,37 +2,37 @@
 <openerp>
     <data>
 
-  		<record id="view_account_subscription_generate" model="ir.ui.view">
+          <record id="view_account_subscription_generate" model="ir.ui.view">
             <field name="name">account.subscription.generate.form</field>
             <field name="model">account.subscription.generate</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Compute">
-                	<group colspan="4" >
-                		 <separator string="Generate entries before:" colspan="4"/>
-              			 <field name="date"/>
+                    <group colspan="4" >
+                         <separator string="Generate entries before:" colspan="4"/>
+                           <field name="date"/>
                     </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-execute" string="Compute Entry Dates"
-                    		name="action_generate" type="object" />
+                           <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="gtk-execute" string="Compute Entry Dates"
+                            name="action_generate" type="object" />
                     </group>
                </form>
             </field>
-  		</record>
+          </record>
 
         <record id="action_account_subscription_generate" model="ir.actions.act_window">
-            <field name="name">Create Subscription Entries</field>
+            <field name="name">Automatic Recurring</field>
             <field name="res_model">account.subscription.generate</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           	<field name="view_id" ref="view_account_subscription_generate"/>
-           	<field name="target">new</field>
+               <field name="view_id" ref="view_account_subscription_generate"/>
+               <field name="target">new</field>
         </record>
 
-        <menuitem action="action_account_subscription_generate" id="menu_generate_subscription" parent="menu_finance_periodical_processing" />
+        <menuitem action="action_account_subscription_generate" id="menu_generate_subscription" parent="account.menu_finance_recurrent_entries" />
 
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 9ff781ea53c..03ca451e509 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -2,88 +2,88 @@
 <openerp>
     <data>
 
-    	<record id="view_account_use_model" model="ir.ui.view">
+        <record id="view_account_use_model" model="ir.ui.view">
             <field name="name">account.use.model.form</field>
             <field name="model">account.use.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Create Entries From Models">
-				<group height="240" width="510">
-					<separator string="This wizard will create entries from Models" colspan="4"/>
-					<field name="model"/>
-					<separator colspan="4"/>
-					<group colspan="4" col="2">
-						<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-						<button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
-					</group>
-				</group>
-			</form>
+            <form string="Create Entries From Models">
+                <group height="240" width="510">
+                    <separator string="This wizard will create recurring accounting entries" colspan="4"/>
+                    <field name="model"/>
+                    <separator colspan="4"/>
+                    <group colspan="4" col="2">
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
+                    </group>
+                </group>
+            </form>
             </field>
         </record>
 
-		<record id="action_view_account_use_model" model="ir.actions.act_window">
-        	<field name="name">Create Entries From Models</field>
+        <record id="action_view_account_use_model" model="ir.actions.act_window">
+            <field name="name">Manual Recurring</field>
             <field name="res_model">account.use.model</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           	<field name="view_id" ref="view_account_use_model"/>
-           	<field name="target">new</field>
-           	<field name="context">{'model_line':'model_line'}</field>
+               <field name="view_id" ref="view_account_use_model"/>
+               <field name="target">new</field>
+               <field name="context">{'model_line':'model_line'}</field>
         </record>
 
         <record model="ir.values" id="action_account_use_model_values">
             <field name="model_id" ref="account.model_account_move_line" />
             <field name="object" eval="1" />
-            <field name="name">Create Entries From Models</field>
+            <field name="name">Manual Recurring</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_view_account_use_model'))" />
             <field name="key">action</field>
             <field name="model">account.move.line</field>
-		</record>
+        </record>
 
-		<menuitem action="action_view_account_use_model" name="Create Entries From Models"
-					parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>
+        <menuitem action="action_view_account_use_model"
+                    parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>
 
-		<record id="view_account_use_model_open_entry" model="ir.ui.view">
+        <record id="view_account_use_model_open_entry" model="ir.ui.view">
             <field name="name">account.use.model.open.entry.form</field>
             <field name="model">account.use.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Use Model">
-                	<group colspan="4" col="6">
-                       	<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 colspan="4" col="6">
+                           <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>
                </form>
             </field>
         </record>
 
-		<record id="view_account_use_model_create_entry" model="ir.ui.view">
+        <record id="view_account_use_model_create_entry" model="ir.ui.view">
             <field name="name">account.use.model.create.entry.form</field>
             <field name="model">account.use.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Use Model">
-                	<group colspan="4" col="6">
-                       	<label string = "Are you sure you want to create entries?" colspan="2"/>
-                       	<newline/>
-                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
+                    <group colspan="4" col="6">
+                           <label string = "Are you sure you want to create entries?" colspan="2"/>
+                           <newline/>
+                        <button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
                    </group>
                </form>
             </field>
         </record>
 
-		<record id="action_account_use_model_create_entry" model="ir.actions.act_window">
-        	<field name="name">Create Entries From Models</field>
+        <record id="action_account_use_model_create_entry" model="ir.actions.act_window">
+            <field name="name">Manual Recurring</field>
             <field name="res_model">account.use.model</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           	<field name="view_id" ref="view_account_use_model_create_entry"/>
-           	<field name="target">new</field>
+            <field name="view_id" ref="view_account_use_model_create_entry"/>
+            <field name="target">new</field>
         </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 3ef7f16d47c..232a924dbd9 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -2,23 +2,22 @@
 <openerp>
     <data>
 
-<!--Account Moves-->
+        <!--Account Moves-->
         <record id="validate_account_move_view" model="ir.ui.view">
             <field name="name">Validate Account Move</field>
             <field name="model">validate.account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Validate Account Entries">
-			    <separator string="Select Period and Journal for Validation" colspan="4"/>
-				    <field name="journal_id"/>
-			    <newline/>
-				    <field name="period_id"/>
-			    <separator string="Information" colspan="4"/>
-				    <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accouting fields." colspan="4"/>
-                    <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="terp-camera_test" string="Validate" name="validate_move" type="object"/>
-                   </group>
+            <form string="Validate Account Entries">
+                <separator string="Validate Journal Entries of a Journal" colspan="4"/>
+                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accouting fields." colspan="4"/>
+                <field name="journal_id"/>
+                <newline/>
+                <field name="period_id"/>
+                <group colspan="4" col="6">
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button icon="terp-camera_test" string="Validate" name="validate_move" type="object"/>
+               </group>
                </form>
             </field>
         </record>
@@ -33,38 +32,38 @@
         </record>
 
         <menuitem
-	        name="Validate Ledger Postings"
-	        parent="periodical_processing_journal_entries_validation"
-	        action="action_validate_account_move"
-	        id="menu_validate_account_moves"
-	       />
+            name="Validate Ledger Postings"
+            parent="periodical_processing_journal_entries_validation"
+            action="action_validate_account_move"
+            id="menu_validate_account_moves"
+           />
 
 <!--Account Move lines-->
-    	<record id="validate_account_move_line_view" model="ir.ui.view">
+        <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>
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Validate Moves">
               <separator string="Validate Ledger Postings" colspan="4"/>
-              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-            	<button name="validate_move_lines" string="Validate" type="object" icon="gtk-go-forward" default_focus="1"/>
-			</form>
+                  <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                <button name="validate_move_lines" string="Validate" type="object" icon="gtk-go-forward" default_focus="1"/>
+            </form>
             </field>
-		</record>
+        </record>
 
-		<record id="action_validate_account_move_line" model="ir.actions.act_window">
+        <record id="action_validate_account_move_line" model="ir.actions.act_window">
             <field name="name">Validate Ledger Postings</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">validate.account.move.lines</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="validate_account_move_line_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="validate_account_move_line_values">
+        <record model="ir.values" id="validate_account_move_line_values">
             <field name="model_id" ref="account.model_account_move_line" />
             <field name="object" eval="1" />
             <field name="name">Validate Ledger Postings</field>