Merge lp:~camptocamp/hr-timesheet/7.0-add-hr_timesheet_improvement into lp:~hr-core-editors/hr-timesheet/7.0

[Yannick Vaucher @ Camptocamp]

- Add a module to sort timesheet lines by date and account name instead of the dummy id sorting.

- Change default date for manually entering attendances to last date instead of now.

- Redefines constraint on attendances to check only the sheet the attendance belongs to.

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

I would like confirmation that:

* in 7.0 the requirement to redeclare the constraint function in the _constraints attributes is lifted
* the code works if several check ins/outs are added simultaneously

review: Needs Information (code review, no test)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

In the related fields, as you did not put invalidations, we would have problems when:

 - the date of an analytic line is changed directly from the analytic line
 - the name of an account is changed directly from the account

As a result, the date_aal and name_account in hr.analytic.timesheet would be desynchronized and the sort would be wrong.

l.118: use the constant openerp.tools.DEFAULT_SERVER_DATETIME_FORMAT

l129-131: a poor docstring, he lost his method. Or was it intended? you are cruel with him

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

review: Approve (code review, no test)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks for the changes.
Seems fine now

review: Approve (lgtm)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Just did 2 little fixes in the meantime

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Change description in __openerp__.py (Added redefinition of constraint is missing)

Authors add V. Renaville :)

review: Needs Fixing

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

review: Approve (code, test)

=== added directory 'hr_timesheet_improvement'
=== added file 'hr_timesheet_improvement/__init__.py'
--- hr_timesheet_improvement/__init__.py	1970-01-01 00:00:00 +0000
+++ hr_timesheet_improvement/__init__.py	2013-06-19 06:20:34 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author : Yannick Vaucher (Camptocamp)
+#    Copyright 2013 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 hr_timesheet
+import hr_attendance

=== added file 'hr_timesheet_improvement/__openerp__.py'
--- hr_timesheet_improvement/__openerp__.py	1970-01-01 00:00:00 +0000
+++ hr_timesheet_improvement/__openerp__.py	2013-06-19 06:20:34 +0000
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Authors: Yannick Vaucher (Camptocamp)
+#             Vincent Renaville (Camptocamp)
+#    Copyright 2013 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 improvements',
+ 'version' : '0.1',
+ 'author' : 'Camptocamp',
+ 'maintainer': 'Camptocamp',
+ 'category': 'Human Resources',
+ 'depends' : ['hr_timesheet_sheet'],
+ 'description': """
+ Modifies timesheet behavior:
+ - Ensure a DESC order on timesheet lines
+ - Set default date for manually entering attendance to max attendance date
+ - Redefine constraint on timesheets to check alternation of 'sign in' and
+   'sign out' only on current timesheet instead of doing it on all timesheets
+   of the employee
+ """,
+ 'website': 'http://www.camptocamp.com',
+ 'data': ['hr_timesheet_view.xml'],
+ 'js' : [],
+ 'css': [],
+ 'qweb': [],
+ 'demo': [],
+ 'test': [],
+ 'installable': True,
+ 'images' : [],
+ 'auto_install': False,
+ 'license': 'AGPL-3',
+ 'application': True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'hr_timesheet_improvement/hr_attendance.py'
--- hr_timesheet_improvement/hr_attendance.py	1970-01-01 00:00:00 +0000
+++ hr_timesheet_improvement/hr_attendance.py	2013-06-19 06:20:34 +0000
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Authors: Yannick Vaucher (Camptocamp)
+#             Vincent Renaville (Camptocamp)
+#    Copyright 2013 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 openerp.osv import orm
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+
+
+class HrAttendance(orm.Model):
+    """
+    Alter the default date for manual setting
+    """
+    _inherit = "hr.attendance"
+
+    def _default_date(self, cr, uid, context=None):
+        sheet_id = context.get('sheet_id')
+        if not sheet_id:
+            return time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+
+        ts_obj = self.pool.get('hr_timesheet_sheet.sheet')
+        timesheet = ts_obj.browse(cr, uid, sheet_id, context=context)
+
+        dates = [a.name for a in timesheet.attendances_ids]
+
+        if not dates:
+            return timesheet.date_from
+
+        return max(dates)
+    """
+    Check sign in signout in the same timesheet only
+    """
+
+    def _altern_si_so(self, cr, uid, ids, context=None):
+        """ Alternance sign_in/sign_out check.
+            Previous (if exists) must be of opposite action.
+            Next (if exists) must be of opposite action.
+        """
+        sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
+        for att in self.browse(cr, uid, ids, context=context):
+            sheet_id = sheet_obj.search(
+                    cr, uid, [
+                        ('employee_id', '=', att.employee_id.id),
+                        ('date_from', '<=', att.name),
+                        ('date_to', '>=', att.name),
+                        ],
+                    limit=1,
+                    context=context)
+            sheet_id = sheet_id and sheet_id[0] or False
+
+            # search and browse for first previous and first next records
+            prev_att_ids = self.search(cr, uid, [('employee_id', '=', att.employee_id.id),
+                                                 ('sheet_id', '=', sheet_id),
+                                                 ('name', '<', att.name),
+                                                 ('action', 'in', ('sign_in', 'sign_out'))],
+                                       limit=1, order='name DESC',
+                                       context=context)
+            next_add_ids = self.search(cr, uid, [('employee_id', '=', att.employee_id.id),
+                                                 ('sheet_id', '=', sheet_id),
+                                                 ('name', '>', att.name),
+                                                 ('action', 'in', ('sign_in', 'sign_out'))],
+                                       limit=1, order='name ASC',
+                                       context=context)
+            prev_atts = self.browse(cr, uid, prev_att_ids, context=context)
+            next_atts = self.browse(cr, uid, next_add_ids, context=context)
+            # check for alternance, return False if at least one condition is not satisfied
+            if prev_atts and prev_atts[0].action == att.action: # previous exists and is same action
+                return False
+            if next_atts and next_atts[0].action == att.action: # next exists and is same action
+                return False
+            if (not prev_atts) and (not next_atts) and att.action != 'sign_in': # first attendance must be sign_in
+                return False
+        return True
+
+    _constraints = [(_altern_si_so, 'Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)', ['action'])]
+
+    _defaults = {
+        'name': _default_date,
+        }
+

=== added file 'hr_timesheet_improvement/hr_timesheet.py'
--- hr_timesheet_improvement/hr_timesheet.py	1970-01-01 00:00:00 +0000
+++ hr_timesheet_improvement/hr_timesheet.py	2013-06-19 06:20:34 +0000
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author : Yannick Vaucher (Camptocamp)
+#    Copyright 2013 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 openerp.osv import orm, fields
+
+class HrAnalyticTimesheet(orm.Model):
+    """
+    Set order by line date and analytic account name instead of id
+    We create related stored values as _order cannot be used on inherited columns
+    """
+    _inherit = "hr.analytic.timesheet"
+    _order = "date_aal DESC, account_name ASC"
+
+    def _get_account_analytic_line(self, cr, uid, ids, context=None):
+        ts_line_ids = self.pool.get('hr.analytic.timesheet').search(cr, uid, [('line_id', 'in', ids)])
+        return ts_line_ids
+
+    def _get_account_analytic_account(self, cr, uid, ids, context=None):
+        ts_line_ids = self.pool.get('hr.analytic.timesheet').search(cr, uid, [('account_id', 'in', ids)])
+        return ts_line_ids
+
+    _columns = {
+        'date_aal': fields.related('line_id', 'date', string="Analytic Line Date", type='date',
+            store={
+                'account.analytic.line': (_get_account_analytic_line, ['date'], 10),
+                'hr.analytic.timesheet': (lambda self,cr,uid,ids,context=None: ids, None, 10),
+                }),
+        'account_name': fields.related('account_id', 'name', string="Analytic Account Name", type='char', size=256,
+            store={
+                'account.analytic.account': (_get_account_analytic_account, ['name'], 10),
+                'hr.analytic.timesheet': (lambda self,cr,uid,ids,context=None: ids, None, 10),
+                }
+            ),
+        }

=== added file 'hr_timesheet_improvement/hr_timesheet_view.xml'
--- hr_timesheet_improvement/hr_timesheet_view.xml	1970-01-01 00:00:00 +0000
+++ hr_timesheet_improvement/hr_timesheet_view.xml	2013-06-19 06:20:34 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+
+    <record id="hr_timesheet_sheet_form_pass_active_id" model="ir.ui.view">
+      <field name="name">hr.timesheet.sheet.form</field>
+      <field name="model">hr_timesheet_sheet.sheet</field>
+      <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form" />
+      <field name="arch" type="xml">
+        <field  name="attendances_ids" position="attributes">
+          <attribute name="context">{'employee_id': employee_id, 'user_id':user_id, 'sheet_id':active_id}</attribute>
+        </field>
+      </field>
+    </record>
+
+    </data>
+</openerp>