Fix merging error
Fix the "paid" method of invoices
Condionnaly displays the cancelinvoice gen button

Only displays the button if there's something to be paid
Fix default year in expenselist form
Fix labels in admin form
Fix attribute