[MERGE] merged the dev3 branch

[odoo/odoo.git] / addons / hr_attendance / report / attendance_errors.py

diff --git a/addons/hr_attendance/report/attendance_errors.py b/addons/hr_attendance/report/attendance_errors.py
index 77b3b5b..29586ba 100644 (file)
--- a/addons/hr_attendance/report/attendance_errors.py
+++ b/addons/hr_attendance/report/attendance_errors.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,17 +15,17 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-
 import time
 from report import report_sxw
 import pooler
 import datetime
 
 class attendance_print(report_sxw.rml_parse):
+
     def __init__(self, cr, uid, name, context):
         super(attendance_print, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
@@ -36,28 +36,18 @@ class attendance_print(report_sxw.rml_parse):
         })
 
     def _get_employees(self, emp_ids):
-        emp_obj_list = self.pool.get('hr.employee').browse(self.cr,self.uid,emp_ids)
-        return emp_obj_list    
-        
-#    def _sign(self, dt):
-#        if abs(dt.days) > 1:
-#            format = '%d day'+(((abs(dt.days)>=2) and 's') or '')+' %H:%M:%S'
-#        else:
-#            format = '%H:%M:%S'
-#        if dt.seconds<0:
-#            return dt.strftime('- '+format)
-#        else:
-#            return dt.strftime(format)
+        emp_obj_list = self.pool.get('hr.employee').browse(self.cr, self.uid, emp_ids)
+        return emp_obj_list
+
 
     def _lst(self, employee_id, dt_from, dt_to, max, *args):
-        self.cr.execute("select name as date, create_date, action, create_date-name as delay from hr_attendance where employee_id=%s and to_char(name,'YYYY-mm-dd')<=%s and to_char(name,'YYYY-mm-dd')>=%s and action in (%s,%s) order by name", (employee_id, dt_to, dt_from, 'sign_in', 'sign_out'))
+        self.cr.execute("select name as date, create_date, action, create_date-name as delay from hr_attendance where employee_id=%s and to_char(name,'YYYY-mm-dd')<=%s and to_char(name,'YYYY-mm-dd')>=%s and action IN (%s,%s) order by name", (employee_id, dt_to, dt_from, 'sign_in', 'sign_out'))
         res = self.cr.dictfetchall()
         for r in res:
             if r['action'] == 'sign_out':
                 r['delay'] = -r['delay']
             temp = r['delay'].seconds
 
-#            r['delay'] = self._sign(r['delay'])
             r['delay'] = str(r['delay']).split('.')[0]
             if abs(temp) < max*60:
                 r['delay2'] = r['delay']
@@ -66,7 +56,7 @@ class attendance_print(report_sxw.rml_parse):
         return res
 
     def _lst_total(self, employee_id, dt_from, dt_to, max, *args):
-        self.cr.execute("select name as date, create_date, action, create_date-name as delay from hr_attendance where employee_id=%s and to_char(name,'YYYY-mm-dd')<=%s and to_char(name,'YYYY-mm-dd')>=%s and action in (%s,%s) order by name", (employee_id, dt_to, dt_from, 'sign_in', 'sign_out'))
+        self.cr.execute("select name as date, create_date, action, create_date-name as delay from hr_attendance where employee_id=%s and to_char(name,'YYYY-mm-dd')<=%s and to_char(name,'YYYY-mm-dd')>=%s and action IN (%s,%s) order by name", (employee_id, dt_to, dt_from, 'sign_in', 'sign_out'))
         res = self.cr.dictfetchall()
         if not res:
             return ('/','/')
@@ -78,16 +68,14 @@ class attendance_print(report_sxw.rml_parse):
             total += r['delay']
             if abs(r['delay'].seconds) < max*60:
                 total2 += r['delay']
-        
+
         result_dict = {
-                'total' : total and str(total).split('.')[0],
-                'total2' : total2  and  str(total2).split('.')[0]
+                'total': total and str(total).split('.')[0],
+                'total2': total2  and str(total2).split('.')[0]
                 }
-#        return (self._sign(total),total2 and self._sign(total2))
         return [result_dict]
-    
-report_sxw.report_sxw('report.hr.attendance.error', 'hr.employee', 'addons/hr_attendance/report/attendance_errors.rml',parser=attendance_print, header=2)
 
+report_sxw.report_sxw('report.hr.attendance.error', 'hr.employee', 'addons/hr_attendance/report/attendance_errors.rml', parser=attendance_print, header='internal')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: