[MERGE] HR
authorFabien Pinckaers <fp@openerp.com>
Sun, 21 Oct 2012 19:59:25 +0000 (21:59 +0200)
committerFabien Pinckaers <fp@openerp.com>
Sun, 21 Oct 2012 19:59:25 +0000 (21:59 +0200)
commit6c15bcce12e29fd28af4e443d9e257e1235534b5
treea8d5ece4b3e30f7de6a7038248e29e5526c92022
parentc414eab31b9fea05909a6eee4d1ff15192faa7b9
parentc25c19a4f476ce3ae161a1fada9a12ed56297451
[MERGE] HR

bzr revid: fp@openerp.com-20121021195925-sbsfni9i10r2o2bw
addons/hr_attendance/report/attendance_by_month.py
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
addons/hr_timesheet_sheet/report/timesheet_report.py