merge

bzr revid: fp@tinyerp.com-20110924102443-dgi352byfazu2rxq
2011-09-24 12:24:43 +02:00 · 2011-09-24 12:24:43 +02:00 · 5646ed0006
parent 0aecb63c24 293b815c5a
commit 5646ed0006
1 changed files with 3 additions and 3 deletions
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@ -140,7 +140,7 @@ class stock_invoice_onshipping(osv.osv_memory):
        res = picking_pool.action_invoice_create(cr, uid, active_ids,
              journal_id = onshipdata_obj[0]['journal_id'],
              group = onshipdata_obj[0]['group'],
-              type = None,
+              type = inv_type,
              context=context)
        return res