Odoo Addons (MOVED TO GITHUB)

Merge lp:~enlightx-deactivatedaccount/openobject-addons/7.0-bug-1129122-enlightx into lp:openobject-addons/7.0

  1. 7.0-bug-1129122-enlightx
  2. Merge into 7.0
Proposed by Davide Corio
Status: Merged
Merged at revision: 9172
Proposed branch: lp:~enlightx-deactivatedaccount/openobject-addons/7.0-bug-1129122-enlightx
Merge into: lp:openobject-addons/7.0
Diff against target: 11 lines (+1/-0)
1 file modified
sale_stock/sale_stock.py (+1/-0)
To merge this branch: bzr merge lp:~enlightx-deactivatedaccount/openobject-addons/7.0-bug-1129122-enlightx
Reviewer Review Type Date Requested Status
Martin Trigaux (OpenERP) (community) Approve
Review via email: mp+149069@code.launchpad.net

Description of the change

this fixes a regression described here:
https://bugs.launchpad.net/openobject-addons/+bug/1129122

To post a comment you must log in.
Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote :

Thanks for the patch. Integrated into addons v7
revno: 9172
revision-id: <email address hidden>

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'sale_stock/sale_stock.py'
--- sale_stock/sale_stock.py 2012-12-21 16:48:08 +0000
+++ sale_stock/sale_stock.py 2013-02-18 15:04:28 +0000
@@ -281,6 +281,7 @@
281 'move_id': move_id,281 'move_id': move_id,
282 'company_id': order.company_id.id,282 'company_id': order.company_id.id,
283 'note': line.name,283 'note': line.name,
284 'property_ids': [(6, 0, [x.id for x in line.property_ids])],
284 }285 }
285286
286 def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):287 def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):