Merge lp:~unifield-team/unifield-wm/uf-2173 into lp:unifield-wm

Proposed by jftempo
Status: Merged
Merged at revision: 1847
Proposed branch: lp:~unifield-team/unifield-wm/uf-2173
Merge into: lp:unifield-wm
Diff against target: 17 lines (+4/-3)
1 file modified
msf_doc_import/wizard/wizard_import_po.py (+4/-3)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/uf-2173
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+194464@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'msf_doc_import/wizard/wizard_import_po.py'
2--- msf_doc_import/wizard/wizard_import_po.py 2013-10-14 16:04:11 +0000
3+++ msf_doc_import/wizard/wizard_import_po.py 2013-11-08 08:52:41 +0000
4@@ -725,9 +725,10 @@
5 ('order_id', '=', po_id)], context=context)
6 new_po_line = po_line_ids[-1]
7 pol_obj.write(cr, uid, [new_po_line], {'product_qty': file_line.product_qty,
8- 'product_uom': file_line.product_uom.id,
9- 'product_id': file_line.product_id.id,
10- 'confirmed_delivery_date': file_line.confirmed_delivery_date}, context)
11+ 'product_uom': file_line.product_uom.id,
12+ 'product_id': file_line.product_id.id,
13+ 'price_unit': file_line.price_unit,
14+ 'confirmed_delivery_date': file_line.confirmed_delivery_date}, context)
15 complete_lines += 1
16 processed_lines += 1
17 percent_completed = float(processed_lines)/float(total_line_num-1)*100.0

Subscribers

People subscribed via source and target branches