diff --git a/account_voucher_killer/README.md b/account_voucher_killer/README.md
new file mode 100644
index 000000000..e05d871dd
--- /dev/null
+++ b/account_voucher_killer/README.md
@@ -0,0 +1,11 @@
+# Prevent the usage of voucher from invoices
+
+This add-on disables the "Register Payment" button on
+customer invoices and the "Pay" button on supplier invoices.
+
+It also disables the voucher-related menus entries such as 
+"Sales Receipts", "Customer Payments", "Purchase Receipts", 
+"Supplier Payments" and "Journal Vouchers", "Sales Receipts Analysis".
+
+More precisely, this module adds a group "Use voucher in Invoices"
+and only users in that group see these buttons and menus.
diff --git a/invoicing_voucher_killer/__init__.py b/account_voucher_killer/__init__.py
similarity index 100%
rename from invoicing_voucher_killer/__init__.py
rename to account_voucher_killer/__init__.py
diff --git a/invoicing_voucher_killer/__openerp__.py b/account_voucher_killer/__openerp__.py
similarity index 96%
rename from invoicing_voucher_killer/__openerp__.py
rename to account_voucher_killer/__openerp__.py
index d38a4e7c0..f1f2b826c 100644
--- a/invoicing_voucher_killer/__openerp__.py
+++ b/account_voucher_killer/__openerp__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-{'name': 'Invoicing voucher killer',
+{'name': 'Accounting voucher killer',
  'version': '1.0.0',
  'category': 'other',
  'author': 'Camptocamp',
diff --git a/invoicing_voucher_killer/i18n/es.po b/account_voucher_killer/i18n/es.po
similarity index 100%
rename from invoicing_voucher_killer/i18n/es.po
rename to account_voucher_killer/i18n/es.po
diff --git a/invoicing_voucher_killer/i18n/invoicing_voucher_killer.pot b/account_voucher_killer/i18n/invoicing_voucher_killer.pot
similarity index 100%
rename from invoicing_voucher_killer/i18n/invoicing_voucher_killer.pot
rename to account_voucher_killer/i18n/invoicing_voucher_killer.pot
diff --git a/invoicing_voucher_killer/invoice_data.xml b/account_voucher_killer/invoice_data.xml
similarity index 100%
rename from invoicing_voucher_killer/invoice_data.xml
rename to account_voucher_killer/invoice_data.xml
diff --git a/account_voucher_killer/invoice_view.xml b/account_voucher_killer/invoice_view.xml
new file mode 100644
index 000000000..a55224160
--- /dev/null
+++ b/account_voucher_killer/invoice_view.xml
@@ -0,0 +1,55 @@
+<openerp>
+  <data>
+    <record id="invoice_voucher_group" model="ir.ui.view">
+      <field name="name">Hide voucher in invoice</field>
+      <field name="model">account.invoice</field>
+      <field name="inherit_id" ref="account_voucher.view_invoice_customer" />
+      <field name="arch" type="xml">
+        <xpath expr="//button[@name='invoice_pay_customer'][last()]"
+               position="attributes">
+           <attribute name="groups">account_voucher_killer.invoice_voucher_user</attribute>
+        </xpath>
+        <xpath expr="//button[@name='invoice_pay_customer'][1]"
+               position="attributes">
+           <attribute name="groups">account_voucher_killer.invoice_voucher_user</attribute>
+        </xpath>
+      </field>
+    </record>
+
+    <record id="invoice_voucher_group_supp_inv" model="ir.ui.view">
+      <field name="name">Hide voucher in supplier invoice</field>
+      <field name="model">account.invoice</field>
+      <field name="inherit_id" ref="account_voucher.view_invoice_supplier" />
+      <field name="arch" type="xml">
+        <xpath expr="//button[@name='invoice_pay_customer'][last()]"
+               position="attributes">
+           <attribute name="groups">account_voucher_killer.invoice_voucher_user</attribute>
+        </xpath>
+      </field>
+    </record>
+
+   <record id="account_voucher.menu_action_sale_receipt" model="ir.ui.menu">
+       <field name="groups_id" eval="[(6,0,[ref('account_voucher_killer.invoice_voucher_user')])]"/>
+   </record>
+   
+   <record id="account_voucher.menu_action_vendor_receipt" model="ir.ui.menu">
+       <field name="groups_id" eval="[(6,0,[ref('account_voucher_killer.invoice_voucher_user')])]"/>
+   </record>
+   
+   <record id="account_voucher.menu_action_purchase_receipt" model="ir.ui.menu">
+       <field name="groups_id" eval="[(6,0,[ref('account_voucher_killer.invoice_voucher_user')])]"/>
+   </record>
+   
+   <record id="account_voucher.menu_action_vendor_payment" model="ir.ui.menu">
+       <field name="groups_id" eval="[(6,0,[ref('account_voucher_killer.invoice_voucher_user')])]"/>
+   </record>
+   
+   <record id="account_voucher.menu_encode_entries_by_voucher" model="ir.ui.menu">
+       <field name="groups_id" eval="[(6,0,[ref('account_voucher_killer.invoice_voucher_user')])]"/>
+   </record>
+   
+   <record id="account_voucher.menu_action_sale_receipt_report_all" model="ir.ui.menu">
+       <field name="groups_id" eval="[(6,0,[ref('account_voucher_killer.invoice_voucher_user')])]"/>
+   </record>
+  </data>
+</openerp>
diff --git a/invoicing_voucher_killer/README.md b/invoicing_voucher_killer/README.md
deleted file mode 100644
index b41622268..000000000
--- a/invoicing_voucher_killer/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Prevent the usage of voucher from invoices
-
-This add-on disables the "Register Payment" button on
-customer invoices and the "Pay" button on supplier invoices.
-
-More precisely, this module adds a group "Use voucher in Invoices"
-and only users in that group see these buttons.
diff --git a/invoicing_voucher_killer/invoice_view.xml b/invoicing_voucher_killer/invoice_view.xml
deleted file mode 100644
index 6f6b6d731..000000000
--- a/invoicing_voucher_killer/invoice_view.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<openerp>
-  <data>
-    <record id="invoice_voucher_group" model="ir.ui.view">
-      <field name="name">Hide voucher in invoice</field>
-      <field name="model">account.invoice</field>
-      <field name="inherit_id" ref="account_voucher.view_invoice_customer" />
-      <field name="arch" type="xml">
-        <xpath expr="//button[@name='invoice_pay_customer'][last()]"
-               position="attributes">
-           <attribute name="groups">invoicing_voucher_killer.invoice_voucher_user</attribute>
-        </xpath>
-        <xpath expr="//button[@name='invoice_pay_customer'][1]"
-               position="attributes">
-           <attribute name="groups">invoicing_voucher_killer.invoice_voucher_user</attribute>
-        </xpath>
-      </field>
-    </record>
-
-    <record id="invoice_voucher_group_supp_inv" model="ir.ui.view">
-      <field name="name">Hide voucher in supplier invoice</field>
-      <field name="model">account.invoice</field>
-      <field name="inherit_id" ref="account_voucher.view_invoice_supplier" />
-      <field name="arch" type="xml">
-        <xpath expr="//button[@name='invoice_pay_customer'][last()]"
-               position="attributes">
-           <attribute name="groups">invoicing_voucher_killer.invoice_voucher_user</attribute>
-        </xpath>
-      </field>
-    </record>
-
-  </data>
-</openerp>