diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 99c29ef18b9..aaa880929b1 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -530,9 +530,13 @@
                             <field colspan="4" name="move_line_ids" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="7" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="state"/>
                         <field name="balance_end"/>
+                        
+                        <button name="%(action_view_account_statement_from_invoice_lines)d"
+                            string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}"/>
+                        
                         <button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
                         <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
                         <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 5ce124bfcc7..4d8283ab0c1 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -2,30 +2,30 @@
 <openerp>
     <data>
 
-<!--		<record id="view_account_move_line_reconcile_prompt" model="ir.ui.view">-->
+<!--        <record id="view_account_move_line_reconcile_prompt" model="ir.ui.view">-->
 <!--            <field name="name">account.move.line.reconcile.prompt.form</field>-->
 <!--            <field name="model">account.move.line.reconcile.prompt</field>-->
 <!--            <field name="type">form</field>-->
 <!--            <field name="arch" type="xml">-->
 <!--                <form string="Reconciliation">-->
-<!--                	<separator string="Are you sure you want to reconcile entries?" colspan="4"/>-->
-<!--				    <group colspan="4" col="6">-->
-<!--                       	<label string ="" colspan="2"/>-->
+<!--                    <separator string="Are you sure you want to reconcile entries?" colspan="4"/>-->
+<!--                    <group colspan="4" col="6">-->
+<!--                           <label string ="" colspan="2"/>-->
 <!---->
-<!--                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
-<!--                    	<button icon="gtk-ok" string="Ok" name="ask_reconcilation" type="object" default_focus="1"/>-->
+<!--                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
+<!--                        <button icon="gtk-ok" string="Ok" name="ask_reconcilation" type="object" default_focus="1"/>-->
 <!--                   </group>-->
 <!--               </form>-->
 <!--            </field>-->
 <!--        </record>-->
 
-<!--		<record id="action_view_account_move_line_reconcile_prompt" model="ir.actions.act_window">-->
-<!--        	<field name="name">Reconcile Entries</field>-->
+<!--        <record id="action_view_account_move_line_reconcile_prompt" model="ir.actions.act_window">-->
+<!--            <field name="name">Reconcile Entries</field>-->
 <!--            <field name="res_model">account.move.line.reconcile.prompt</field>-->
 <!--            <field name="view_type">form</field>-->
 <!--            <field name="view_mode">tree,form</field>-->
-<!--           	<field name="view_id" ref="view_account_move_line_reconcile_prompt"/>-->
-<!--           	<field name="target">new</field>-->
+<!--               <field name="view_id" ref="view_account_move_line_reconcile_prompt"/>-->
+<!--               <field name="target">new</field>-->
 <!--        </record>-->
 
 <!--        <record model="ir.values" id="action_account_move_line_reconcile_prompt_values">-->
@@ -36,41 +36,41 @@
 <!--            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_view_account_move_line_reconcile_prompt'))" />-->
 <!--            <field name="key">action</field>-->
 <!--            <field name="model">account.move.line</field>-->
-<!--		</record>-->
-		
-		<record id="view_account_move_line_reconcile_full" model="ir.ui.view">
+<!--        </record>-->
+        
+        <record id="view_account_move_line_reconcile_full" model="ir.ui.view">
             <field name="name">account.move.line.reconcile.full.form</field>
             <field name="model">account.move.line.reconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reconciliation">
-                	<group height="210" width="550">
-	                	<separator string="Reconciliation transactions" colspan="4"/>
-					    <field name="trans_nbr"/>
-					    <newline/>
-					    <field name="credit"/>
-					    <field name="debit"/>
-					    <separator string="Write-Off" colspan="4"/>
-					    <field name="writeoff"/>
-					    <group colspan="4" col="6">
-	                       	<label string ="" colspan="2"/>
-	                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-	                    	<button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/>
-	                    	<button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
-	                    	<button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
-	                   </group>
-	                </group>
+                    <group height="210" width="550">
+                        <separator string="Reconciliation transactions" colspan="4"/>
+                        <field name="trans_nbr"/>
+                        <newline/>
+                        <field name="credit"/>
+                        <field name="debit"/>
+                        <separator string="Write-Off" colspan="4"/>
+                        <field name="writeoff"/>
+                        <group colspan="4" col="6">
+                            <label string ="" colspan="2"/>
+                            <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                            <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/>
+                            <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
+                            <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
+                       </group>
+                    </group>
                </form>
             </field>
         </record>
-		
-		<record id="action_view_account_move_line_reconcile" model="ir.actions.act_window">
-        	<field name="name">Reconcile Entries</field>
+        
+        <record id="action_view_account_move_line_reconcile" model="ir.actions.act_window">
+            <field name="name">Reconcile Entries</field>
             <field name="res_model">account.move.line.reconcile</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           	<field name="view_id" ref="view_account_move_line_reconcile_full"/>
-           	<field name="target">new</field>
+            <field name="view_id" ref="view_account_move_line_reconcile_full"/>
+            <field name="target">new</field>
         </record>
         
         <record model="ir.values" id="action_account_move_line_reconcile_prompt_values">
@@ -81,72 +81,72 @@
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_view_account_move_line_reconcile'))" />
             <field name="key">action</field>
             <field name="model">account.move.line</field>
-		</record>
-<!--    	<record id="view_account_move_line_reconcile_full" model="ir.ui.view">-->
+        </record>
+<!--        <record id="view_account_move_line_reconcile_full" model="ir.ui.view">-->
 <!--            <field name="name">account.move.line.reconcile.full.form</field>-->
 <!--            <field name="model">account.move.line.reconcile</field>-->
 <!--            <field name="type">form</field>-->
 <!--            <field name="arch" type="xml">-->
 <!--                <form string="Reconciliation">-->
-<!--                	<separator string="Reconciliation transactions" colspan="4"/>-->
-<!--				    <field name="trans_nbr"/>-->
-<!--				    <newline/>-->
-<!--				    <field name="credit"/>-->
-<!--				    <field name="debit"/>-->
-<!--				    <separator string="Write-Off" colspan="4"/>-->
-<!--				    <field name="writeoff"/>-->
-<!--				    <group colspan="4" col="6">-->
-<!--                       	<label string ="" colspan="2"/>-->
-<!--                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
-<!--                    	<button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1"/>-->
+<!--                    <separator string="Reconciliation transactions" colspan="4"/>-->
+<!--                    <field name="trans_nbr"/>-->
+<!--                    <newline/>-->
+<!--                    <field name="credit"/>-->
+<!--                    <field name="debit"/>-->
+<!--                    <separator string="Write-Off" colspan="4"/>-->
+<!--                    <field name="writeoff"/>-->
+<!--                    <group colspan="4" col="6">-->
+<!--                           <label string ="" colspan="2"/>-->
+<!--                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
+<!--                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1"/>-->
 <!--                   </group>-->
 <!--               </form>-->
 <!--            </field>-->
 <!--        </record>-->
 <!---->
-<!--		<record id="view_account_move_line_reconcile_partial" model="ir.ui.view">-->
+<!--        <record id="view_account_move_line_reconcile_partial" model="ir.ui.view">-->
 <!--            <field name="name">account.move.line.reconcile.partial.form</field>-->
 <!--            <field name="model">account.move.line.reconcile</field>-->
 <!--            <field name="type">form</field>-->
 <!--            <field name="arch" type="xml">-->
 <!--                <form string="Reconciliation">-->
-<!--                	<separator string="Reconciliation transactions" colspan="4"/>-->
-<!--				    <field name="trans_nbr"/>-->
-<!--				    <newline/>-->
-<!--				    <field name="credit"/>-->
-<!--				    <field name="debit"/>-->
-<!--				    <separator string="Write-Off" colspan="4"/>-->
-<!--				    <field name="writeoff"/>-->
-<!--				    <group colspan="4" col="6">-->
-<!--                       	<label string ="" colspan="2"/>-->
-<!--                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
-<!--                    	<button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" default_focus="1"/>-->
-<!--                    	<button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object"/>-->
+<!--                    <separator string="Reconciliation transactions" colspan="4"/>-->
+<!--                    <field name="trans_nbr"/>-->
+<!--                    <newline/>-->
+<!--                    <field name="credit"/>-->
+<!--                    <field name="debit"/>-->
+<!--                    <separator string="Write-Off" colspan="4"/>-->
+<!--                    <field name="writeoff"/>-->
+<!--                    <group colspan="4" col="6">-->
+<!--                           <label string ="" colspan="2"/>-->
+<!--                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
+<!--                        <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" default_focus="1"/>-->
+<!--                        <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object"/>-->
 <!--                   </group>-->
 <!--               </form>-->
 <!--            </field>-->
 <!--        </record>-->
 
-		<record id="account_move_line_reconcile_writeoff" model="ir.ui.view">
+        <record id="account_move_line_reconcile_writeoff" model="ir.ui.view">
             <field name="name">account.move.line.reconcile.writeoff.form</field>
             <field name="model">account.move.line.reconcile.writeoff</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Information addendum">
-                	<separator string="Write-Off Move" colspan="4"/>
-				    <field name="journal_id"/>
-				    <field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
-				    <field name="date_p"/>
-				    <field name="comment"/>
-				    <separator string="Analytic" colspan="4"/>
-				    <field name="analytic_id"/>
-				    <group colspan="4" col="6">
-                       	<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"/>
+                    <separator string="Write-Off Move" colspan="4"/>
+                    <field name="journal_id"/>
+                    <field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
+                    <field name="date_p"/>
+                    <field name="comment"/>
+                    <separator string="Analytic" colspan="4"/>
+                    <field name="analytic_id"/>
+                    <group colspan="4" col="6">
+                           <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>
                </form>
             </field>
         </record>
-	</data>
+    </data>
 </openerp>