Merge lp:~gvb/openobject-addons/trunk-addons-semi-monthly-timesheet into lp:openobject-addons

[Jerry Van Baren]

Add a Semi-Monthly timesheet period

Semi-monthly is twice a month: days 1-15 is the first period, and then days 16 to the end of the month is the second.

Unmerged revisions

8820. By Gerald Van Baren <email address hidden> on 2013-07-17

Add a Semi-Monthly timesheet period

Semi-monthly is twice a month: days 1-15 is the first period, and then
days 16 to the end of the month is the second.

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py	2013-05-21 12:23:59 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2013-07-17 20:13:28 +0000
@@ -141,6 +141,11 @@
         r = user.company_id and user.company_id.timesheet_range or 'month'
         if r=='month':
             return time.strftime('%Y-%m-01')
+        elif r=='semimonth':
+            if datetime.today().day <= 15:
+                return time.strftime('%Y-%m-01')
+            else:
+                return time.strftime('%Y-%m-16')
         elif r=='week':
             return (datetime.today() + relativedelta(weekday=0, days=-6)).strftime('%Y-%m-%d')
         elif r=='year':
@@ -152,6 +157,11 @@
         r = user.company_id and user.company_id.timesheet_range or 'month'
         if r=='month':
             return (datetime.today() + relativedelta(months=+1,day=1,days=-1)).strftime('%Y-%m-%d')
+        elif r=='semimonth':
+            if datetime.today().day <= 15:
+                return time.strftime('%Y-%m-15')
+            else:
+                return (datetime.today() + relativedelta(months=+1,day=1,days=-1)).strftime('%Y-%m-%d')
         elif r=='week':
             return (datetime.today() + relativedelta(weekday=6)).strftime('%Y-%m-%d')
         elif r=='year':
@@ -533,7 +543,7 @@
     _inherit = 'res.company'
     _columns = {
         'timesheet_range': fields.selection(
-            [('day','Day'),('week','Week'),('month','Month')], 'Timesheet range',
+            [('day','Day'),('week','Week'),('semimonth','Semi-Month'),('month','Month')], 'Timesheet range',
             help="Periodicity on which you validate your timesheets."),
         'timesheet_max_difference': fields.float('Timesheet allowed difference(Hours)',
             help="Allowed difference in hours between the sign in/out and the timesheet " \
 
=== modified file 'hr_timesheet_sheet/res_config.py'
--- hr_timesheet_sheet/res_config.py	2012-12-06 14:56:32 +0000
+++ hr_timesheet_sheet/res_config.py	2013-07-17 20:13:28 +0000
@@ -25,7 +25,7 @@
     _inherit = 'hr.config.settings'
 
     _columns = {
-        'timesheet_range': fields.selection([('day','Day'),('week','Week'),('month','Month')],
+        'timesheet_range': fields.selection([('day','Day'),('week','Week'),('semimonth', 'Semi-Month'),('month','Month')],
             'Validate timesheets every', help="Periodicity on which you validate your timesheets."),
         'timesheet_max_difference': fields.float('Allow a difference of time between timesheets and attendances of (in hours)',
             help="""Allowed difference in hours between the sign in/out and the timesheet