OpenERP Community Backports (Addons)

Merge lp:~therp-nl/ocb-addons/7.0-lp1083077 into lp:ocb-addons

  1. 7.0-lp1083077
  2. Merge into 7.0
Proposed by Holger Brunn (Therp)
Status: Merged
Merged at revision: 9733
Proposed branch: lp:~therp-nl/ocb-addons/7.0-lp1083077
Merge into: lp:ocb-addons
Diff against target: 11 lines (+1/-0)
1 file modified
sale_stock/sale_stock.py (+1/-0)
To merge this branch: bzr merge lp:~therp-nl/ocb-addons/7.0-lp1083077
Reviewer Review Type Date Requested Status
Raphaël Valyi - http://www.akretion.com Approve
Pedro Manuel Baeza code review Approve
Guewen Baconnier @ Camptocamp code review Approve
Review via email: mp+198062@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) :
review: Approve (code review)
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

What a tortuous way this patch has on official addons!

Thanks for bringing to OCB.

Regards.

review: Approve (code review)
Revision history for this message
Raphaël Valyi - http://www.akretion.com (rvalyi) wrote :

Just I already tried to get OpenERP include this patch 18 months ago, I approve the merge of course

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sale_stock/sale_stock.py'
2--- sale_stock/sale_stock.py 2013-11-20 16:10:51 +0000
3+++ sale_stock/sale_stock.py 2013-12-06 14:09:33 +0000
4@@ -303,6 +303,7 @@
5 or line.product_uom.id,
6 'location_id': order.shop_id.warehouse_id.lot_stock_id.id,
7 'procure_method': line.type,
8+ 'property_ids': [(6, 0, [l.id for l in line.property_ids])],
9 'move_id': move_id,
10 'company_id': order.company_id.id,
11 'note': line.name,