Merge lp:~openerp-commiter/openobject-addons/trunk-bug-1000063-hsa into lp:openobject-addons

[Hardik Sanchawat (OpenERP)]

Hello,

I fixed this bug lp:1000063

Thanx
-hsa

[Harry (OpenERP) (hmo-tinyerp)]

fixed in another revision.

Thanks

Unmerged revisions

6978. By Hardik Sanchawat (OpenERP) on 2012-07-04

[FIX] stock : process the stock from Incoming Shipment

=== modified file 'stock/wizard/stock_partial_picking.py'
--- stock/wizard/stock_partial_picking.py	2012-05-16 16:01:15 +0000
+++ stock/wizard/stock_partial_picking.py	2012-07-04 11:12:21 +0000
@@ -105,7 +105,7 @@
         # (already seen in previous bug where context passed was containing ir.ui.menu as active_model and the menu 
         # ID as active_id). Though this should be fixed in clients now, this place is sensitive enough to ensure the
         # consistancy of the context.
-        assert context.get('active_model') in ('stock.picking', 'stock.picking.in', 'stock.picking.out'), 'Bad context propagation'
+        assert context.get('active_model') in ('stock.picking', 'stock.picking.in', 'stock.picking.out', 'purchase.order'), 'Bad context propagation'
         picking_id, = picking_ids
         if 'picking_id' in fields:
             res.update(picking_id=picking_id)