Merge pull request #88 from odoo-dev/master-timesheet-analysis-reports-tpa
authorThibault Delavallée <tde@openerp.com>
Tue, 17 Jun 2014 12:38:55 +0000 (14:38 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 17 Jun 2014 12:38:55 +0000 (14:38 +0200)
[IMP] hr_timesheet, hr_timesheet_sheet: merge timesheet and hr_timesheet reports; base report moved to hr_timesheet; hr_timesheet_sheet adds data to the report using inheritance.


Trivial merge