Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-improve-visibility-sale-cod

1. trunk-improve-visibility-sale-cod
2. Dependent merge proposals