Merge proposals dependent on lp:~openerp-canada/openerp-canada/7.0-rename-description-to-invoice-in-report

1. 7.0-rename-description-to-invoice-in-report
2. Dependent merge proposals