[Merge] with : lp:openobject-addons