diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 8f05ffcd1f1..4e46240f170 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -47,6 +47,12 @@ class hr_timesheet_group(osv.osv): while todo>0: cr.execute("select hour_from,hour_to from hr_timesheet where dayofweek='%s' and tgroup_id=%s order by hour_from", (dt_from.day_of_week,id)) for (hour_from,hour_to) in cr.fetchall(): + + import math + + hour_from = '%02d:%02d' % (math.floor(abs(hour_from)),round(abs(hour_from)%1+0.01,2) * 60) + hour_to = '%02d:%02d' % (math.floor(abs(hour_to)),round(abs(hour_to)%1+0.01,2) * 60) + h1,m1 = map(int,hour_from.split(':')) h2,m2 = map(int,hour_to.split(':')) d1 = DateTime.DateTime(dt_from.year,dt_from.month,dt_from.day,h1,m1) diff --git a/addons/report_analytic_line/report_analytic_line_view.xml b/addons/report_analytic_line/report_analytic_line_view.xml index f0f2311f703..ef61bd70645 100644 --- a/addons/report_analytic_line/report_analytic_line_view.xml +++ b/addons/report_analytic_line/report_analytic_line_view.xml @@ -7,7 +7,7 @@ report.account.analytic.line.to.invoice form - +
@@ -16,7 +16,7 @@ - +