Merge proposals dependent on lp:~camptocamp/account-financial-report/7.0-pending-merge-20140407

1. 7.0-pending-merge-20140407
2. Dependent merge proposals