Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-for-caribou-jam-sale-stock-fix-tch

1. trunk-for-caribou-jam-sale-stock-fix-tch
2. Dependent merge proposals