[MERGE] lp:1001806. Courtesy of Alexis de Lattre, Akretion

bzr revid: qdp-launchpad@openerp.com-20120711105840-8sf7cm58k65ih3u0

addons/stock/wizard/stock_invoice_onshipping.py

@@ -36,7 +36,7 @@ class stock_invoice_onshipping(osv.osv_memory):
             context = {}
 
         model = context.get('active_model')
-        if not model or model != 'stock.picking':
+        if not model or 'stock.picking' not in model:
             return []
 
         model_pool = self.pool.get(model)