diff --git a/addons/hr/__terp__.py b/addons/hr/__terp__.py
index ed6a3a34f6040985dd848b853f2edcda20c912c1..0fc937404e3cf4ba9b97409603f0b3d576712711 100644
--- a/addons/hr/__terp__.py
+++ b/addons/hr/__terp__.py
@@ -43,7 +43,6 @@
'security/hr_security.xml',
'security/ir.model.access.csv',
'hr_view.xml',
- 'hr_wizard.xml',
'hr_department_view.xml',
'process/hr_process.xml'
],
diff --git a/addons/hr/hr_wizard.xml b/addons/hr/hr_wizard.xml
deleted file mode 100644
index 8b3c3e1c619efb3221a64cebbac972df4e7af35f..0000000000000000000000000000000000000000
--- a/addons/hr/hr_wizard.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data>
-
-
- <!-- <wizard id="print_week" keyword="client_print_multi" model="hr.employee" name="hr.print_week" string="Print Timesheet by week"/>
-
- <wizard id="print_month" keyword="client_print_multi" model="hr.employee" name="hr.print_month" string="Print Timesheet by month"/> -->
-
-
-
- </data>
-</openerp>
diff --git a/addons/hr/report/__init__.py b/addons/hr/report/__init__.py
deleted file mode 100644
index d0d517002660aa3f875d8985dc2afea45ac749de..0000000000000000000000000000000000000000
--- a/addons/hr/report/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-# $Id$
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import bymonth
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr/report/bymonth.py b/addons/hr/report/bymonth.py
deleted file mode 100644
index a926db0fcd4b53e269f05edc045f5258b021378a..0000000000000000000000000000000000000000
--- a/addons/hr/report/bymonth.py
+++ /dev/null
@@ -1,163 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-# $Id$
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from mx import DateTime
-from mx.DateTime import now
-import time
-
-import netsvc
-import pooler
-
-from report.interface import report_rml
-from report.interface import toxml
-
-one_day = DateTime.RelativeDateTime(days=1)
-month2name = [0,'Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec']
-
-def hour2str(h):
- hours = int(h)
- minutes = int(round((h - hours) * 60, 0))
- return '%02dh%02d' % (hours, minutes)
-
-class report_custom(report_rml):
- def create_xml(self, cr, uid, ids, datas, context):
- service = netsvc.LocalService('object_proxy')
-
- month = DateTime.DateTime(datas['form']['year'], datas['form']['month'], 1)
-
- user_xml = ['<month>%s</month>' % month2name[month.month], '<year>%s</year>' % month.year]
-
- # Public holidays
- jf_sql = """select hol.date_from, hol.date_to from hr_holidays as hol, hr_holidays_status as stat
- where hol.holiday_status = stat.id and stat.name = 'Public holidays' """
- cr.execute(jf_sql)
- jfs = []
- jfs = [(DateTime.strptime(l['date_from'], '%Y-%m-%d %H:%M:%S'), DateTime.strptime(l['date_to'], '%Y-%m-%d %H:%M:%S')) for l in cr.dictfetchall()]
-
- for employee_id in ids:
- emp = service.execute(cr.dbname, uid, 'hr.employee', 'read', [employee_id])[0]
- stop, days_xml = False, []
- user_repr = '''
- <user>
- <name>%s</name>
- <regime>%s</regime>
- <holiday>%s</holiday>
- %%s
- </user>
- ''' % (toxml(emp['name']),emp['regime'],emp['holiday_max'])
- today, tomor = month, month + one_day
- while today.month == month.month:
- #### Work hour calculation
- sql = '''
- select action, att.name
- from hr_employee as emp inner join hr_attendance as att
- on emp.id = att.employee_id
- where att.name between '%s' and '%s' and emp.id = %s
- order by att.name
- '''
- cr.execute(sql, (today, tomor, employee_id))
- attendences = cr.dictfetchall()
- wh = 0
- if attendences and attendences[0]['action'] == 'sign_out':
- attendences.insert(0, {'name': today.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_in'})
- if attendences and attendences[-1]['action'] == 'sign_in':
- attendences.append({'name' : tomor.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_out'})
- for att in attendences:
- dt = DateTime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
- if att['action'] == 'sign_out':
- wh += (dt - ldt).hours
- ldt = dt
-
- #### Theoretical workhour calculation
- sql = '''
- select t.hour_from, t.hour_to
- from hr_timesheet as t
- inner join (hr_timesheet_group as g inner join hr_timesheet_employee_rel as rel
- on rel.tgroup_id = g.id and rel.emp_id = %s)
- on t.tgroup_id = g.id
- where dayofweek = '%s'
- and date_from = (select max(date_from)
- from hr_timesheet inner join (hr_timesheet_employee_rel
- inner join hr_timesheet_group
- on hr_timesheet_group.id = hr_timesheet_employee_rel.tgroup_id
- and hr_timesheet_employee_rel.emp_id = %s)
- on hr_timesheet.tgroup_id = hr_timesheet_group.id
- where dayofweek = '%s' and date_from <= '%s')
- order by date_from desc
- '''
- isPH = False
- for jf_start, jf_end in jfs:
- if jf_start <= today <= jf_end:
- isPH = True
- break
- if isPH:
- twh = 0
- else:
- cr.execute(sql, (emp['id'], today.day_of_week, emp['id'], today.day_of_week, today))
- ths = cr.dictfetchall()
- twh = reduce(lambda x,y:x+(DateTime.strptime(y['hour_to'], '%H:%M:%S') - DateTime.strptime(y['hour_from'], '%H:%M:%S')).hours,ths, 0)
-
- #### Holiday calculation
- hh = 0
- sql = '''
- select hol.date_from, hol.date_to, stat.name as status
- from hr_employee as emp
- inner join (hr_holidays as hol left join hr_holidays_status as stat
- on hol.holiday_status = stat.id)
- on emp.id = hol.employee_id
- where ((hol.date_from <= '%s' and hol.date_to >= '%s')
- or (hol.date_from < '%s' and hol.date_to >= '%s')
- or (hol.date_from > '%s' and hol.date_to < '%s'))
- and emp.id = %s
- order by hol.date_from
- '''
- cr.execute(sql, (today, today, tomor, tomor, today, tomor, employee_id))
- holidays = cr.dictfetchall()
- for hol in holidays:
- df = DateTime.strptime(hol['date_from'], '%Y-%m-%d %H:%M:%S')
- dt = DateTime.strptime(hol['date_to'], '%Y-%m-%d %H:%M:%S')
- if (df.year, df.month, df.day) <= (today.year, today.month, today.day) <= (dt.year, dt.month, dt.day):
- if (df.year, df.month, df.day) == (dt.year, dt.month, dt.day):
- hh += (dt - df).hours
- else:
- hh = twh
-
- # Week xml representation
- twh, wh, hh = map(hour2str, (twh, wh, hh))
- today_xml = '<day num="%s"><th>%s</th><wh>%s</wh><hh>%s</hh></day>' % ((today - month).days+1, twh, wh, hh)
- days_xml.append(today_xml)
- today, tomor = tomor, tomor + one_day
-
- user_xml.append(user_repr % '\n'.join(days_xml))
-
- xml = '''<?xml version="1.0" encoding="UTF-8" ?>
- <report>
- %s
- </report>
- ''' % '\n'.join(user_xml)
-
- return xml
-
-report_custom('report.hr.timesheet.bymonth', 'hr.employee', '', 'addons/hr/report/bymonth.xsl')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr/report/siso.xml b/addons/hr/report/siso.xml
deleted file mode 100644
index 5aab609fbe4dcd37a6fb351db2a7a5a1007f86a0..0000000000000000000000000000000000000000
--- a/addons/hr/report/siso.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<employees>
- <employee>
- <name type="field" name="name" />
- <address type="field" name="address_id.name" />
- <attendances>
- <attendance type="zoom" name="attendances">
- <date type="field" name="name" />
- <action type="field" name="action" />
- </attendance>
- </attendances>
- </employee>
-</employees>
diff --git a/addons/hr/report/siso.xsl b/addons/hr/report/siso.xsl
deleted file mode 100644
index 96cfc70c133d01cb58f4884e4666e684bba3c107..0000000000000000000000000000000000000000
--- a/addons/hr/report/siso.xsl
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format">
-
- <xsl:import href="../../custom/corporate_defaults.xsl"/>
- <xsl:import href="../../base/report/rml_template.xsl"/>
- <xsl:variable name="page_format">a4_normal</xsl:variable>
-
- <xsl:template name="stylesheet">
- <blockTableStyle id="products">
- <blockFont name="Helvetica-BoldOblique" size="12"
- start="0,0" stop="-1,0"/>
- <blockBackground colorName="yellow" start="0,0" stop="-1,0"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- </xsl:template>
-
- <xsl:template name="story">
- <xsl:apply-templates select="employees"/>
- </xsl:template>
-
- <xsl:template match="/">
- <xsl:call-template name="rml"/>
- </xsl:template>
-
- <xsl:template match="employees">
- <xsl:apply-templates select="employee"/>
- </xsl:template>
-
- <xsl:template match="employee">
- <setNextTemplate name="other_pages"/>
- <para>
- <b t="1">Name</b>:
- <i><xsl:value-of select="name"/></i>
- </para>
- <para>
- <b t="1">Address</b>:
- <i><xsl:value-of select="address"/></i>
- </para>
- <spacer length="1cm" width="2mm"/>
- <blockTable colWidths="3cm,2.5cm,2.5cm" style="products">
- <tr>
- <td>Date</td>
- <td>Action</td>
- <td>Hour</td>
- </tr>
- <xsl:apply-templates name="attendances"/>
- </blockTable>
- <setNextTemplate name="first_page"/>
- <pageBreak/>
- </xsl:template>
-
- <xsl:template match="attendance">
- <tr>
- <td>
- <xsl:value-of select="substring(date,1,10)"/>
- </td>
- <td>
- <xsl:value-of select="action"/>
- </td>
- <td>
- <xsl:value-of select="substring(date,12,5)"/>
- </td>
- </tr>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/addons/hr/wizard/__init__.py b/addons/hr/wizard/__init__.py
deleted file mode 100644
index d2537d8dbda3feba00bb90f5d83239062ebcc6d7..0000000000000000000000000000000000000000
--- a/addons/hr/wizard/__init__.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-# $Id$
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-#from print_byweek import wiz_byweek
-#from print_bymonth import wiz_bymonth
-
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr/wizard/sign_in_out.py b/addons/hr/wizard/sign_in_out.py
deleted file mode 100644
index e434aff68f9e116580df2782c6cb72ac69818d22..0000000000000000000000000000000000000000
--- a/addons/hr/wizard/sign_in_out.py
+++ /dev/null
@@ -1,182 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-# $Id$
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import netsvc
-import time
-from tools.translate import _
-
-si_so_form ='''<?xml version="1.0"?>
-<form string="Sign in / Sign out">
- <separator string="You are now ready to sign in or out of the attendance follow up" colspan="4" />
- <field name="name" readonly="True" />
- <field name="state" readonly="True" />
-</form>'''
-
-si_so_fields = {
- 'name' : {'string' : "Employee's name", 'type':'char', 'required':True, 'readonly':True},
- 'state' : {'string' : "Current state", 'type' : 'char', 'required' : True, 'readonly': True},
-}
-
-si_form = '''<?xml version="1.0" ?>
-<form string="Sign in status">
- <separator string="This is the status of your sign in request. Check it out maybe you were already signed in." colspan="4" />
- <field name="success" readonly="True" />
-</form>'''
-
-si_fields = {
- 'success' : {'string' : "Sign in's status", 'type' : 'char', 'required' : True, 'readonly' : True},
-}
-
-so_form = '''<?xml version="1.0" ?>
-<form string="Sign in status">
- <separator string="This is the status of your sign out request. Check it out maybe you were already signed out." colspan="4" />
- <field name="success" readonly="True" />
-</for>'''
-
-so_fields = {
- 'success' : {'string' : "Sign out's status", 'type' : 'char', 'required' : True, 'readonly' : True},
-}
-
-def _get_empid(self, cr, uid, data, context):
- service = netsvc.LocalService('object_proxy')
- emp_id = service.execute(cr.dbname, uid, 'hr.employee', 'search', [('user_id', '=', uid)])
- if emp_id:
- employee = service.execute(cr.dbname, uid, 'hr.employee', 'read', emp_id)[0]
- return {'name': employee['name'], 'state': employee['state'], 'emp_id': emp_id[0]}
- return {}
-
-def _sign_in(self, cr, uid, data, context):
- service = netsvc.LocalService('object_proxy')
- emp_id = data['form']['emp_id']
- if 'last_time' in data['form'] :
- if data['form']['last_time'] > time.strftime('%Y-%m-%d'):
- raise wizard.except_wizard(_('UserError'), _('The sign-out date must be in the past'))
- return {'success': False}
- service.execute(cr.dbname, uid, 'hr.attendance', 'create', {
- 'name': data['form']['last_time'],
- 'action': 'sign_out',
- 'employee_id': emp_id
- })
- try:
- success = service.execute(cr.dbname, uid, 'hr.employee', 'sign_in', [emp_id])
- except:
- raise wizard.except_wizard(_('UserError'), _('A sign-in must be right after a sign-out !'))
- return {'success': success}
-
-def _sign_out(self, cr, uid, data, context):
- service = netsvc.LocalService('object_proxy')
- emp_id = data['form']['emp_id']
- if 'last_time' in data['form'] :
- if data['form']['last_time'] > time.strftime('%Y-%m-%d'):
- raise wizard.except_wizard(_('UserError'), _('The Sign-in date must be in the past'))
- return {'success': False}
- service.execute(cr.dbname, uid, 'hr.attendance', 'create', {'name':data['form']['last_time'], 'action':'sign_in', 'employee_id':emp_id})
- try:
- success = service.execute(cr.dbname, uid, 'hr.employee', 'sign_out', [emp_id])
- except:
- raise wizard.except_wizard(_('UserError'), _('A sign-out must be right after a sign-in !'))
-
- return {'success' : success}
-
-so_ask_form ='''<?xml version="1.0"?>
-<form string="Sign in / Sign out">
- <separator string="You did not signed out the last time. Please enter the date and time you signed out." colspan="4" />
- <field name="name" readonly="True" />
- <field name="last_time" />
-</form>'''
-
-so_ask_fields = {
- 'name' : {'string' : "Employee's name", 'type':'char', 'required':True, 'readonly':True},
- 'last_time' : {'string' : "Your last sign out", 'type' : 'datetime', 'required' : True},
-}
-
-def _si_check(self, cr, uid, data, context):
- states = {True : 'si', False: 'si_ask_so'}
- service = netsvc.LocalService('object_proxy')
- emp_id = data['form']['emp_id']
- att_id = service.execute(cr.dbname, uid, 'hr.attendance', 'search', [('employee_id', '=', emp_id)], limit=1, order='name desc')
- last_att = service.execute(cr.dbname, uid, 'hr.attendance', 'read', att_id)
- if last_att:
- last_att = last_att[0]
- cond = not last_att or last_att['action'] == 'sign_out'
- return states[cond]
-
-si_ask_form ='''<?xml version="1.0"?>
-<form string="Sign in / Sign out">
- <separator string="You did not signed in the last time. Please enter the date and time you signed in." colspan="4" />
- <field name="name" readonly="True" />
- <field name="last_time" />
-</form>'''
-
-si_ask_fields = {
- 'name' : {'string' : "Employee's name", 'type':'char', 'required':True, 'readonly':True},
- 'last_time' : {'string' : "Your last sign in", 'type' : 'datetime', 'required' : True},
-}
-
-def _so_check(self, cr, uid, data, context):
- states = {True : 'so', False: 'so_ask_si'}
- service = netsvc.LocalService('object_proxy')
- emp_id = data['form']['emp_id']
- att_id = service.execute(cr.dbname, uid, 'hr.attendance', 'search', [('employee_id', '=', emp_id)], limit=1, order='name desc')
- last_att = service.execute(cr.dbname, uid, 'hr.attendance', 'read', att_id)
- if last_att:
- last_att = last_att[0]
- cond = last_att and last_att['action'] == 'sign_in'
- return states[cond]
-
-class wiz_si_so(wizard.interface):
- states = {
- 'init' : {
- 'actions' : [_get_empid],
- 'result' : {'type' : 'form', 'arch' : si_so_form, 'fields' : si_so_fields, 'state' : [('end', 'Cancel'),('si_test', 'Sign in'),('so_test', 'Sign out')] }
- },
- 'si_test' : {
- 'actions' : [],
- 'result' : {'type' : 'choice', 'next_state': _si_check}
- },
- 'si_ask_so' : {
- 'actions' : [],
- 'result' : {'type' : 'form', 'arch' : so_ask_form, 'fields' : so_ask_fields, 'state' : [('end', 'Cancel'),('si', 'Sign in') ] }
- },
- 'si' : {
- 'actions' : [_sign_in],
- 'result' : {'type' : 'state', 'state':'end'}
- },
- 'so_test' : {
- 'actions' : [],
- 'result' : {'type' : 'choice', 'next_state': _so_check }
- },
- 'so_ask_si' : {
- 'actions' : [],
- 'result' : {'type' : 'form', 'arch' : si_ask_form, 'fields' : si_ask_fields, 'state' : [('end', 'Cancel'),('so', 'Sign out')] }
- },
- 'so' : {
- 'actions' : [_sign_out],
- 'result' : {'type' : 'state', 'state':'end'}
- },
- }
-wiz_si_so('hr.si_so')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml
index 27dbe068edbdb8f4f55aeca9d01b1113f640b54c..0c9e256ae458e3a80d97768838b5968204b02e19 100644
--- a/addons/hr_attendance/hr_attendance_wizard.xml
+++ b/addons/hr_attendance/hr_attendance_wizard.xml
@@ -5,6 +5,9 @@
<wizard id="si_so" model="hr.employee" name="hr.si_so" string="Sign in / Sign out"/>
<wizard id="wizard_attendance_error" keyword="client_print_multi" model="hr.employee" name="hr.timesheet.attendance.report" string="Print Attendance Error Report"/>
+ <wizard id="print_week" keyword="client_print_multi" model="hr.employee" name="hr.print_week" string="Print Timesheet by week"/>
+ <wizard id="print_month" keyword="client_print_multi" model="hr.employee" name="hr.print_month" string="Print Timesheet by month"/>
+
<menuitem action="si_so" id="menu_si_so" parent="menu_hr_attendance" type="wizard"
groups="group_hr_attendance"/>
diff --git a/addons/hr_attendance/report/__init__.py b/addons/hr_attendance/report/__init__.py
index 28f8b1e16aa07b72170fb36e8f8242ea3340feda..84f891d3c1bdd88ec7450418c0816c5ca8cb2290 100644
--- a/addons/hr_attendance/report/__init__.py
+++ b/addons/hr_attendance/report/__init__.py
@@ -20,5 +20,7 @@
#
##############################################################################
import attendance_errors
+import bymonth
+import timesheet
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/report/bymonth.py b/addons/hr_attendance/report/bymonth.py
new file mode 100644
index 0000000000000000000000000000000000000000..bce9bd4d3ce9ecf5c0dbf9a85546caf05289c207
--- /dev/null
+++ b/addons/hr_attendance/report/bymonth.py
@@ -0,0 +1,102 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+# $Id$
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from mx import DateTime
+from mx.DateTime import now
+import time
+
+import netsvc
+import pooler
+
+from report.interface import report_rml
+from report.interface import toxml
+
+one_day = DateTime.RelativeDateTime(days=1)
+month2name = [0,'Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec']
+
+def hour2str(h):
+ hours = int(h)
+ minutes = int(round((h - hours) * 60, 0))
+ return '%02dh%02d' % (hours, minutes)
+
+class report_custom(report_rml):
+ def create_xml(self, cr, uid, ids, datas, context):
+ service = netsvc.LocalService('object_proxy')
+
+ month = DateTime.DateTime(datas['form']['year'], datas['form']['month'], 1)
+
+ user_xml = ['<month>%s</month>' % month2name[month.month], '<year>%s</year>' % month.year]
+
+ for employee_id in ids:
+ emp = service.execute(cr.dbname, uid, 'hr.employee', 'read', [employee_id])[0]
+ stop, days_xml = False, []
+ user_repr = '''
+ <user>
+ <name>%s</name>
+ %%s
+ </user>
+ ''' % (toxml(emp['name']))
+ today, tomor = month, month + one_day
+ while today.month == month.month:
+ #### Work hour calculation
+ sql = '''
+ select action, att.name
+ from hr_employee as emp inner join hr_attendance as att
+ on emp.id = att.employee_id
+ where att.name between %s and %s and emp.id = %s
+ order by att.name
+ '''
+ cr.execute(sql, (today, tomor, employee_id))
+ attendences = cr.dictfetchall()
+ wh = 0
+ # Fake sign ins/outs at week ends, to take attendances across week ends into account
+ if attendences and attendences[0]['action'] == 'sign_out':
+ attendences.insert(0, {'name': today.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_in'})
+ if attendences and attendences[-1]['action'] == 'sign_in':
+ attendences.append({'name' : tomor.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_out'})
+ # sum up the attendances' durations
+ for att in attendences:
+ dt = DateTime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
+ if att['action'] == 'sign_out':
+ wh += (dt - ldt).hours
+ ldt = dt
+
+ # Week xml representation
+ wh = hour2str(wh)
+ today_xml = '<day num="%s"><wh>%s</wh></day>' % ((today - month).days+1, wh)
+ days_xml.append(today_xml)
+ today, tomor = tomor, tomor + one_day
+
+ user_xml.append(user_repr % '\n'.join(days_xml))
+
+ xml = '''<?xml version="1.0" encoding="UTF-8" ?>
+ <report>
+ %s
+ </report>
+ ''' % '\n'.join(user_xml)
+
+ return xml
+
+report_custom('report.hr.timesheet.bymonth', 'hr.employee', '', 'addons/hr_attendance/report/bymonth.xsl')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr/report/bymonth.xsl b/addons/hr_attendance/report/bymonth.xsl
similarity index 88%
rename from addons/hr/report/bymonth.xsl
rename to addons/hr_attendance/report/bymonth.xsl
index 8d5ae74f8ccb5caae605983577ad8d9d10b00e04..133602f1558faacb89a13c2441b6a68cc3c69f0d 100644
--- a/addons/hr/report/bymonth.xsl
+++ b/addons/hr_attendance/report/bymonth.xsl
@@ -85,16 +85,8 @@
<tr>
<td>
<para style="name"><xsl:value-of select="name" /></para>
- <para style="normal"><xsl:text>By week: </xsl:text><xsl:value-of select="format-number(regime, '#.#')" /><xsl:text> h</xsl:text></para>
- <para style="normal"><xsl:text>Holidays: </xsl:text><xsl:value-of select="holiday" /></para>
</td>
</tr>
- <tr>
- <td>Theoretical</td>
- <xsl:for-each select="day">
- <td><xsl:value-of select="th" /></td>
- </xsl:for-each>
- </tr>
<tr>
<td>Worked</td>
<xsl:for-each select="day">
diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
new file mode 100644
index 0000000000000000000000000000000000000000..a3a370bcb9968feb0c1b9806af4c993a34c27069
--- /dev/null
+++ b/addons/hr_attendance/report/timesheet.py
@@ -0,0 +1,128 @@
+##############################################################################
+#
+# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
+# Fabien Pinckaers <fp@tiny.Be>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+from mx import DateTime
+from mx.DateTime import now
+
+import netsvc
+import pooler
+
+from report.interface import report_rml
+from report.interface import toxml
+
+one_week = DateTime.RelativeDateTime(days=7)
+num2day = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
+
+def to_hour(h):
+ return int(h), int(round((h - int(h)) * 60, 0))
+
+class report_custom(report_rml):
+ def create_xml(self, cr, uid, ids, datas, context):
+ service = netsvc.LocalService('object_proxy')
+
+ start_date = DateTime.strptime(datas['form']['init_date'], '%Y-%m-%d')
+ print "XXX start_date %s" % start_date
+ end_date = DateTime.strptime(datas['form']['end_date'], '%Y-%m-%d')
+ print "XXX end_date %s" % end_date
+ first_monday = start_date - DateTime.RelativeDateTime(days=start_date.day_of_week)
+ print "XXX first_monday %s" % first_monday
+ last_monday = end_date + DateTime.RelativeDateTime(days=7 - end_date.day_of_week)
+ print "XXX last_monday %s" % last_monday
+
+ if last_monday < first_monday:
+ first_monday, last_monday = last_monday, first_monday
+
+ user_xml = []
+
+ for employee_id in ids:
+ print "XXX employee_id %s" % employee_id
+ emp = service.execute(cr.dbname, uid, 'hr.employee', 'read', [employee_id], ['id', 'name'])[0]
+ monday, n_monday = first_monday, first_monday + one_week
+ stop, week_xml = False, []
+ user_repr = '''
+ <user>
+ <name>%s</name>
+ %%s
+ </user>
+ ''' % toxml(emp['name'])
+ while monday != last_monday:
+ #### Work hour calculation
+ sql = '''
+ select action, att.name
+ from hr_employee as emp inner join hr_attendance as att
+ on emp.id = att.employee_id
+ where att.name between %s and %s and emp.id = %s
+ order by att.name
+ '''
+ for idx in range(7):
+ print sql % (monday, monday + DateTime.RelativeDateTime(days=idx+1), employee_id)
+ cr.execute(sql, (monday, monday + DateTime.RelativeDateTime(days=idx+1), employee_id))
+ attendances = cr.dictfetchall()
+ print "attendances %s" %attendances
+ week_wh = {}
+ # Fake sign ins/outs at week ends, to take attendances across week ends into account
+ # XXX this is wrong for the first sign-in ever and the last sign out to this date
+ if attendances and attendances[0]['action'] == 'sign_out':
+ attendances.insert(0, {'name': monday.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_in'})
+ if attendances and attendances[-1]['action'] == 'sign_in':
+ attendances.append({'name' : n_monday.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_out'})
+ # sum up the attendances' durations
+ for att in attendances:
+ dt = DateTime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
+ if att['action'] == 'sign_out':
+ week_wh[ldt.day_of_week] = week_wh.get(ldt.day_of_week, 0) + (dt - ldt).hours
+ ldt = dt
+
+ # Week xml representation
+ week_repr = ['<week>', '<weekstart>%s</weekstart>' % monday.strftime('%Y-%m-%d'), '<weekend>%s</weekend>' % n_monday.strftime('%Y-%m-%d')]
+ for idx in range(7):
+ week_repr.append('<%s>' % num2day[idx])
+ if idx in week_wh:
+ week_repr.append('<workhours>%sh%02d</workhours>' % to_hour(week_wh[idx]))
+ week_repr.append('</%s>' % num2day[idx])
+ week_repr.append('<total>')
+ week_repr.append('<worked>%sh%02d</worked>' % to_hour(reduce(lambda x,y:x+y, week_wh.values(), 0)))
+ week_repr.append('</total>')
+ week_repr.append('</week>')
+ print "XXX week_repr %s" % week_repr
+ if len(week_repr) > 21: # 21 = minimal length of week_repr
+ week_xml.append('\n'.join(week_repr))
+
+ monday, n_monday = n_monday, n_monday + one_week
+ user_xml.append(user_repr % '\n'.join(week_xml))
+
+ xml = '''<?xml version="1.0" encoding="UTF-8" ?>
+ <report>
+ %s
+ </report>
+ ''' % '\n'.join(user_xml)
+ print "XXX xml %s" % xml
+ return self.post_process_xml_data(cr, uid, xml, context)
+
+report_custom('report.hr.timesheet.allweeks', 'hr.employee', '', 'addons/hr_attendance/report/timesheet.xsl')
+# vim:noexpandtab:tw=0
diff --git a/addons/hr_attendance/report/timesheet.xsl b/addons/hr_attendance/report/timesheet.xsl
new file mode 100644
index 0000000000000000000000000000000000000000..f815c0880fcee2a98e3b9022551cb39b39d39f0f
--- /dev/null
+++ b/addons/hr_attendance/report/timesheet.xsl
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+ <xsl:template match="/">
+ <xsl:call-template name="rml" />
+ </xsl:template>
+
+
+ <xsl:template name="rml">
+ <document filename="timesheet.pdf">
+ <template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Timesheets" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
+ <pageTemplate id="first">
+ <pageGraphics>
+ <drawRightString x="19.0cm" y="26.0cm"><xsl:value-of select="date"/></drawRightString>
+ </pageGraphics>
+ <frame id="col1" x1="2.0cm" y1="2.5cm" width="22.7cm" height="18cm"/>
+ </pageTemplate>
+ </template>
+
+ <stylesheet>
+ <blockTableStyle id="week">
+ <blockFont name="Helvetica-BoldOblique" size="12" start="0,0" stop="-1,0"/>
+ <blockBackground colorName="grey" start="0,0" stop="-1,0"/>
+ <blockTextColor colorName="red" start="-1,0" stop="-1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="grey" start="-1,0" stop="-1,-1"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ </stylesheet>
+
+ <story>
+ <xsl:call-template name="story"/>
+ </story>
+ </document>
+ </xsl:template>
+
+ <xsl:template name="story">
+ <xsl:apply-templates select="report/user"/>
+ </xsl:template>
+
+ <xsl:template match="user">
+ <para>
+ <b>Name:</b>
+ <i><xsl:value-of select="name" /></i>
+ </para>
+ <blockTable colWidths="4cm,1.5cm,1.5cm,1.5cm,1.5cm,1.5cm,1.5cm,1.5cm,1.5cm" style="week">
+ <tr>
+ <td></td>
+ <td>Mon</td>
+ <td>Tue</td>
+ <td>Wed</td>
+ <td>Thu</td>
+ <td>Fri</td>
+ <td>Sat</td>
+ <td>Sun</td>
+ <td>Tot</td>
+ </tr>
+ <xsl:for-each select="week">
+ <tr></tr>
+ <tr>
+ <td>Week:</td>
+ <td></td>
+ <td>from <xsl:value-of select="weekstart" /> to <xsl:value-of select="weekend" /></td>
+ </tr>
+ <tr>
+ <td>Worked hours</td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="Monday/workhours">
+ <xsl:value-of select="Monday/workhours" />
+ </xsl:when>
+ <xsl:otherwise>0</xsl:otherwise>
+ </xsl:choose>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="Tuesday/workhours">
+ <xsl:value-of select="Tuesday/workhours" />
+ </xsl:when>
+ <xsl:otherwise>0</xsl:otherwise>
+ </xsl:choose>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="Wednesday/workhours">
+ <xsl:value-of select="Wednesday/workhours" />
+ </xsl:when>
+ <xsl:otherwise>0</xsl:otherwise>
+ </xsl:choose>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="Thursday/workhours">
+ <xsl:value-of select="Thursday/workhours" />
+ </xsl:when>
+ <xsl:otherwise>0</xsl:otherwise>
+ </xsl:choose>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="Friday/workhours">
+ <xsl:value-of select="Friday/workhours" />
+ </xsl:when>
+ <xsl:otherwise>0</xsl:otherwise>
+ </xsl:choose>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="Saturday/workhours">
+ <xsl:value-of select="Saturday/workhours" />
+ </xsl:when>
+ <xsl:otherwise>0</xsl:otherwise>
+ </xsl:choose>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="Sunday/workhours">
+ <xsl:value-of select="Sunday/workhours" />
+ </xsl:when>
+ <xsl:otherwise>0</xsl:otherwise>
+ </xsl:choose>
+ </td>
+ <td>
+ <xsl:value-of select="total/worked" />
+ </td>
+ </tr>
+ </xsl:for-each>
+ </blockTable>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/addons/hr_attendance/wizard/__init__.py b/addons/hr_attendance/wizard/__init__.py
index 7e8f0f7f43c45d7815c82a022a2ce305b14f7ff7..f6ce627cbf9039546fc9d34199791f9eb7e162ea 100644
--- a/addons/hr_attendance/wizard/__init__.py
+++ b/addons/hr_attendance/wizard/__init__.py
@@ -21,5 +21,7 @@
##############################################################################
import sign_in_out
import print_attendance_error
+from print_byweek import wiz_byweek
+from print_bymonth import wiz_bymonth
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/wizard/print_bymonth.py b/addons/hr_attendance/wizard/print_bymonth.py
similarity index 100%
rename from addons/hr/wizard/print_bymonth.py
rename to addons/hr_attendance/wizard/print_bymonth.py
diff --git a/addons/hr/wizard/print_byweek.py b/addons/hr_attendance/wizard/print_byweek.py
similarity index 100%
rename from addons/hr/wizard/print_byweek.py
rename to addons/hr_attendance/wizard/print_byweek.py