openerp-dev-web team mailing list archive

["Meera Trambadia \(OpenERP\)" <mtr@xxxxxxxxxxx>]

Meera Trambadia (OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #600547 Invoice totals not updated when a line is moved (store={...} bug?)
  https://bugs.launchpad.net/bugs/600547
  #690895 copy account.move crash 
  https://bugs.launchpad.net/bugs/690895
  #694144 [6.0] sales manager dashboard - sales by month - sql query error, usabiliy
  https://bugs.launchpad.net/bugs/694144
  #695632 [RC1]Two same fields creating problem in web-client
  https://bugs.launchpad.net/bugs/695632
  #695960 [6.0RC1][hr_timesheet]Problems printing timesheet reports
  https://bugs.launchpad.net/bugs/695960
  #702805 an employee shouldn't be able to see expenses and holidays of others employee
  https://bugs.launchpad.net/bugs/702805
  #703836 [Trunk] hr_expense: Invoice button not working
  https://bugs.launchpad.net/bugs/703836
  #705766 Wrong Picked Widget in Sale Order in OpenERP v6.0.1
  https://bugs.launchpad.net/bugs/705766
  #707144 [6.0] hr_payroll 'C/D' versus 'D/C' 
  https://bugs.launchpad.net/bugs/707144
  #708603 Traceback occurs at the time of "Account" duplication.
  https://bugs.launchpad.net/bugs/708603
  #711533 v6 hr_attendance - time is rounded to hour
  https://bugs.launchpad.net/bugs/711533

For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/48443

[FIX] hr_attendance:Attendance by month report now prints minutes also" --fixes lp:711533 
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/48443
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'hr_attendance/report/attendance_by_month.py'
--- hr_attendance/report/attendance_by_month.py	2011-02-02 10:40:49 +0000
+++ hr_attendance/report/attendance_by_month.py	2011-02-03 10:30:24 +0000
@@ -85,7 +85,14 @@
                     for att in attendences:
                         dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
                         if ldt and att['action'] == 'sign_out':
-                            wh += (dt - ldt).seconds/60/60
+                            tot_tim = (str(float((dt - ldt).seconds)/3600))
+                            hrs = int(tot_tim.split('.')[0])
+                            mints = int(tot_tim.split('.')[1])
+                            tot_min = (int(mints * 60) / 10)
+                            if tot_min < (10) or tot_tim < ('0.09'):
+                                wh += float((str(hrs))+ '.' + '0' +(str(tot_min)))
+                            else:
+                                wh += float((str(hrs))+ '.' + (str(tot_min)))
                         else:
                             ldt = dt
                     # Week xml representation