[MERGE]:lp:~openerp-dev/openobject-addons/trunk-contract-apa-field-improvement-sgo