diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index cf5bff246c4..067053c3e91 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -211,9 +211,9 @@
                                 <group col="6" colspan="4">
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
                                     <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
                                 </group>
                             </group>
                         </page>
@@ -305,11 +305,10 @@
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
 
-                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
-                                    <button name="%(account_invoices)d" type='action' string='Print' states='open' icon="gtk-print"/>
+                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
                                 </group>
                             </group>
                         </page>
@@ -513,6 +512,7 @@
             domain="[('account_id.reconcile', '=', True)]"
             context="{'search_default_unreconciled':True,'search_default_partner_id':[partner_id]}"
             id="act_account_invoice_account_move_unreconciled"
+	    groups="base.group_extended"
             name="Items to Reconcile"
             res_model="account.move.line"
             src_model="account.invoice"/>
@@ -520,7 +520,8 @@
         <act_window
             context="{'search_default_move_id':move_id, 'search_default_unreconciled':False,}"
             id="act_account_invoice_account_move_invoice_link"
-            name="Invoice Items "
+            name="Invoice Items"
+	    groups="base.group_extended"
             res_model="account.move.line"
             src_model="account.invoice"/>
 
diff --git a/addons/account_voucher/__init__.py b/addons/account_voucher/__init__.py
index 41f33976c53..2b1478d9fa0 100644
--- a/addons/account_voucher/__init__.py
+++ b/addons/account_voucher/__init__.py
@@ -20,7 +20,8 @@
 ##############################################################################
 
 import account_voucher
+import invoice
 import report
 import wizard
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 59495eddc5f..683cca2442e 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -47,6 +47,7 @@
         "voucher_payment_receipt_view.xml",
         "voucher_sales_purchase_view.xml",
         "account_voucher_wizard.xml",
+        "account_voucher_pay_invoice.xml",
         "security/account_voucher_security.xml"
     ],
     "test" : [
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index b089825da9b..1ad3edd0760 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -218,14 +218,5 @@
             </field>
         </record>
 
-        <act_window
-            id="act_invoice_voucher_open"
-            name="Pay Invoice"
-            view_mode="form,tree"
-            domain="[('partner_id', '=', partner_id)]"
-            context="{'default_partner_id': partner_id, 'default_amount':residual, 'default_name':name, 'default_state': 'draft', 'invoice_type':type, 'default_type': type in ('out_invoice','out_refund') and 'receipt' or 'payment'}"
-            res_model="account.voucher"
-            src_model="account.invoice"/>
-
     </data>
 </openerp>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 9d0c41c196c..7cd0563aafe 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -67,7 +67,7 @@
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>
         <field name="sequence">1</field>
-        <field name="restart">always</field>
+        <field name="restart">onskip</field>
     </record>
   </data>
 </openerp>