summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>2011-09-22 14:39:09 +0530
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>2011-09-22 14:39:09 +0530
commitdfdfcf2bacaf1d2d1705a4ceb015e25424dc9fd7 (patch)
tree4d38833fda73ba5ec78d5bd173be52501d567630
parent4a3d8067ef2af97d4e88a6ebf512e61ff2522583 (diff)
[IMP]stock: improement in invoice after merge
bzr revid: mma@tinyerp.com-20110922090909-wljcxwn3a5of3mgj
-rw-r--r--addons/stock/wizard/stock_invoice_onshipping.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 395758b121b..a7b2554576b 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -135,6 +135,8 @@ class stock_invoice_onshipping(osv.osv_memory):
active_picking = picking_pool.browse(cr, uid, context.get('active_id',False), context=context)
inv_type = picking_pool._get_invoice_type(active_picking)
context['inv_type'] = inv_type
+ if isinstance(onshipdata_obj[0]['journal_id'], tuple):
+ onshipdata_obj[0]['journal_id'] = onshipdata_obj[0]['journal_id'][0]
res = picking_pool.action_invoice_create(cr, uid, active_ids,
journal_id = onshipdata_obj[0]['journal_id'],
group = onshipdata_obj[0]['group'],