Merge lp:~openerp-dev/openobject-addons/trunk-bug-1049499-pja into lp:openobject-addons

Proposed by Jalpesh Patel(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1049499-pja
Merge into: lp:openobject-addons
Diff against target: 30 lines (+10/-10)
1 file modified
stock/wizard/stock_invoice_onshipping.py (+10/-10)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1049499-pja
Reviewer Review Type Date Requested Status
Atul Patel(OpenERP) (community) Approve
Review via email: mp+123940@code.launchpad.net

Description of the change

Hello
     i have fix bug create invoice using picking order policy ondelivery order.
     Revision ID: <email address hidden>
     Revision No:7424
Thanks,
pja

To post a comment you must log in.
7425. By Jalpesh Patel(OpenERP)

[IMP]improve code and fix bug

Revision history for this message
Atul Patel(OpenERP) (atp-openerp) :
review: Approve

Unmerged revisions

7425. By Jalpesh Patel(OpenERP)

[IMP]improve code and fix bug

7424. By Jalpesh Patel(OpenERP)

[Fix]fix bug create invoice using picking order policy ondelivery order

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stock/wizard/stock_invoice_onshipping.py'
2--- stock/wizard/stock_invoice_onshipping.py 2012-07-25 10:14:28 +0000
3+++ stock/wizard/stock_invoice_onshipping.py 2012-09-13 04:46:24 +0000
4@@ -134,16 +134,16 @@
5 onshipdata_obj[ids] = onshipdata_obj.new_picking
6 context['date_inv'] = onshipdata_obj[0]['invoice_date']
7 active_ids = context.get('active_ids', [])
8- active_picking = picking_pool.browse(cr, uid, context.get('active_id',False), context=context)
9- inv_type = picking_pool._get_invoice_type(active_picking)
10- context['inv_type'] = inv_type
11- if isinstance(onshipdata_obj[0]['journal_id'], tuple):
12- onshipdata_obj[0]['journal_id'] = onshipdata_obj[0]['journal_id'][0]
13- res = picking_pool.action_invoice_create(cr, uid, active_ids,
14- journal_id = onshipdata_obj[0]['journal_id'],
15- group = onshipdata_obj[0]['group'],
16- type = inv_type,
17- context=context)
18+ for active_picking in picking_pool.browse(cr, uid, context.get('active_ids',[]), context=context):
19+ inv_type = picking_pool._get_invoice_type(active_picking)
20+ context['inv_type'] = inv_type
21+ if isinstance(onshipdata_obj[0]['journal_id'], tuple):
22+ onshipdata_obj[0]['journal_id'] = onshipdata_obj[0]['journal_id'][0]
23+ res = picking_pool.action_invoice_create(cr, uid, active_ids,
24+ journal_id = onshipdata_obj[0]['journal_id'],
25+ group = onshipdata_obj[0]['group'],
26+ type = inv_type,
27+ context=context)
28 return res
29
30 stock_invoice_onshipping()

Subscribers

People subscribed via source and target branches

to all changes: