← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/6.0-opw-4703-jma into lp:openobject-addons/6.0

 

JMA(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/6.0-opw-4703-jma into lp:openobject-addons/6.0.

Requested reviews:
  OpenERP Core Team (openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-4703-jma/+merge/55115
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-4703-jma/+merge/55115
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-opw-4703-jma.
=== modified file 'stock_invoice_directly/wizard/stock_invoice.py'
--- stock_invoice_directly/wizard/stock_invoice.py	2011-01-14 00:11:01 +0000
+++ stock_invoice_directly/wizard/stock_invoice.py	2011-03-28 10:16:39 +0000
@@ -37,7 +37,10 @@
             context = {}
         result = super(invoice_directly, self).do_partial(cr, uid, ids, context)
         pick_obj = self.pool.get('stock.picking')
+        context.update({'active_model':'stock.picking'})
         picking_ids = context.get('active_ids', False)
+        if picking_ids:
+            context.update({'active_id':picking_ids[0]})
         pick = pick_obj.browse(cr, uid, picking_ids, context=context)[0]
         if pick.invoice_state == '2binvoiced':
             return {
@@ -47,6 +50,7 @@
                 'res_model': 'stock.invoice.onshipping',
                 'type': 'ir.actions.act_window',
                 'target': 'new',
+                'context': context
             }
         return {'type': 'ir.actions.act_window_close'}
 


Follow ups