Merge lp:~camptocamp/hr-timesheet/7.0-hr_timesheet_reminder-migr into lp:~hr-core-editors/hr-timesheet/7.0

[Guewen Baconnier @ Camptocamp]

[MIGR] migration of hr_timesheet_reminder to OpenERP v7

Migration to OpenERP version 7 of the addon hr_timesheet_reminder.

 * change of license from GPLv2 to AGPLv3
 * replace openerp.tools.email_send by 'mail.mail'
 * the dates were not displayed on the report
 * migrate the views using the new layout
 * formatting and styling
 * fix bug: lp:1089390
 * fix a small issue on the nextcall of the cron which was initialized not 'tomorrow' but approximately the next day of the server date

[lp:~camptocamp/hr-timesheet/7.0-hr_timesheet_reminder-migr]

47. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-12-13

[MRG] from lp:hr-timesheet/7.0

48. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-12-13

[MIGR] set installable to True

49. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-12-13

[FIX] license in timesheet_status.rml, formatting

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

line 263: if status in ['Missing', 'Draft'] and employee.receive_timesheet_alerts
The second part of the test should be moved out to the outer loop (just after line 253) or even better to the search domain (line 243) : that way we don't make further queries for employees who don't recevie timesheet alerts (or am I missing something?)

653 + def _cron_nextcall():
654 + now = datetime.today() + timedelta(days=1)
655 + return time.strftime(
656 + DEFAULT_SERVER_DATETIME_FORMAT,
657 + now.timetuple())

1 -> I'd rename 'now' to 'tomorrow' or 'when'
2. why not use now.strftime(DEFAULT_SERVER_DATETIME_FORMAT) (or tomorrow.strftime...) instead of time.strftime(...) ?

There are probably a number of 'import time' which can be removed (pylint will tell you about unused imports)

607 + 'body_html': '<pre>%s</pre>' % message_data.message,

I expect mail clients to be fairly tolerant in what they accept, but this makes me uncomfortable.

Have you tested what happens if the user has typed in:

* html (e.g. "fill your timesheet <b>now!</b>")
* a raw text message with HTML special chars inside (e.g: "I'm very disapointed you did not fill your timesheet <:-( I'll make sure your manager is notified & takes proper action.

Best chance would be to allow the edition of the body of the message with a rich text editor. Is there such widget available in the oerp7 client ?

803 -# Author: Arnaud WÃŒst

-> Mojibake! (but you fixed it)

1638 + 'date': time.strftime('%Y-%m-%d'),
Is there not a constant defining this format?

review: Needs Information (a few suggestions from code quick read)

[lp:~camptocamp/hr-timesheet/7.0-hr_timesheet_reminder-migr]

50. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-12-13

[FIX] use a correct name for a local variable, use tomorrow.strftime instead of time.strftime, so get rid of 'import time'

51. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-12-13

[FIX] use fields.date.today() instead of time.strftime() for a default date

52. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-12-13

[IMP] use a html field instead of a text field for the message

53. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-12-13

[FIX] skip earlier the employees who do not receive the timesheet alerts, avoid unecessary computations/queries

54. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-12-13

[FIX] remove unused import

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

You are right on all the points. I fixed them in my proposal.

Some comments:

 * There is now a fields.html. I use it now for the message. As a bonus, we gain a rich editing of the reminder message (yippee, 'Please take time to complete and confirm your timesheet' in *bold*).

 * Learned the word Mojibake today :-)

 * there is a constant for '%Y-%m-%d' but there is even better for the default values of date and datetime:
   fields.date.today() and fields.datetime.now() (there is also fields.date.context_today() and fields.date.context_timestamp() converted to the client timezone)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

Yay !

<off-topic>
Mojibake (pronounce modjibaké in fr_FR) is one of these useful words I enjoy sharing :-)

For other illustrated funny / rare french words, you may want to check out http://brouillaminiscribbles.tumblr.com/
</off-topic>

review: Approve (code review, no test)

=== modified file 'hr_timesheet_reminder/__init__.py'
--- hr_timesheet_reminder/__init__.py	2011-08-12 12:53:16 +0000
+++ hr_timesheet_reminder/__init__.py	2012-12-13 17:06:20 +0000
@@ -1,32 +1,21 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Arnaud Wüst (Camptocamp)
-# Author : Guewen Baconnier (Camptocamp)
-#
-# 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.
+#    Author: Arnaud Wüst (Camptocamp)
+#    Copyright 2011-2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 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/>.
 #
 ##############################################################################
 
 
=== modified file 'hr_timesheet_reminder/__openerp__.py'
--- hr_timesheet_reminder/__openerp__.py	2012-12-13 12:20:12 +0000
+++ hr_timesheet_reminder/__openerp__.py	2012-12-13 17:06:20 +0000
@@ -1,54 +1,52 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Arnaud Wüst (Camptocamp)
-# Author : Nicolas Bessi (Camptocamp)
-# Author : Guewen Baconnier (Camptocamp)
-#
-# 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.
+#    Author: Arnaud Wüst (Camptocamp)
+#    Author: Nicolas Bessi (Camptocamp)
+#    Author: Guewen Baconnier (Camptocamp) (port to v7)
+#    Copyright 2011-2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 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/>.
 #
 ##############################################################################
 
-
 {
-    "name" : "Timesheet Reminder",
-    "version" : "2.0",
-    "author" : "Camptocamp",
-    "category" : "",
-    "website" : "http://www.camptocamp.com",
+    "name": "Timesheet Reminder",
+    "version": "2.0",
+    "author": "Camptocamp",
+    "license": 'AGPL-3',
+    "category": "",
+    "website": "http://www.camptocamp.com",
     "description": """
-Timesheet Reports Module:
-    * Add a menu in Human Resources / Configuration / Timesheet Reminder. It allows to send automatic emails to those who did not complete their timesheet in the last 5 weeks.
-    * Per employee, you can choose to send the reminder or not.
-    * Add a report in Human Resources / Reporting / Timesheet / Timesheet Status which displays the state of the last 5 timesheets for all users per company.
-
-This module replaces the modules c2c_timesheet_reports in TinyERP 4 and OpenERP 5.
+Timesheet Reports Module
+========================
+
+ * Add a menu in `Human Resources / Configuration
+   / Timesheet Reminder`.
+   It allows to send automatic emails to those who did
+   not complete their timesheet in the last 5 weeks.
+ * Per employee, you can choose to send the reminder or not.
+ * Add a report in `Human Resources / Reporting / Timesheet
+   / Timesheet Status` which displays the state of the last
+   5 timesheets for all users per company.
+
+This module replaces the modules c2c_timesheet_reports
+of TinyERP 4 and OpenERP 5.
     """,
-    "depends" : ["hr_timesheet_sheet"],
-    "init_xml" : [],
-    "update_xml" : [
+    "depends": ["hr_timesheet_sheet"],
+    "init_xml": [],
+    "update_xml": [
         'security/ir.model.access.csv',
         'wizard/reminder_config_view.xml',
         'wizard/reminder_status_view.xml',
@@ -56,5 +54,5 @@
         'timesheet_report.xml',
     ],
     "active": False,
-    'installable': False
+    'installable': True
 }
 
=== modified file 'hr_timesheet_reminder/company.py'
--- hr_timesheet_reminder/company.py	2011-09-01 13:44:19 +0000
+++ hr_timesheet_reminder/company.py	2012-12-13 17:06:20 +0000
@@ -1,57 +1,50 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Arnaud Wüst (Camptocamp)
-# Author : Guewen Baconnier (Camptocamp)
-#
-# 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.
+#    Author: Arnaud Wüst (Camptocamp)
+#    Author: Guewen Baconnier (Camptocamp)
+#    Copyright 2011-2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 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/>.
 #
 ##############################################################################
 
-
-from datetime import date, datetime
-from dateutil.relativedelta import *
-from osv import fields, osv
-from tools.translate import _
-
-
-class res_company(osv.osv):
+from datetime import datetime
+from dateutil.relativedelta import relativedelta, MO, SU
+from openerp.osv import osv, orm
+from openerp.tools.translate import _
+
+
+class res_company(orm.Model):
     _inherit = 'res.company'
 
     def get_reminder_recipients(self, cr, uid, ids, context=None):
         """Return the list of users that must receive the email"""
-        res = {}.fromkeys(ids, [])
+        res = dict((company_id, []) for company_id in ids)
+
         employee_obj = self.pool.get('hr.employee')
 
-        companies = self.browse(cr, uid, ids, context=context)
-
-        for company in companies:
-            employee_ids = employee_obj.search(cr, uid,
-                                [('company_id', '=', company.id),
-                                 ('active', '=', True)],
-                                context=context)
+        for company in self.browse(cr, uid, ids, context=context):
+            employee_ids = employee_obj.search(
+                    cr, uid,
+                    [('company_id', '=', company.id),
+                     ('receive_timesheet_alerts', '=', True)],
+                    context=context)
+
+            if not employee_ids:
+                continue
+
             employees = employee_obj.browse(cr, uid, employee_ids, context=context)
 
             #periods
@@ -62,24 +55,26 @@
             # for each employee
             for employee in employees:
                 # is timesheet for a period not confirmed ?
-                for p_index in range(len(periods)):
-                    period = periods[p_index]
+                for period in periods:
                     status = employee_obj.compute_timesheet_status(cr, uid, employee.id, period, context)
 
                     # if there is a missing sheet or a draft sheet
                     # and the user can receive alerts
                     # then we must alert the user
-                    if status in ['Missing', 'Draft'] and employee.receive_timesheet_alerts:
+                    if status in ['Missing', 'Draft']:
                         res[company.id].append(employee)
-                        break  # no need to go further for this user, he is now added in the list, go to the next one
+                        # no need to go further for this user,
+                        # he is now added in the list, go to the next one
+                        break
         return res
 
     def compute_timesheet_periods(self, cr, uid, company, date, periods_number=5, context=None):
         """ return the timeranges to display. This is the 5 last timesheets"""
         periods = []
-        last_start_date, last_end_date = self.get_last_period_dates(cr, uid, company, date, context=context)
+        last_start_date, last_end_date = self.get_last_period_dates(
+                cr, uid, company, date, context=context)
         for cpt in range(periods_number):
-            #find the delta between last_XXX_date to XXX_date
+            # find the delta between last_XXX_date to XXX_date
             if company.timesheet_range == 'month':
                 delta = relativedelta(months=-cpt)
             elif company.timesheet_range == 'week':
@@ -87,7 +82,9 @@
             elif company.timesheet_range == 'year':
                 delta = relativedelta(years=-cpt)
             else:
-                raise osv.except_osv(_('Error'), _('Unknow timesheet range: %s') % (company.timesheet_range,))
+                raise osv.except_osv(
+                        _('Error'),
+                        _('Unknow timesheet range: %s') % company.timesheet_range)
 
             start_date = last_start_date + delta
             end_date = last_end_date + delta
@@ -97,26 +94,22 @@
 
     def get_last_period_dates(self, cr, uid, company, date, context=None):
         """ return the start date and end date of the last period to display """
-        
+
         # return the first day and last day of the month
         if company.timesheet_range == 'month':
             start_date = date
-            end_date = start_date + relativedelta(months = +1)
+            end_date = start_date + relativedelta(months=+1)
 
         #return the first and last days of the week
         elif company.timesheet_range == 'week':
             # get monday of current week
             start_date = date + relativedelta(weekday=MO(-1))
-            # get sunday of current week 
+            # get sunday of current week
             end_date = date + relativedelta(weekday=SU(+1))
 
         # return the first and last days of the year
         else:
-            start_date = datetime(date.year, 1, 1) 
+            start_date = datetime(date.year, 1, 1)
             end_date = datetime(date.year, 12, 31)
 
-
         return start_date, end_date
-
-
-res_company()
 
=== modified file 'hr_timesheet_reminder/hr_employee.py'
--- hr_timesheet_reminder/hr_employee.py	2011-09-01 13:44:19 +0000
+++ hr_timesheet_reminder/hr_employee.py	2012-12-13 17:06:20 +0000
@@ -1,47 +1,38 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Arnaud Wüst (Camptocamp)
-# Author : Guewen Baconnier (Camptocamp)
-#
-# 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.
+#    Author: Arnaud Wüst (Camptocamp)
+#    Author: Guewen Baconnier (Camptocamp) (port to v7)
+#    Copyright 2011-2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 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/>.
 #
 ##############################################################################
-from datetime import *
-
-from osv import fields, osv
-
-
-class hr_employee(osv.osv):
+
+from openerp.osv import fields, orm
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
+
+
+class hr_employee(orm.Model):
     _inherit = 'hr.employee'
+
     _columns = {
-            'receive_timesheet_alerts': fields.boolean('Receive Timesheet Alerts'),
+        'receive_timesheet_alerts': fields.boolean('Receive Timesheet Alerts'),
     }
 
     _defaults = {
-            'receive_timesheet_alerts': lambda *a: True,
+        'receive_timesheet_alerts': True,
     }
 
     def compute_timesheet_status(self, cr, uid, ids, period, context):
@@ -50,35 +41,33 @@
         status = 'Error'
 
         if isinstance(ids, list):
+            assert len(ids) == 1, "Only 1 ID expected"
             ids = ids[0]
 
         employee = self.browse(cr, uid, ids, context=context)
 
-        time_from = period[0]
-        time_to = period[1]
-        
-        # does the timesheet exsists in db and what is its status?
-        timeformat = "%Y-%m-%d"
-        str_date_from = time_from.strftime(timeformat)
-        str_date_to = time_to.strftime(timeformat)
-
-        cr.execute("""SELECT state, date_from, date_to
-                   FROM hr_timesheet_sheet_sheet
-                   WHERE employee_id = %s
-                   AND date_from >= %s
-                   AND date_to <= %s""",
+        time_from, time_to = period
+
+        # does the timesheet exists in db and what is its status?
+        str_date_from = time_from.strftime(DEFAULT_SERVER_DATE_FORMAT)
+        str_date_to = time_to.strftime(DEFAULT_SERVER_DATE_FORMAT)
+
+        cr.execute(
+            """SELECT state, date_from, date_to
+               FROM hr_timesheet_sheet_sheet
+               WHERE employee_id = %s
+               AND date_from >= %s
+               AND date_to <= %s""",
             (employee.id, str_date_from, str_date_to))
         sheets = cr.dictfetchall()
 
-        #the timesheet does not exists in db
+        # the timesheet does not exists in db
         if not sheets:
             status = 'Missing'
 
-        if len(sheets) > 0:
+        else:
             status = 'Confirmed'
-            for s in sheets:
-                if s['state'] == 'draft':
+            for sheet in sheets:
+                if sheet['state'] == 'draft':
                     status = 'Draft'
         return status
-
-hr_employee()
 
=== modified file 'hr_timesheet_reminder/hr_employee_view.xml'
--- hr_timesheet_reminder/hr_employee_view.xml	2011-08-12 12:53:16 +0000
+++ hr_timesheet_reminder/hr_employee_view.xml	2012-12-13 17:06:20 +0000
@@ -5,7 +5,6 @@
             <field name="name">hr.timesheet.employee.rmnd_form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_employee_extd_form"/>
             <field name="model">hr.employee</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="journal_id" widget="selection" position="after">
                     <field name="receive_timesheet_alerts"/>
 
=== modified file 'hr_timesheet_reminder/reminder.py'
--- hr_timesheet_reminder/reminder.py	2011-09-01 13:44:19 +0000
+++ hr_timesheet_reminder/reminder.py	2012-12-13 17:06:20 +0000
@@ -1,157 +1,170 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Arnaud Wüst (Camptocamp)
-# Author : Guewen Baconnier (Camptocamp)
-#
-# 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.
+#    Author: Arnaud Wüst (Camptocamp)
+#    Author: Guewen Baconnier (Camptocamp) (port to v7)
+#    Copyright 2011-2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 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/>.
 #
 ##############################################################################
 
-import tools
-import time
-
 from datetime import datetime, timedelta
-from osv import fields, osv
-from tools.translate import _
-
-class reminder(osv.osv):
+from openerp.osv import fields, orm
+from openerp.tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+
+
+class reminder(orm.Model):
     _name = "hr.timesheet.reminder"
     _description = "Handle the scheduling of timesheet reminders"
 
     _columns = {
-            'reply_to': fields.char('Reply To', size=100),
-            'message': fields.text('Message'),
-            'subject': fields.char('Subject', size=200),
+            'reply_to': fields.char('Reply To'),
+            'message': fields.html('Message'),
+            'subject': fields.char('Subject'),
     }
 
-    #default cron (the one created if missing)
+    # default cron (the one created if missing)
     cron = {'active': False,
             'priority': 1,
             'interval_number': 1,
             'interval_type': 'weeks',
-            'nextcall': time.strftime("%Y-%m-%d %H:%M:%S",
-                                      (datetime.today()
-                                       + timedelta(days=1)).timetuple()),  # tomorrow same time
+            'nextcall': False,  # to set on the creation of the cron
             'numbercall': -1,
-            'doall': True,
+            'doall': False,
             'model': 'hr.timesheet.reminder',
             'function': 'run',
             'args': '()',
             }
 
-    #default message (the one created if missing)
+    # default message (the one created if missing)
     message = {'reply_to': '[e-mail]'}
 
     def run(self, cr, uid, context=None):
         """ find the reminder recipients and send them an email """
-        context = context or {}
-
         company_obj = self.pool.get('res.company')
-        #get all companies
+        # get all companies
         company_ids = company_obj.search(cr, uid, [], context=context)
 
-        #for each company, get all recipients
+        # for each company, get all recipients
         recipients = []
-        company_recipients = company_obj.get_reminder_recipients(cr, uid, company_ids, context=context)
-        for company_id, rec in company_recipients.iteritems():
+        company_recipients = company_obj.get_reminder_recipients(
+                cr, uid, company_ids, context=context)
+        for rec in company_recipients.itervalues():
             recipients += rec
 
-        #get the message to send
+        # get the message to send
         message_id = self.get_message_id(cr, uid, context)
         message_data = self.browse(cr, uid, message_id, context=context)
 
-        #send them email if they have an email defined
-        emails = []
+        # send them email if they have an email defined
         for employee in recipients:
-            if employee.work_email:
-                emails.append(employee.work_email)
-
-        if emails:
-            tools.email_send(message_data.reply_to, [], message_data.subject, message_data.message, email_bcc=emails)
-
-    def get_cron_id(self, cr, uid, context):
+            if not employee.work_email:
+                continue
+            vals = {
+                'state': 'outgoing',
+                'subject': message_data.subject,
+                'body_html': message_data.message,
+                'email_to': employee.work_email,
+                'email_from': message_data.reply_to,
+            }
+            self.pool.get('mail.mail').create(cr, uid, vals, context=context)
+
+        return True
+
+    def get_cron_id(self, cr, uid, context=None):
         """return the reminder cron's id. Create one if the cron does not exists """
+        if context is None:
+            context = {}
         cron_obj = self.pool.get('ir.cron')
         # find the cron that send messages
-        cron_id = cron_obj.search(cr, uid,  [('function', 'ilike', self.cron['function']),
-                                             ('model', 'ilike', self.cron['model'])],
-                                  context={'active_test': False})
-        if cron_id:
-            cron_id = cron_id[0]
+        ctx = dict(context, active_test=False)
+        cron_ids = cron_obj.search(
+                cr, uid,
+                [('function', 'ilike', self.cron['function']),
+                 ('model', 'ilike', self.cron['model'])],
+                context=ctx)
+
+        cron_id = None
+        if cron_ids:
+            cron_id = cron_ids[0]
 
         # the cron does not exists
-        if not cron_id:
-            self.cron['name'] = _('timesheet status reminder')
-            cron_id = cron_obj.create(cr, uid, self.cron, context)
+        if cron_id is None:
+            vals = dict(self.cron,
+                        name=_('timesheet status reminder'),
+                        nextcall=self._cron_nextcall())
+
+            cron_id = cron_obj.create(cr, uid, vals, context=context)
 
         return cron_id
 
-    def get_message_id(self, cr, uid, context):
-        """ return the message'id. create one if the message does not exists """
+    @staticmethod
+    def _cron_nextcall():
+        tomorrow = datetime.today() + timedelta(days=1)
+        return tomorrow.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+
+    def get_message_id(self, cr, uid, context=None):
+        """ return the message's id. create one if the message does not exists """
         #there is only one line in db, let's get it
-        message_id = self.search(cr, uid, [], limit=1, context=context)
+        message_ids = self.search(cr, uid, [], limit=1, context=context)
 
-        if message_id:
-            message_id = message_id[0]
+        message_id = None
+        if message_ids:
+            message_id = message_ids[0]
 
         #the message does not exists
-        if not message_id:
-            #translate
-            self.message['subject'] = _('Timesheet Reminder')
-            self.message['message'] = _('At least one of your last timesheets is still in draft or is missing. Please take time to complete and confirm it.')
+        if message_id is None:
+            vals = dict(self.message,
+                        subject=_('Timesheet Reminder'),
+                        message=_(
+                            'At least one of your last timesheets is still '
+                            'in draft or is missing. Please take time to '
+                            'complete and confirm it.'))
 
-            message_id = self.create(cr, uid, self.message, context)
+            message_id = self.create(cr, uid, vals, context)
 
         return message_id
 
-    def get_config(self, cr, uid, context):
+    def get_config(self, cr, uid, context=None):
         """return the reminder config from the db """
 
         cron_id = self.get_cron_id(cr, uid, context)
 
-        cron_data = self.pool.get('ir.cron').browse(cr, uid, cron_id)
+        cron_data = self.pool.get('ir.cron').browse(
+                cr, uid, cron_id, context=context)
 
-        #there is only one line in db, let's get it
-        message_id = self.get_message_id(cr, uid, context)
-        message_data = self.browse(cr, uid, message_id)
+        # there is only one line in db, let's get it
+        message_id = self.get_message_id(cr, uid, context=context)
+        message_data = self.browse(cr, uid, message_id, context=context)
         return {'reminder_active': cron_data.active,
                 'interval_type': cron_data.interval_type,
                 'interval_number': cron_data.interval_number,
                 'reply_to': message_data.reply_to,
                 'message':  message_data.message,
                 'subject': message_data.subject,
-                'nextcall': cron_data.nextcall,
+                'nextcall': self._cron_nextcall(),
                }
 
-    def save_config(self, cr, uid, ids, datas, context):
+    def save_config(self, cr, uid, ids, datas, context=None):
         """save the reminder config """
 
         #modify the cron
-        cron_id = self.get_cron_id(cr, uid, context)
-        self.pool.get('ir.cron').write(cr, uid, [cron_id],
+        cron_id = self.get_cron_id(cr, uid, context=context)
+        self.pool.get('ir.cron').write(
+                cr, uid, [cron_id],
                 {'active': datas['reminder_active'],
                  'interval_number': datas['interval_number'],
                  'interval_type': datas['interval_type'],
@@ -159,11 +172,10 @@
                  context=context)
         #modify the message
         message_id = ids or self.get_message_id(cr, uid, context)
-        self.write(cr, uid, [message_id],
+        self.write(
+                cr, uid, [message_id],
                 {'reply_to': datas['reply_to'],
                  'message': datas['message'],
                  'subject': datas['subject'],
                 }, context=context)
         return True
-
-reminder()
 
=== modified file 'hr_timesheet_reminder/report/__init__.py'
--- hr_timesheet_reminder/report/__init__.py	2011-08-12 12:53:16 +0000
+++ hr_timesheet_reminder/report/__init__.py	2012-12-13 17:06:20 +0000
@@ -1,31 +1,22 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) Camptocamp SA
-# Author: Arnaud WÃŒst
-#
-#
-#
-# 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.
+#    Author: Arnaud Wüst (Camptocamp)
+#    Copyright 2011-2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 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/>.
 #
 ##############################################################################
+
 import timesheet_status
 
=== modified file 'hr_timesheet_reminder/report/timesheet_status.py'
--- hr_timesheet_reminder/report/timesheet_status.py	2011-09-01 13:44:19 +0000
+++ hr_timesheet_reminder/report/timesheet_status.py	2012-12-13 17:06:20 +0000
@@ -1,47 +1,40 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) Camptocamp SA
-# Author: Arnaud WÃŒst
-# Author: Guewen Baconnier
-#
-#
-#
-# 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.
+#    Author: Arnaud Wüst (Camptocamp)
+#    Author: Guewen Baconnier (Camptocamp) (port to v7)
+#    Copyright 2011-2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 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/>.
 #
 ##############################################################################
 
 import time
 
 from datetime import datetime
-from report import report_sxw
+from openerp.report import report_sxw
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
+from openerp.tools.translate import _
 
 
 class timesheet_status(report_sxw.rml_parse):
     _name = 'report.timesheet.reminder.status'
 
-    def __init__(self, cr, uid, name, context):
-        super(timesheet_status, self).__init__(cr, uid, name, context)
+    def __init__(self, cr, uid, name, context=None):
+        super(timesheet_status, self).__init__(cr, uid, name, context=context)
         self.data = {}
+        self.end_date = None
         self.localcontext.update({
             'compute': self.compute,
             'time': time,
@@ -60,64 +53,65 @@
         """compute all datas and do all the calculations before to start the rml rendering
            - objects are companies
         """
-        #init the data array
+        # init the data array
         self.data = {}
         for o in objects:
             self.data[o.id] = {}
-        #get the list of employees ids to treat
+        # get the list of employees ids to treat
         for o in objects:
             self.data[o.id]['employees'] = self._compute_employees_list(o)
 
-        #get the time range for each company
+        # get the time range for each company
+        end_date = datetime.strptime(self.end_date, DEFAULT_SERVER_DATE_FORMAT)
         for o in objects:
-            self.data[o.id]['time_ranges'] = \
-            self._compute_periods(o, datetime.strptime(self.end_date, "%Y-%m-%d"))
+            self.data[o.id]['time_ranges'] = self._compute_periods(o, end_date)
 
-        #get the status of each timesheet for each employee
+        # get the status of each timesheet for each employee
         for o in objects:
             self.data[o.id]['sheet_status'] = self._compute_all_status(o)
 
     def _compute_employees_list(self, company):
-        """ return a dictionnary of lists of employees ids linked to the companies (param company) """
+        """ return a dictionnary of lists of employees ids linked
+        to the companies (param company) """
         employee_obj = self.pool.get('hr.employee')
         employee_ids = employee_obj.search(self.cr, self.uid,
                                            [('company_id', '=', company.id),
                                             ('active', '=', True)],
                                            context=self.localcontext)
-        return employee_obj.browse(self.cr, self.uid, employee_ids, context=self.localcontext)
+        return employee_obj.browse(
+                self.cr, self.uid, employee_ids, context=self.localcontext)
 
     def _get_last_period_dates(self, company, date):
         """ return the start date of the last period to display """
-        return self.pool.get('res.company').\
-        get_last_period_dates(self.cr, self.uid, company, date, context=self.localcontext)
+        return self.pool.get('res.company').get_last_period_dates(
+                    self.cr,
+                    self.uid,
+                    company,
+                    date,
+                    context=self.localcontext)
 
     def _compute_periods(self, company, date):
         """ return the timeranges to display. This is the 5 last timesheets """
-        return self.pool.get('res.company').\
-        compute_timesheet_periods(self.cr, self.uid, company, date, context=self.localcontext)
+        return self.pool.get('res.company').compute_timesheet_periods(
+                self.cr,
+                self.uid,
+                company,
+                date,
+                context=self.localcontext)
 
     def get_title(self, obj):
         """ return the title of the main table """
-        last_id = len(self.data[obj.id]['time_ranges']) - 1
-        start_date = time.strptime(str(self.data[obj.id]['time_ranges'][last_id][0]),
-                                   "%Y-%m-%d %H:%M:%S")
-        start_date = time.strftime("%d.%m.%Y", start_date)
-
-        end_date = time.strptime(str(self.data[obj.id]['time_ranges'][0][1]),
-                                 "%Y-%m-%d %H:%M:%S")
-        end_date = time.strftime("%d.%m.%Y", end_date)
-
-        return obj.name + ", " + start_date + " to " + end_date
+        timerange = self.data[obj.id]['time_ranges']
+        start_date = self.formatLang(timerange[-1][0], date=True)
+        end_date = self.formatLang(timerange[0][1], date=True)
+
+        return obj.name + ", " + start_date + _(" to ") + end_date
 
     def get_timerange_title(self, obj, cpt):
         """ return a header text for a periods column """
-        start_date = self.data[obj.id]['time_ranges'][cpt][0]
-        start_date = time.strptime(str(start_date), "%Y-%m-%d %H:%M:%S")
-        start_date = time.strftime("%d.%m.%Y", start_date)
-
-        end_date = self.data[obj.id]['time_ranges'][cpt][1]
-        end_date = time.strptime(str(end_date), "%Y-%m-%d %H:%M:%S")
-        end_date = time.strftime("%d.%m.%Y", end_date)
+        timerange = self.data[obj.id]['time_ranges'][cpt]
+        start_date = self.formatLang(timerange[0], date=True)
+        end_date = self.formatLang(timerange[1], date=True)
 
         return start_date + "\n " + end_date
 
@@ -131,21 +125,25 @@
 
     def _compute_timesheet_status(self, employee_id, period):
         """ return the timesheet status for a user and a period """
-        return self.pool.get('hr.employee').\
-        compute_timesheet_status(self.cr, self.uid, employee_id, period, context=self.localcontext)
+        return self.pool.get('hr.employee').compute_timesheet_status(
+                self.cr,
+                self.uid,
+                employee_id,
+                period,
+                context=self.localcontext)
 
-    def _compute_all_status(self, o):
+    def _compute_all_status(self, obj):
         """ compute all status for all employees for all periods """
         result = {}
 
         #for each periods
-        for p_index in range(len(self.data[o.id]['time_ranges'])):
+        for p_index, period in enumerate(self.data[obj.id]['time_ranges']):
             result[p_index] = {}
-            period = self.data[o.id]['time_ranges'][p_index]
             #for each employees
-            for employee in self.data[o.id]['employees']:
+            for employee in self.data[obj.id]['employees']:
                 #compute the status
-                result[p_index][employee.id] = self._compute_timesheet_status(employee.id, period)
+                result[p_index][employee.id] = self._compute_timesheet_status(
+                        employee.id, period)
 
         return result
 
 
=== modified file 'hr_timesheet_reminder/report/timesheet_status.rml'
--- hr_timesheet_reminder/report/timesheet_status.rml	2011-08-12 12:53:16 +0000
+++ hr_timesheet_reminder/report/timesheet_status.rml	2012-12-13 17:06:20 +0000
@@ -1,165 +1,159 @@
 <?xml version="1.0"?>
 <document filename="timesheet_status.pdf">
-##############################################################################
-#
-# Copyright (c) Camptocamp SA
-# Author: Arnaud Wüst
-#
-#
-# 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.
-#
-##############################################################################
-
-   <!-- Process all datas -->
-   <template pageSize="(21cm,29.7cm)" title="Timesheet Status" author="Camptocamp" allowSplitting="20">
-      
-     
-	    <!-- PAGE: template of all pages (= all pages except first and last if defined)-->    
-	    <pageTemplate id="all">
-		    <pageGraphics>
-				<setFont name="Helvetica-Bold" size="9"/>
-	
-				<!--Header-->
-				<drawString x="1.2cm" y="28.1cm">[[ company.name ]]</drawString>
-				<drawString x="17.0cm" y="28.1cm">Timesheet Status</drawString>
-
-			    <lineMode width="0.7"/>
-				<lines>1.2cm 28.0cm 19.8cm 28.0cm</lines>
-				
-				<!-- Footer -->
-				<setFont name="Helvetica" size="9"/>
-				<drawString x="1.2cm" y="1.3cm"> [[ time.strftime("%m-%d-%y %H:%M", time.localtime()) ]]</drawString>
-				<drawString x="18.8cm" y="1.3cm">Page <pageNumber/></drawString>
-	
-		    </pageGraphics>
-	        <frame id="all" x1="1.2cm" y1="1.7cm" width="18.6cm" height="25.8cm"/>
-	    </pageTemplate>
-    
-	</template>
-  	<stylesheet>
-
-	    <!--TABLE: standard table type "columns" (which means there is a title, a header of fields names and then lines of values) -->    	
-	    <blockTableStyle id="std">
-	      <blockAlignment value="LEFT"/>
-	      <blockValign value="TOP"/>
-	      <blockBottomPadding length="4"/>
-		  <blockFont name="Helvetica" size="9" start="0,0" stop="-1,-1"/>
-	
-	      <!-- first line: table name, fake as it was only one cell. grey bg -->
-	      <lineStyle kind="BOX" colorName="black" start="0,0" stop="-1,0"/>
-	      <blockBackground colorName="#cccccc" start="0,0" stop="-1,0"/>
-	      <blockFont name="Helvetica" size="9" start="0,0" stop="-1,0"/>
-	      <!-- second line: header of columns -->
-	      <lineStyle kind="GRID" colorName="black" start="0,1" stop="-1,1"/>
-	      <blockFont name="Helvetica-Oblique" start="0,1" stop="-1,1"/>
-	      <!-- next lines: light grey lines, strong black columns separator, reduce padding to write more data in cells  -->
-	      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>	    
-	      <lineStyle kind="LINEAFTER" colorName="black" start="0,2" stop="-1,-1"/>
-	      <!-- last line: line below -->
-	      <lineStyle kind="OUTLINE" colorName="black" start="0,0" stop="-1,-1"/>
-	      <!-- all columns centered except the first two (1 system columns + employee) -->
-	      <blockAlignment value="CENTER" start="2,1" stop="-1,-1" />
-	      
-	    </blockTableStyle>
-
-		<!-- default para in tables -->
-		<paraStyle name="std"
-			fontName="Helvetica" 
-			fontSize="9"
-			alignment="LEFT"
-			/>
-			
-		<paraStyle name="Confirmed"
-			fontName="Helvetica"
-			fontSize="9"
-			alignment="CENTER"
-			backColor="green"
-			textColor="white"
-			/>
-
-		<paraStyle name="Missing"
-			fontName="Helvetica"
-			fontSize="9"
-			alignment="CENTER"
-			backColor="red"
-			textColor="white"
-			/>
-
-		<paraStyle name="Draft"
-			fontName="Helvetica"
-			fontSize="9"
-			alignment="CENTER"
-			backColor="orange"
-			textColor="black"
-			/>
-
-		<paraStyle name="Error"
-			fontName="Helvetica"
-			fontSize="9"
-			alignment="CENTER"
-			textColor="red"
-			/>
-
-		<paraStyle name="Not in Company"
-			fontName="Helvetica"
-			fontSize="9"
-			alignment="CENTER"
-			textColor="lightgrey"
-			/>
-
-  	
-  	</stylesheet>
-  
-  <story>  
-  	
-    [[repeatIn(objects, 'o')]]
-    <blockTable style="std" repeatRows="2" colWidths="0,5cm,2.7cm,2.7cm,2.7cm,2.7cm,2.7cm" >
-
-      <tr>     
-        <td/>
-        <td>[[get_title(o)]]</td>
-      </tr>
-
-      <tr>
-        <td/>
-        <td>Employees</td>
-      	<td>[[ get_timerange_title(o, 4) ]]</td>
-      	<td>[[ get_timerange_title(o, 3) ]]</td>
-      	<td>[[ get_timerange_title(o, 2) ]]</td>
-      	<td>[[ get_timerange_title(o, 1) ]]</td>
-      	<td>[[ get_timerange_title(o, 0) ]]</td>
-      </tr>
-
-      <tr> 
-        <td>[[repeatIn(get_user_list(o),'u')]]</td>
-        <td><para style="std">[[ u.name ]]</para></td>
-        <td><para>[[ setTag('para','para',{'style':get_timesheet_status(o, u, 4)}) ]][[ get_timesheet_status(o, u, 4) ]]</para></td>
-        <td><para>[[ setTag('para','para',{'style':get_timesheet_status(o, u, 3)}) ]][[ get_timesheet_status(o, u, 3) ]]</para></td>
-        <td><para>[[ setTag('para','para',{'style':get_timesheet_status(o, u, 2)}) ]][[ get_timesheet_status(o, u, 2) ]]</para></td>
-        <td><para>[[ setTag('para','para',{'style':get_timesheet_status(o, u, 1)}) ]][[ get_timesheet_status(o, u, 1) ]]</para></td>
-        <td><para>[[ setTag('para','para',{'style':get_timesheet_status(o, u, 0)}) ]][[ get_timesheet_status(o, u, 0) ]]</para></td>
-      </tr>
-
-    </blockTable>
-  	
-  </story>
-  </document>
+    <!--
+    ##############################################################################
+    #
+    #    Author: Arnaud Wüst (Camptocamp)
+    #    Copyright 2011-2012 Camptocamp SA
+    #
+    #    This program is free software: you can redistribute it and/or modify
+    #    it under the terms of the GNU Affero 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 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/>.
+    #
+    ##############################################################################
+    -->
+
+
+    <!-- Process all datas -->
+    <template pageSize="(21cm,29.7cm)" title="Timesheet Status" author="Camptocamp" allowSplitting="20">
+
+
+        <!-- PAGE: template of all pages (= all pages except first and last if defined)-->    
+        <pageTemplate id="all">
+            <pageGraphics>
+                <setFont name="Helvetica-Bold" size="9"/>
+
+                <!--Header-->
+                <drawString x="1.2cm" y="28.1cm">[[ company.name ]]</drawString>
+                <drawString x="17.0cm" y="28.1cm">Timesheet Status</drawString>
+
+                <lineMode width="0.7"/>
+                <lines>1.2cm 28.0cm 19.8cm 28.0cm</lines>
+
+                <!-- Footer -->
+                <setFont name="Helvetica" size="9"/>
+                <drawString x="1.2cm" y="1.3cm"> [[ time.strftime("%m-%d-%y %H:%M", time.localtime()) ]]</drawString>
+                <drawString x="18.8cm" y="1.3cm">Page <pageNumber/></drawString>
+
+            </pageGraphics>
+            <frame id="all" x1="1.2cm" y1="1.7cm" width="18.6cm" height="25.8cm"/>
+        </pageTemplate>
+
+    </template>
+    <stylesheet>
+
+        <!--TABLE: standard table type "columns" (which means there is a title, a header of fields names and then lines of values) -->    	
+        <blockTableStyle id="std">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+            <blockBottomPadding length="4"/>
+            <blockFont name="Helvetica" size="9" start="0,0" stop="-1,-1"/>
+
+            <!-- first line: table name, fake as it was only one cell. grey bg -->
+            <lineStyle kind="BOX" colorName="black" start="0,0" stop="-1,0"/>
+            <blockBackground colorName="#cccccc" start="0,0" stop="-1,0"/>
+            <blockFont name="Helvetica" size="9" start="0,0" stop="-1,0"/>
+            <!-- second line: header of columns -->
+            <lineStyle kind="GRID" colorName="black" start="0,1" stop="-1,1"/>
+            <blockFont name="Helvetica-Oblique" start="0,1" stop="-1,1"/>
+            <!-- next lines: light grey lines, strong black columns separator, reduce padding to write more data in cells  -->
+            <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>	    
+            <lineStyle kind="LINEAFTER" colorName="black" start="0,2" stop="-1,-1"/>
+            <!-- last line: line below -->
+            <lineStyle kind="OUTLINE" colorName="black" start="0,0" stop="-1,-1"/>
+            <!-- all columns centered except the first two (1 system columns + employee) -->
+            <blockAlignment value="CENTER" start="2,1" stop="-1,-1" />
+
+        </blockTableStyle>
+
+        <!-- default para in tables -->
+        <paraStyle name="std"
+            fontName="Helvetica" 
+            fontSize="9"
+            alignment="LEFT"
+            />
+
+        <paraStyle name="Confirmed"
+            fontName="Helvetica"
+            fontSize="9"
+            alignment="CENTER"
+            backColor="green"
+            textColor="white"
+            />
+
+        <paraStyle name="Missing"
+            fontName="Helvetica"
+            fontSize="9"
+            alignment="CENTER"
+            backColor="red"
+            textColor="white"
+            />
+
+        <paraStyle name="Draft"
+            fontName="Helvetica"
+            fontSize="9"
+            alignment="CENTER"
+            backColor="orange"
+            textColor="black"
+            />
+
+        <paraStyle name="Error"
+            fontName="Helvetica"
+            fontSize="9"
+            alignment="CENTER"
+            textColor="red"
+            />
+
+        <paraStyle name="Not in Company"
+            fontName="Helvetica"
+            fontSize="9"
+            alignment="CENTER"
+            textColor="lightgrey"
+            />
+
+
+    </stylesheet>
+
+    <story>
+
+        [[repeatIn(objects, 'o')]]
+        <blockTable style="std" repeatRows="2" colWidths="0,5cm,2.7cm,2.7cm,2.7cm,2.7cm,2.7cm" >
+
+            <tr>
+                <td/>
+                <td>[[get_title(o)]]</td>
+            </tr>
+
+            <tr>
+                <td/>
+                <td>Employees</td>
+                <td>[[ get_timerange_title(o, 4) ]]</td>
+                <td>[[ get_timerange_title(o, 3) ]]</td>
+                <td>[[ get_timerange_title(o, 2) ]]</td>
+                <td>[[ get_timerange_title(o, 1) ]]</td>
+                <td>[[ get_timerange_title(o, 0) ]]</td>
+            </tr>
+
+            <tr> 
+                <td>[[repeatIn(get_user_list(o),'u')]]</td>
+                <td><para style="std">[[ u.name ]]</para></td>
+                <td><para>[[ setTag('para', 'para', {'style': get_timesheet_status(o, u, 4)}) ]][[ get_timesheet_status(o, u, 4) ]]</para></td>
+                <td><para>[[ setTag('para', 'para', {'style': get_timesheet_status(o, u, 3)}) ]][[ get_timesheet_status(o, u, 3) ]]</para></td>
+                <td><para>[[ setTag('para', 'para', {'style': get_timesheet_status(o, u, 2)}) ]][[ get_timesheet_status(o, u, 2) ]]</para></td>
+                <td><para>[[ setTag('para', 'para', {'style': get_timesheet_status(o, u, 1)}) ]][[ get_timesheet_status(o, u, 1) ]]</para></td>
+                <td><para>[[ setTag('para', 'para', {'style': get_timesheet_status(o, u, 0)}) ]][[ get_timesheet_status(o, u, 0) ]]</para></td>
+            </tr>
+
+        </blockTable>
+
+    </story>
+</document>
 
=== modified file 'hr_timesheet_reminder/timesheet_report.xml'
--- hr_timesheet_reminder/timesheet_report.xml	2011-08-12 12:53:16 +0000
+++ hr_timesheet_reminder/timesheet_report.xml	2012-12-13 17:06:20 +0000
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-		<report
-			id="timesheet_status"
-			string="Timesheet Status"
-			model="res.company"
-			name="timesheet.reminder.status"
-			rml="hr_timesheet_reminder/report/timesheet_status.rml"
-			auto="False"
+    <data>
+        <report
+            id="timesheet_status"
+            string="Timesheet Status"
+            model="res.company"
+            name="timesheet.reminder.status"
+            rml="hr_timesheet_reminder/report/timesheet_status.rml"
+            auto="False"
             header="True"
             menu="False"/>
-        
-	</data>
+
+    </data>
 </openerp>
 
=== modified file 'hr_timesheet_reminder/wizard/reminder_config.py'
--- hr_timesheet_reminder/wizard/reminder_config.py	2011-08-12 12:53:16 +0000
+++ hr_timesheet_reminder/wizard/reminder_config.py	2012-12-13 17:06:20 +0000
@@ -1,53 +1,48 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Guewen Baconnier (Camptocamp)
-# Author : Arnaud Wüst (Camptocamp)
-#
-# 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.
+#    Author: Arnaud Wüst (Camptocamp)
+#    Author: Guewen Baconnier (Camptocamp) (port to v7)
+#    Copyright 2011-2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 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/>.
 #
 ##############################################################################
 
-from osv import osv, fields
-
-
-class reminder_config(osv.osv_memory):
+from openerp.osv import orm, fields
+
+
+class reminder_config(orm.TransientModel):
     _name = 'hr.timesheet.reminder.config'
 
     _columns = {
         'reminder_active': fields.boolean('Reminder Active'),
-        'interval_type': fields.selection([('days','Day(s)'), ('weeks', 'Week(s)'), ('months', 'Month(s)')],
-                                           'Periodicity Unit',),
-        'interval_number': fields.integer('Periodicity Quantity',),
-        'nextcall': fields.datetime('Next Run',),
-        'message': fields.text('Message', required=True),
-        'subject': fields.char('Subject', size=200, required=True),
-        'reply_to': fields.char('Reply To', size=100, required=True),
+        'interval_type': fields.selection(
+            [('days', 'Day(s)'),
+             ('weeks', 'Week(s)'),
+             ('months', 'Month(s)')],
+            'Periodicity Unit'),
+        'interval_number': fields.integer('Periodicity Quantity'),
+        'nextcall': fields.datetime('Next Run'),
+        'message': fields.html('Message', required=True),
+        'subject': fields.char('Subject', required=True),
+        'reply_to': fields.char('Reply To', required=True),
     }
 
     def _check_interval_number(self, cr, uid, ids, context=None):
+        """This constraint should always have 1 id, we are in a TransientModel"""
+        assert len(ids) == 1, "Only 1 ID expected"
         obj = self.browse(cr, uid, ids[0], context=context)
         if obj.interval_number < 1:
             return False
@@ -60,23 +55,22 @@
     def default_get(self, cr, uid, fields, context=None):
         res = super(reminder_config, self).default_get(cr, uid, fields, context=context)
         data = self.pool.get('hr.timesheet.reminder').\
-        get_config(cr, uid, context)
+                get_config(cr, uid, context=context)
         res.update(data)
         return res
 
-    def run(self, cr, uid, ids, context):
+    def run(self, cr, uid, ids, context=None):
         """ execute the timesheets check and send emails """
         reminder_obj = self.pool.get('hr.timesheet.reminder')
         reminder_obj.run(cr, uid, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-    def save(self, cr, uid, ids, context):
+    def save(self, cr, uid, ids, context=None):
         """ save defined settings in db """
-
         # get the wizard datas
-        wizard = self.browse(cr, uid, ids, context=context)[0]
+        wizard = self.browse(cr, uid, ids[0], context=context)
 
-        #retrieve the default cron values
+        # retrieve the default cron values
         reminder_obj = self.pool.get('hr.timesheet.reminder')
 
         values = {}.fromkeys(wizard._columns.keys(), False)
@@ -85,5 +79,3 @@
 
         reminder_obj.save_config(cr, uid, False, values, context=context)
         return {'type': 'ir.actions.act_window_close'}
-
-reminder_config()
 
=== modified file 'hr_timesheet_reminder/wizard/reminder_config_view.xml'
--- hr_timesheet_reminder/wizard/reminder_config_view.xml	2011-08-12 12:53:16 +0000
+++ hr_timesheet_reminder/wizard/reminder_config_view.xml	2012-12-13 17:06:20 +0000
@@ -5,29 +5,39 @@
         <record id="view_hr_timesheet_reminder_config_form" model="ir.ui.view">
             <field name="name">hr.timesheet.reminder.config.form</field>
             <field name="model">hr.timesheet.reminder.config</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Timesheet Reminder">
-                    <group colspan="4" col="4" string="Periodicity" >
-                        <field name="reminder_active" />
-                        <newline/>
-                        <field name="nextcall" attrs="{'required':[('reminder_active','==',True)]}"/>
-                        <newline/>
-                        <field name="interval_number" string="Then send message every" attrs="{'required':[('reminder_active','==',True)]}"/>
-                        <field name="interval_type" nolabel="1" attrs="{'required':[('reminder_active','==',True)]}"/>
-                    </group>
-
-                    <group colspan="4" col="2" string="Message">
-                        <field name="reply_to"/>
-                        <field name="subject"/>
-                        <field name="message" height="200"/>
-                    </group>
-
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" string="Save configuration" name="save" type="object"/>
-                        <button icon="gtk-ok" string="Run now" name="run" type="object"/>
-                    </group>
+                <form string="Timesheet Reminder" version="7.0">
+                    <sheet>
+                        <group>
+                            <separator string="Periodicity" colspan="4"/>
+                            <field name="reminder_active" />
+                            <newline/>
+                            <field name="nextcall" attrs="{'required':[('reminder_active','==',True)]}"/>
+                            <newline/>
+                            <label for="interval_number" string="Then send message every"/>
+                            <div>
+                                <field name="interval_number" class="oe_inline"
+                                    attrs="{'required':[('reminder_active','==',True)]}"/>
+                                <field name="interval_type" nolabel="1" class="oe_inline"
+                                    attrs="{'required':[('reminder_active','==',True)]}"/>
+                            </div>
+                        </group>
+
+                        <group col="2">
+                            <separator string="Message" colspan="4"/>
+                            <field name="reply_to"/>
+                            <field name="subject"/>
+                            <field name="message" height="200"/>
+                        </group>
+                    </sheet>
+
+                    <footer>
+                        <button name="save" string="Save configuration" colspan="1"
+                            type="object" class="oe_highlight"/> or
+                        <button name="run" string="Run now" colspan="1"
+                            type="object" class="oe_highlight"/> or
+                        <button special="cancel" string="Cancel" class="oe_link"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -42,11 +52,11 @@
         </record>
 
         <menuitem id="menu_hr_timesheet_reminder_config"
-                icon="STOCK_PRINT"
-                action="action_hr_timesheet_reminder_config"
-                parent="hr.menu_hr_configuration"
-                name="Timesheet Reminder"
-                groups="base.group_hr_manager"/>
+            icon="STOCK_PRINT"
+            action="action_hr_timesheet_reminder_config"
+            parent="hr.menu_hr_configuration"
+            name="Timesheet Reminder"
+            groups="base.group_hr_manager"/>
 
-</data>
+    </data>
 </openerp>
 
=== modified file 'hr_timesheet_reminder/wizard/reminder_status.py'
--- hr_timesheet_reminder/wizard/reminder_status.py	2011-11-07 13:58:29 +0000
+++ hr_timesheet_reminder/wizard/reminder_status.py	2012-12-13 17:06:20 +0000
@@ -1,67 +1,58 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Guewen Baconnier (Camptocamp)
-#
-# 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.
+#    Author: Arnaud Wüst (Camptocamp)
+#    Author: Guewen Baconnier (Camptocamp) (port to v7)
+#    Copyright 2011-2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 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/>.
 #
 ##############################################################################
 
-import time
-
-from osv import osv, fields
-
-
-class reminder_status(osv.osv_memory):
+from openerp.osv import orm, fields
+
+
+class reminder_status(orm.TransientModel):
     _name = 'hr.timesheet.reminder.status'
 
     _columns = {
-        'company_ids': fields.many2many('res.company', 'reminder_company_rel', 'wid', 'rid', 'Company'),
+        'company_ids': fields.many2many(
+            'res.company',
+            'reminder_company_rel',
+            'wid',
+            'rid',
+            string='Company'),
         'date': fields.date('End Date', required=True),
         }
 
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'date': lambda *a: fields.date.today(),
     }
 
-    def print_report(self, cr, uid, ids, context):
-        if context is None:
-            context = {}
-
-        form_values = self.read(cr, uid, ids, ['company_ids',  'date'])[0]
-
+    def print_report(self, cr, uid, ids, context=None):
+        form_values = self.read(
+                cr, uid, ids[0], ['company_ids',  'date'], context=context)
+
+        # when no company is selected, select them all
         if not form_values['company_ids']:
             form_values['company_ids'] = self.pool.get('res.company').\
-            search(cr, uid, [], context=context)
+                search(cr, uid, [], context=context)
+
         data = {'ids': form_values['company_ids'],
                 'model': 'res.company',
-                'form': {}}
-        data['form'].update(form_values)
+                'form': form_values}
 
         return {'type': 'ir.actions.report.xml',
                 'report_name': 'timesheet.reminder.status',
                 'datas': data}
-
-reminder_status()
 
=== modified file 'hr_timesheet_reminder/wizard/reminder_status_view.xml'
--- hr_timesheet_reminder/wizard/reminder_status_view.xml	2011-08-12 12:53:16 +0000
+++ hr_timesheet_reminder/wizard/reminder_status_view.xml	2012-12-13 17:06:20 +0000
@@ -5,23 +5,24 @@
         <record id="view_hr_timesheet_reminder_status_form" model="ir.ui.view">
             <field name="name">hr.timesheet.reminder.status.form</field>
             <field name="model">hr.timesheet.reminder.status</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Reminder Status">
-                    <group colspan="4" col="4" string="Parameter">
-                        <separator string="End Date (display the 5 timesheets previous to this date)" colspan="4"/>
-                        <field name="date" colspan="4" nolabel="1" width="400" />
-                    </group>
+                <form string="Reminder Status" version="7.0">
+                    <sheet>
+                        <group>
+                            <label for="date" string="End Date (display the 5 timesheets previous to this date)"/>
+                            <field name="date" colspan="4" nolabel="1" width="400" />
+                        </group>
 
-                    <group colspan="4" col="4" string="Filter">
-                        <separator string="Filter by a Company (leave empty to select all companies)" colspan="4"/>
-                        <field name="company_ids" colspan="4" nolabel="1"/>
-                        <newline/>
-                    </group>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-print" string="Print" name="print_report" type="object" colspan="2" default_focus="1" />
-                    </group>
+                        <group>
+                            <separator string="Companies" colspan="4"/>
+                            <label for="company_ids" colspan="4" string="Filter by a Company (leave empty to select all companies)"/>
+                            <field name="company_ids" colspan="4" nolabel="1"/>
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight"/> or
+                        <button special="cancel" string="Cancel" class="oe_link"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -36,11 +37,11 @@
         </record>
 
         <menuitem id="menu_hr_timesheet_reminder_status"
-                icon="STOCK_PRINT"
-                action="action_hr_timesheet_reminder_status"
-                parent="hr_timesheet.menu_hr_reporting_timesheet"
-                name="Timesheet Status"
-                groups="base.group_hr_manager"/>
+            icon="STOCK_PRINT"
+            action="action_hr_timesheet_reminder_status"
+            parent="hr.menu_hr_reporting_timesheet"
+            name="Timesheet Status"
+            groups="base.group_hr_manager"/>
 
-</data>
+    </data>
 </openerp>