Merge lp:~numerigraphe-team/ocb-addons/7.0-revert-sale-properties-1291903-ls into lp:ocb-addons

[Lionel Sausin - Initiatives/Numérigraphe]

This reverts the fix for bug #1083077. It was fixed in OCB in the wrong module, and eventually fixed the right way in 7.0.
Incidentally this is the last change needed to make OCB run green on runbot : http://runbot.openerp.com/numerigraphe-team-7-0-revert-sale-properties-1291903-ls-runbot-32832/logs/
(Resubmitting because LP seems to have stalled the first time)

[Stefan Rijnhart (Opener) (stefan-opener)]

Great, thanks for picking this up!

Quite a history this one has in upstream OpenERP:
- Initial fix committed as http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/revision/9172,
- reverted in http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/revision/9175, presumably because it breaks tests like it backport did in OCB.
- The next commit moves the fix to a method override on the wrong model: http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/revision/9176
- http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/revision/9378 reintroduces the original fix
- http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/revision/9622 removes the original fix again because it breaks tests
- http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/revision/9741 moves the fix to the correct method override on sale.order model but in a module that does not depend on sale
- http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/revision/9751 correctly moves the method override to sale_mrp

For my review, I verified that OCB still propagates the properties with this change.

review: Approve (test, code review)

[Pedro Manuel Baeza (pedro.baeza)]

Thanks for the work you are doing, Lionel.

Regards.

review: Approve (code review)

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

=== modified file 'sale_stock/sale_stock.py'
--- sale_stock/sale_stock.py	2014-03-24 09:12:54 +0000
+++ sale_stock/sale_stock.py	2014-04-06 12:52:19 +0000
@@ -303,7 +303,6 @@
                     or line.product_uom.id,
             'location_id': order.shop_id.warehouse_id.lot_stock_id.id,
             'procure_method': line.type,
-            'property_ids': [(6, 0, [l.id for l in line.property_ids])],
             'move_id': move_id,
             'company_id': order.company_id.id,
             'note': line.name,