[REV] revert fix for bug #1083077 - it's been fixed in a better way upstream and this fix runs orange on Runbot
[MRG] fix Bug #1291903: sale_stock: property_ids set on procurement.order
Merge branch 'ocb-7.0' of github.com:akretion/openerp-addons into ocb-7.0