From d4c87342fb89b1a4ddf2c16eb1021cba94114b2c Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Tue, 26 Feb 2013 16:31:09 +0100
Subject: [PATCH] [FIX] Removes grouping functionality in creating invoices
 from sales orders and avoids double invoices

lp bug: https://launchpad.net/bugs/1092843 fixed

bzr revid: jco@openerp.com-20130226153109-xs603vv26vyiuke0
---
 addons/sale/wizard/sale_make_invoice.py  |  1 -
 addons/sale/wizard/sale_make_invoice.xml | 11 +++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index 87911228cb6..2d5bd29b2c2 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -51,7 +51,6 @@ class sale_make_invoice(osv.osv_memory):
         if context is None:
             context = {}
         data = self.read(cr, uid, ids)[0]
-        order_obj.action_invoice_create(cr, uid, context.get(('active_ids'), []), data['grouped'], date_invoice = data['invoice_date'])
         wf_service = netsvc.LocalService("workflow")
         for id in context.get(('active_ids'), []):
             wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr)
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index ced64a0f79d..14e11e228bc 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -6,16 +6,15 @@
             <field name="model">sale.make.invoice</field>
             <field name="arch" type="xml">
                 <form string="Create invoices" version="7.0">
-                    <header>
-                        <button name="make_invoices" string="Create Invoices" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator colspan="4" string="Do you really want to create the invoice(s)?" />
                     <group>
-                        <field name="grouped"/>
                         <field name="invoice_date"/>
                     </group>
+                    <footer>
+                        <button name="make_invoices" string="Create Invoices" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>