Merge lp:~openerp-dev/openobject-addons/trunk-bug-1049499-pja into lp:openobject-addons

[Jalpesh Patel(OpenERP)]

Hello
     i have fix bug create invoice using picking order policy ondelivery order.
     Revision ID: <email address hidden>
     Revision No:7424
Thanks,
pja

[lp:~openerp-dev/openobject-addons/trunk-bug-1049499-pja]

7425. By Jalpesh Patel(OpenERP) on 2012-09-13

[IMP]improve code and fix bug

[Atul Patel(OpenERP) (atp-openerp)]

review: Approve

Unmerged revisions

7425. By Jalpesh Patel(OpenERP) on 2012-09-13

[IMP]improve code and fix bug

7424. By Jalpesh Patel(OpenERP) on 2012-09-12

[Fix]fix bug create invoice using picking order policy ondelivery order

=== modified file 'stock/wizard/stock_invoice_onshipping.py'
--- stock/wizard/stock_invoice_onshipping.py	2012-07-25 10:14:28 +0000
+++ stock/wizard/stock_invoice_onshipping.py	2012-09-13 04:46:24 +0000
@@ -134,16 +134,16 @@
             onshipdata_obj[ids] = onshipdata_obj.new_picking
         context['date_inv'] = onshipdata_obj[0]['invoice_date']
         active_ids = context.get('active_ids', [])
-        active_picking = picking_pool.browse(cr, uid, context.get('active_id',False), context=context)
-        inv_type = picking_pool._get_invoice_type(active_picking)
-        context['inv_type'] = inv_type
-        if isinstance(onshipdata_obj[0]['journal_id'], tuple):
-            onshipdata_obj[0]['journal_id'] = onshipdata_obj[0]['journal_id'][0]
-        res = picking_pool.action_invoice_create(cr, uid, active_ids,
-              journal_id = onshipdata_obj[0]['journal_id'],
-              group = onshipdata_obj[0]['group'],
-              type = inv_type,
-              context=context)
+        for  active_picking in picking_pool.browse(cr, uid, context.get('active_ids',[]), context=context):
+            inv_type = picking_pool._get_invoice_type(active_picking)
+            context['inv_type'] = inv_type
+            if isinstance(onshipdata_obj[0]['journal_id'], tuple):
+                onshipdata_obj[0]['journal_id'] = onshipdata_obj[0]['journal_id'][0]
+            res = picking_pool.action_invoice_create(cr, uid, active_ids,
+                  journal_id = onshipdata_obj[0]['journal_id'],
+                  group = onshipdata_obj[0]['group'],
+                  type = inv_type,
+                  context=context)
         return res
 
 stock_invoice_onshipping()