Merge lp:~openerp-dev/openobject-addons/trunk-bug-812303-mtr into lp:openobject-addons

[Meera Trambadia (OpenERP)]

hr_holidays:-In leave request it now calculates the correct number of days using resource.calendar --fixes=lp:812303

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

I am rejecting the Merge proposal, as we are not considering this for upcoming version. But will be covered in future version's.

for future notes:
- Define the self.pool.get('resource.calendar') at beginning of the method (currently its in for loop)
- We should consider the user_id from leave request (Employee->user_id) not login user.
- Any specific need to add ids argument on _get_number_of_days() ?

Thanks,
Mustufa

Unmerged revisions

4985. By Meera Trambadia (OpenERP) on 2011-09-19

[MERGE] branch merged with lp:openobject-addons

4984. By Meera Trambadia (OpenERP) on 2011-09-16

[FIX] hr_holidays:-In leave request it now calculates the correct number of days

4983. By Meera Trambadia (OpenERP) on 2011-09-16

[MERGE] branch merged with lp:openobject-addons

=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py	2011-09-16 06:07:58 +0000
+++ hr_holidays/hr_holidays.py	2011-09-19 05:59:19 +0000
@@ -22,6 +22,8 @@
 ##############################################################################
 
 import datetime
+from datetime import timedelta
+
 from itertools import groupby
 from operator import itemgetter
 
@@ -173,14 +175,26 @@
         return result
 
     # TODO: can be improved using resource calendar method
-    def _get_number_of_days(self, date_from, date_to):
+    def _get_number_of_days(self, cr, uid, ids, date_from, date_to):
         """Returns a float equals to the timedelta between two dates given as string."""
 
+        resource_obj = self.pool.get('resource.resource')
         DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
         from_dt = datetime.datetime.strptime(date_from, DATETIME_FORMAT)
         to_dt = datetime.datetime.strptime(date_to, DATETIME_FORMAT)
         timedelta = to_dt - from_dt
         diff_day = timedelta.days + float(timedelta.seconds) / 86400
+        nb_of_days = round(diff_day)+1
+        res_id = resource_obj.search(cr, uid,[('user_id', '=', uid)])
+        for resource in resource_obj.browse(cr, uid, res_id):
+            calendar_id = resource.calendar_id
+            if not calendar_id:
+                continue
+        diff_day = 0
+        for day in range(0, int(nb_of_days)):
+            working_hours_on_day = self.pool.get('resource.calendar').working_hours_on_day(cr, uid, calendar_id, from_dt + datetime.timedelta(days=day))
+            if working_hours_on_day:
+                diff_day += 1.0
         return diff_day
 
     def unlink(self, cr, uid, ids, context=None):
@@ -192,9 +206,9 @@
     def onchange_date_from(self, cr, uid, ids, date_to, date_from):
         result = {}
         if date_to and date_from:
-            diff_day = self._get_number_of_days(date_from, date_to)
+            diff_day = self._get_number_of_days(cr, uid, ids, date_from, date_to)
             result['value'] = {
-                'number_of_days_temp': round(diff_day)+1
+                'number_of_days_temp': diff_day
             }
             return result
         result['value'] = {