Merge lp:~openerp-dev/openobject-addons/7.0-opw-606535-pna into lp:openobject-addons/7.0

[Pinakin Nayi (OpenERP)]

Hello Sir,

I fixed issue regarding Group invoice creation from the stock_picking_out tree view can use incorrect data.

Steps :
Go to Delivery Orders tree view (stock_picking_out)
  - Select three delivery orders (the sequence below is important)
       Delivery Order 1 with Customer A
       Delivery Order 2 with Customer B
       Delivery Order 3 with Customer A

  - Select “More dropdown” then Create Draft Invoices
       Check “Group by Partner” in popup window
       Select “Create”

PROBLEM: the invoice_vals argument is not re-evaluated when group = True, so invoice_vals still has the information from the previous picking record

Thanks,
pna

Unmerged revisions

9998. By Pinakin Nayi (OpenERP) on 2014-04-22

[FIX]stock: Group invoice creation from the stock_picking_out tree view can use incorrect data

=== modified file 'stock/stock.py'
--- stock/stock.py	2014-04-15 16:03:31 +0000
+++ stock/stock.py	2014-04-22 08:43:36 +0000
@@ -1137,13 +1137,13 @@
             if not inv_type:
                 inv_type = self._get_invoice_type(picking)
 
+            invoice_vals = self._prepare_invoice(cr, uid, picking, partner, inv_type, journal_id, context=context)
             if group and partner.id in invoices_group:
                 invoice_id = invoices_group[partner.id]
                 invoice = invoice_obj.browse(cr, uid, invoice_id)
                 invoice_vals_group = self._prepare_invoice_group(cr, uid, picking, partner, invoice, context=context)
                 invoice_obj.write(cr, uid, [invoice_id], invoice_vals_group, context=context)
             else:
-                invoice_vals = self._prepare_invoice(cr, uid, picking, partner, inv_type, journal_id, context=context)
                 invoice_id = invoice_obj.create(cr, uid, invoice_vals, context=context)
                 invoices_group[partner.id] = invoice_id
             res[picking.id] = invoice_id