Merge lp:~openerp-dev/openobject-addons/6.0-opw-587847-pna into lp:openobject-addons/6.0

[Pinakin Nayi (OpenERP)]

Hello Sir,

I fixed issue in sale_margin.

Steps to reproduce :
--> Create a sale order
      * shipping policy: 'Invoice From The Picking'
      * two sale order lines
--> Confirm the sale order
--> Go to the delivery order and do a partial picking to create a back order
--> Now try to create a grouped invoice for the two pickings and you will get a constraint error

Thanks,
pna

Unmerged revisions

5451. By Pinakin Nayi (OpenERP) on 2013-03-13

[FIX]sale_margin:when try to create group invoice its generate constraint error

=== modified file 'sale_margin/sale_margin.py'
--- sale_margin/sale_margin.py	2012-05-23 11:42:02 +0000
+++ sale_margin/sale_margin.py	2013-03-13 11:30:34 +0000
@@ -94,6 +94,8 @@
         picking_obj = self.pool.get('stock.picking')
         res = super(stock_picking, self).action_invoice_create(cr, uid, ids, journal_id=journal_id,group=group, type=type, context=context)        
         invoice_ids = res.values()
+        if group:
+            invoice_ids = list(set(invoice_ids))
         picking_obj.write(cr, uid, ids, {'invoice_ids': [[6, 0, invoice_ids]]})
         return res