diff --git a/invoicing_voucher_killer/__init__.py b/invoicing_voucher_killer/__init__.py
new file mode 100644
index 00000000..0463f7df
--- /dev/null
+++ b/invoicing_voucher_killer/__init__.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#   Copyright (c) 2013 Camptocamp SA (http://www.camptocamp.com)
+#   @author Nicolas Bessi
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
diff --git a/invoicing_voucher_killer/__openerp__.py b/invoicing_voucher_killer/__openerp__.py
new file mode 100644
index 00000000..1f5779df
--- /dev/null
+++ b/invoicing_voucher_killer/__openerp__.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#   Copyright (c) 2013 Camptocamp SA (http://www.camptocamp.com)
+#   @author Nicolas Bessi
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{'name': 'Invoicing voucher killer',
+ 'version': '1.0.0',
+ 'category': 'other',
+ 'description': """
+Prevent the usage of voucher from invoices
+##########################################
+This add-on will disable "Register Payment" button
+""",
+ 'author': 'Camptocamp',
+ 'website': 'http://www.camptocamp.com',
+ 'depends': ['account_voucher'],
+ 'data': ['invoice_data.xml',
+          'invoice_view.xml'],
+ 'demo_xml': [],
+ 'test': [],
+ 'installable': True,
+ 'active': False,
+ }
diff --git a/invoicing_voucher_killer/invoice_data.xml b/invoicing_voucher_killer/invoice_data.xml
new file mode 100644
index 00000000..01870109
--- /dev/null
+++ b/invoicing_voucher_killer/invoice_data.xml
@@ -0,0 +1,7 @@
+<openerp>
+  <data>
+    <record id="invoice_voucher_user" model="res.groups">
+      <field name="name">Use voucher in Invoices</field>
+    </record>
+  </data>
+</openerp>
diff --git a/invoicing_voucher_killer/invoice_view.xml b/invoicing_voucher_killer/invoice_view.xml
new file mode 100644
index 00000000..9d792cc1
--- /dev/null
+++ b/invoicing_voucher_killer/invoice_view.xml
@@ -0,0 +1,48 @@
+<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="type">form</field>
+      <field name="arch" type="xml">
+        <xpath expr="//button[@name='invoice_pay_customer'][last()]"
+               position="replace">
+          <button name="invoice_pay_customer"
+                  type="object"
+                  string="Register Payment"
+                  attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',True)]}"
+                  groups="invoicing_voucher_killer.invoice_voucher_user"/>
+        </xpath>
+        <xpath expr="//button[@name='invoice_pay_customer'][1]"
+               position="replace">
+          <button name="invoice_pay_customer"
+                  type="object"
+                  string="Register Payment"
+                  attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',False)]}"
+                  class="oe_highlight"
+                  groups="invoicing_voucher_killer.invoice_voucher_user"/>
+        </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="type">form</field>
+      <field name="arch" type="xml">
+        <xpath expr="//button[@name='invoice_pay_customer'][last()]"
+               position="replace">
+          <button name="invoice_pay_customer"
+                  type="object"
+                  string="Pay"
+                  states="open"
+                  class="oe_highlight"
+                  groups="invoicing_voucher_killer.invoice_voucher_user"/>
+        </xpath>
+      </field>
+    </record>
+
+  </data>
+</openerp>
diff --git a/statement_voucher_killer/__init__.py b/statement_voucher_killer/__init__.py
new file mode 100644
index 00000000..5e978d48
--- /dev/null
+++ b/statement_voucher_killer/__init__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#   Copyright (c) 2013 Camptocamp SA (http://www.camptocamp.com)
+#   @author Nicolas Bessi
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from . import voucher
diff --git a/statement_voucher_killer/__openerp__.py b/statement_voucher_killer/__openerp__.py
new file mode 100644
index 00000000..c29d760b
--- /dev/null
+++ b/statement_voucher_killer/__openerp__.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#   Copyright (c) 2013 Camptocamp SA (http://www.camptocamp.com)
+#   @author Nicolas Bessi
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{'name': 'voucher killer',
+ 'version': '1.0.0',
+ 'category': 'other',
+ 'description': """
+Prevent voucher creation when importing lines into statement.
+#############################################################
+
+When importing invoice or payment into a bank statement or a payment order, normally a
+draft voucher is created on the line. This module will disable this voucher creation""",
+ 'author': 'Camptocamp',
+ 'website': 'http://www.camptocamp.com',
+ 'depends': ['account_voucher', 'account_payment'],
+ 'init_xml': [],
+ 'update_xml': [],
+ 'demo_xml': [],
+ 'test': [],
+ 'installable': True,
+ 'active': False,
+ }
diff --git a/statement_voucher_killer/voucher.py b/statement_voucher_killer/voucher.py
new file mode 100644
index 00000000..b35f8159
--- /dev/null
+++ b/statement_voucher_killer/voucher.py
@@ -0,0 +1,128 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#   Copyright (c) 2013 Camptocamp SA (http://www.camptocamp.com)
+#   @author Nicolas Bessi
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp.osv import orm
+
+import time
+
+
+class AccountStatementFromInvoiceLines(orm.TransientModel):
+
+    _inherit = "account.statement.from.invoice.lines"
+
+    def populate_statement(self, cr, uid, ids, context=None):
+        """Taken from account voucher as no hook is available. No function
+        no refactoring, just trimming the part that generates voucher"""
+        if context is None:
+            context = {}
+        statement_id = context.get('statement_id', False)
+        if not statement_id:
+            return {'type': 'ir.actions.act_window_close'}
+        data =  self.read(cr, uid, ids, context=context)[0]
+        line_ids = data['line_ids']
+        if not line_ids:
+            return {'type': 'ir.actions.act_window_close'}
+
+        line_obj = self.pool.get('account.move.line')
+        statement_obj = self.pool.get('account.bank.statement')
+        statement_line_obj = self.pool.get('account.bank.statement.line')
+        currency_obj = self.pool.get('res.currency')
+        line_date = time.strftime('%Y-%m-%d')
+        statement = statement_obj.browse(cr, uid, statement_id, context=context)
+        # for each selected move lines
+        for line in line_obj.browse(cr, uid, line_ids, context=context):
+            ctx = context.copy()
+            #  take the date for computation of currency => use payment date
+            ctx['date'] = line_date
+            amount = 0.0
+
+            if line.debit > 0:
+                amount = line.debit
+            elif line.credit > 0:
+                amount = -line.credit
+
+            if line.amount_currency:
+                amount = currency_obj.compute(cr, uid, line.currency_id.id,
+                    statement.currency.id, line.amount_currency, context=ctx)
+            elif (line.invoice and line.invoice.currency_id.id <> statement.currency.id):
+                amount = currency_obj.compute(cr, uid, line.invoice.currency_id.id,
+                    statement.currency.id, amount, context=ctx)
+
+            context.update({'move_line_ids': [line.id],
+                            'invoice_id': line.invoice.id})
+            s_type = 'general'
+            if line.journal_id.type in ('sale', 'sale_refund'):
+                s_type = 'customer'
+            elif line.journal_id.type in ('purchase', 'purhcase_refund'):
+                s_type = 'supplier'
+            statement_line_obj.create(cr, uid, {
+                'name': line.name or '?',
+                'amount': amount,
+                'type': s_type,
+                'partner_id': line.partner_id.id,
+                'account_id': line.account_id.id,
+                'statement_id': statement_id,
+                'ref': line.ref,
+                'voucher_id': False,
+                'date': time.strftime('%Y-%m-%d'),
+            }, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+
+class AccountPaymentPopulateStatement(orm.TransientModel):
+    _inherit = "account.payment.populate.statement"
+
+    def populate_statement(self, cr, uid, ids, context=None):
+        """Taken from payment addon as no hook is vailable. No function
+        no refactoring, just trimming the part that generates voucher"""
+        line_obj = self.pool.get('payment.line')
+        statement_obj = self.pool.get('account.bank.statement')
+        statement_line_obj = self.pool.get('account.bank.statement.line')
+        currency_obj = self.pool.get('res.currency')
+
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids, [], context=context)[0]
+        line_ids = data['lines']
+        if not line_ids:
+            return {'type': 'ir.actions.act_window_close'}
+
+        statement = statement_obj.browse(cr, uid, context['active_id'], context=context)
+
+        for line in line_obj.browse(cr, uid, line_ids, context=context):
+            ctx = context.copy()
+            ctx['date'] = line.ml_maturity_date # was value_date earlier,but this field exists no more now
+            amount = currency_obj.compute(cr, uid, line.currency.id,
+                    statement.currency.id, line.amount_currency, context=ctx)
+            if not line.move_line_id.id:
+                continue
+            context.update({'move_line_ids': [line.move_line_id.id]})
+            st_line_id = statement_line_obj.create(cr, uid, {
+                'name': line.order_id.reference or '?',
+                'amount': - amount,
+                'type': 'supplier',
+                'partner_id': line.partner_id.id,
+                'account_id': line.move_line_id.account_id.id,
+                'statement_id': statement.id,
+                'ref': line.communication,
+                }, context=context)
+
+            line_obj.write(cr, uid, [line.id], {'bank_statement_line_id': st_line_id})
+        return {'type': 'ir.actions.act_window_close'}