Merge lp:~acsone-openerp/hr-timesheet/7.0_fix_1200183 into lp:~hr-core-editors/hr-timesheet/7.0

[Laetitia Gangloff (Acsone)]

Fix the bug https://bugs.launchpad.net/hr-timesheet/+bug/1200183

[lp:~acsone-openerp/hr-timesheet/7.0_fix_1200183]

49. By Laetitia Gangloff (Acsone) on 2013-07-11

hr_attandance_analysis: contract without trial period is not active contract.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

'osv.osv' is deprecated, to replace by 'orm.Model'.

Are you sure you want to grant the copyright to Tiny SPRL?

review: Needs Fixing

[lp:~acsone-openerp/hr-timesheet/7.0_fix_1200183]

50. By Laetitia Gangloff (Acsone) on 2013-07-22

hr_attendance_analysis: replace osv.osv by orm.Model ; replace copyright

[Laetitia Gangloff (Acsone) (laetitia-gangloff)]

Thank you for your review.

As you suggest I replace 'osv.osv' by 'orm.Model' and update the copyright.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks, LGTM

review: Approve

[Stéphane Bidoul (Acsone) (sbi)]

LGTM

review: Approve (code review)

=== modified file 'hr_attendance_analysis/__init__.py'
--- hr_attendance_analysis/__init__.py	2013-03-08 11:08:23 +0000
+++ hr_attendance_analysis/__init__.py	2013-07-22 14:55:32 +0000
@@ -20,6 +20,7 @@
 #
 ##############################################################################
 import hr_attendance
+import hr_contract
 import report
 import wizard
 import resource

=== modified file 'hr_attendance_analysis/hr_attendance.py'
--- hr_attendance_analysis/hr_attendance.py	2013-07-22 14:55:32 +0000
+++ hr_attendance_analysis/hr_attendance.py	2013-07-22 14:55:32 +0000
@@ -139,11 +139,11 @@
             ('date_end', '>=', date),
             ('date_end', '=', False),
             '&',
-            '|',
-            ('trial_date_start', '=', False),
+            '&',
+            ('trial_date_start', '!=', False),
             ('trial_date_start', '<=', date),
-            '|',
-            ('trial_date_end', '=', False),
+            '&',
+            ('trial_date_end', '!=', False),
             ('trial_date_end', '>=', date),
             ])
         if len(active_contract_ids) > 1:

=== added file 'hr_attendance_analysis/hr_contract.py'
--- hr_attendance_analysis/hr_contract.py	1970-01-01 00:00:00 +0000
+++ hr_attendance_analysis/hr_contract.py	2013-07-22 14:55:32 +0000
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Authors: Stéphane Bidoul & Laetitia Gangloff
+#    Copyright (c) 2013 Acsone SA/NV (http://www.acsone.eu)
+#    All Rights Reserved
+#
+#    WARNING: This program as such is intended to be used by professional
+#    programmers who take the whole responsibility 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
+#    guarantees and support are strongly advised to contact a Free Software
+#    Service Company.
+#
+#    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 datetime
+
+from openerp.osv import fields, orm
+
+
+class hr_contract(orm.Model):
+    _inherit = 'hr.contract'
+
+    def copy(self, cr, uid, id, defaults, context=None):
+        """
+        When duplicate a contract set the start date to the last end date + 1 day.
+        If the last end date is False, do nothing
+        """
+        contract = self.browse(cr, uid, id, context=context)
+        end_date_contract_id = self.search(cr, uid, [('employee_id', '=', contract.employee_id.id), ], limit=1, order='date_end desc', context=context)
+        last_end_date = False
+        if end_date_contract_id:
+            contract = self.browse(cr, uid, end_date_contract_id, context=context)
+            last_end_date = contract[0].date_end
+
+        if last_end_date:
+            defaults['date_start'] = datetime.datetime.strftime(datetime.datetime.strptime(last_end_date, "%Y-%m-%d") + datetime.timedelta(days=1), "%Y-%m-%d")
+            defaults['date_end'] = False
+            defaults['trial_date_start'] = False
+            defaults['trial_date_end'] = False
+        return super(hr_contract, self).copy(cr, uid, id, defaults, context=context)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: