[MERGE]:Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1