[MERGE/IMP]:lp:~openerp-dev/openobject-addons/trunk-contract-apa-improvements-dbr