Account yearly rapport edit
Merge fix