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

[Jalpesh Patel(OpenERP)]

Hello sir,

    I have fix problem of partial picking wizard generate wrong invoice.

Thanks!
pja

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

7896. By Jalpesh Patel(OpenERP) on 2012-11-09

[IMP]improve code

[Alexis de Lattre (alexis-via)]

The code of this merge proposal works well. It fixes the bug n°1060259. Let's merge it !

[Alexis de Lattre (alexis-via)]

I was wrong in my previous comment, the code of this merge proposal doesn't work. I explained it in more details on the original bug report, see https://bugs.launchpad.net/openobject-addons/+bug/1060259

[Martin Trigaux (OpenERP) (mat-openerp)]

Hello,

As mentioned by Alexis, the proposed patch dit not work.
Instead I have made similar code but testing the state of the picking as well. This was merged in 7.0

revno: 9540 [merge]
revision-id: <email address hidden>

Unmerged revisions

7896. By Jalpesh Patel(OpenERP) on 2012-11-09

[IMP]improve code

7895. By gustavoe-cordero on 2012-10-30

[FIX] fix problem of partial picking wizard generate wrong invoice

=== modified file 'stock_invoice_directly/wizard/stock_invoice.py'
--- stock_invoice_directly/wizard/stock_invoice.py	2012-03-05 18:40:03 +0000
+++ stock_invoice_directly/wizard/stock_invoice.py	2012-11-09 09:44:58 +0000
@@ -31,8 +31,13 @@
         if context is None: context = {}
         result = super(invoice_directly, self).do_partial(cr, uid, ids, context)
         partial = self.browse(cr, uid, ids[0], context)
-        context.update(active_model='stock.picking',
-                       active_ids=[partial.picking_id.id])
+        active_ids = partial.picking_id.backorder_id.id
+        if active_ids:
+            context.update(active_model='stock.picking',
+                           active_ids=[active_ids])
+        else:
+            context.update(active_model='stock.picking',
+                           active_ids=[partial.picking_id.id])    
         if partial.picking_id.invoice_state == '2binvoiced':
             return {
                 'name': 'Create Invoice',