[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha