OpenERP Community Backports (Addons)

Merge lp:~alhashash/ocb-addons/7.0-alhashash-bug1179705 into lp:ocb-addons

  1. 7.0-alhashash-bug1179705
  2. Merge into 7.0
Proposed by Mohammad Alhashash
Status: Merged
Approved by: Holger Brunn (Therp)
Approved revision: no longer in the source branch.
Merged at revision: 10179
Proposed branch: lp:~alhashash/ocb-addons/7.0-alhashash-bug1179705
Merge into: lp:ocb-addons
Diff against target: 19 lines (+2/-0)
1 file modified
stock/stock.py (+2/-0)
To merge this branch: bzr merge lp:~alhashash/ocb-addons/7.0-alhashash-bug1179705
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) code review Approve
Pedro Manuel Baeza code review Approve
Yann Papouin code review Approve
Review via email: mp+217681@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Yann Papouin (yann-papouin) wrote :

LGTM, thank you.

review: Approve (code review)
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM.

Thanks.

review: Approve (code review)
Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stock/stock.py'
2--- stock/stock.py 2014-04-25 12:47:14 +0000
3+++ stock/stock.py 2014-04-29 20:27:18 +0000
4@@ -2475,6 +2475,7 @@
5 debit_line_vals = {
6 'name': move.name,
7 'product_id': move.product_id and move.product_id.id or False,
8+ 'product_uom_id': move.product_uom and move.product_uom.id or False,
9 'quantity': move.product_qty,
10 'ref': move.picking_id and move.picking_id.name or False,
11 'date': time.strftime('%Y-%m-%d'),
12@@ -2485,6 +2486,7 @@
13 credit_line_vals = {
14 'name': move.name,
15 'product_id': move.product_id and move.product_id.id or False,
16+ 'product_uom_id': move.product_uom and move.product_uom.id or False,
17 'quantity': move.product_qty,
18 'ref': move.picking_id and move.picking_id.name or False,
19 'date': time.strftime('%Y-%m-%d'),