Merge lp:~openerp-groupes/hrself-addons/balance-report-optimization-oli into lp:hrself-addons

[tfr (Openerp)]

[lp:~openerp-groupes/hrself-addons/balance-report-optimization-oli]

639. By Olivier Ligot on 2011-12-06

[MERGE] Upstream merge

640. By Olivier Ligot on 2011-12-07

[FIX] _update_context: get employee from uid if not defined

641. By Olivier Ligot on 2011-12-07

[FIX] Get unit from precision when no balance for a given type

642. By Olivier Ligot on 2011-12-07

[REM] print statements

643. By Olivier Ligot on 2011-12-07

[REF] Don't use _ for public functions

644. By Olivier Ligot on 2011-12-07

[REM] today_balance field

645. By Olivier Ligot on 2011-12-07

[IMP] Define 2 balance tree views: one with date field and one without

646. By Olivier Ligot on 2011-12-07

[FIX] Employee has now the right to delete a balance

647. By Olivier Ligot on 2011-12-07

[FIX] Check allowed duration when start date equals end date and unit is day

648. By Olivier Ligot on 2011-12-07

[FIX] Get unit from precision when no balance for a given type

The previous implementation was wrong as it used a shared dict, which caused
the unit to be set for each leave type!!!

Unmerged revisions

648. By Olivier Ligot on 2011-12-07

[FIX] Get unit from precision when no balance for a given type

The previous implementation was wrong as it used a shared dict, which caused
the unit to be set for each leave type!!!

647. By Olivier Ligot on 2011-12-07

[FIX] Check allowed duration when start date equals end date and unit is day

646. By Olivier Ligot on 2011-12-07

[FIX] Employee has now the right to delete a balance

645. By Olivier Ligot on 2011-12-07

[IMP] Define 2 balance tree views: one with date field and one without

644. By Olivier Ligot on 2011-12-07

[REM] today_balance field

643. By Olivier Ligot on 2011-12-07

[REF] Don't use _ for public functions

642. By Olivier Ligot on 2011-12-07

[REM] print statements

641. By Olivier Ligot on 2011-12-07

[FIX] Get unit from precision when no balance for a given type

640. By Olivier Ligot on 2011-12-07

[FIX] _update_context: get employee from uid if not defined

639. By Olivier Ligot on 2011-12-06

[MERGE] Upstream merge

=== modified file 'hrself_holidays/hrself_holidays.py'
--- hrself_holidays/hrself_holidays.py	2011-12-02 10:20:44 +0000
+++ hrself_holidays/hrself_holidays.py	2011-12-07 15:08:24 +0000
@@ -82,14 +82,17 @@
     _description = "Types of holidays"
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
-        """Redefined to search only types applicables for an employee and a period.
+        """
+            Redefined to search only types applicables for an employee and a period.
             If context contains activity_context_id (or employee_id and date_from to calculates it), returns only compatible type.
             Else returns super.search result
         """
-
         if not context:
             context = {}
+            
         ids = super(hrself_holidays_type, self).search(cr, uid, args, offset, limit, order, context, count)
+        if count:
+            return ids
         result = ids
         activity_context_id = context.get('activity_context_id')
         if not activity_context_id:
@@ -129,37 +132,6 @@
             return employee_ids[0]
         return False
 
-    def get_initialization_duration_for_employee(self, cr, uid, ids, context):
-        """Returns the initialization duration of a leave type for the employee. Only for the current year and activity context.
-        Duration is in hours or days (defined by leave type).
-        Requires employee_id, date_from and activity_context of the leave in context:
-        {'employee_id':employee_id, 'date_from':date_from, 'activity_context':activity_context}
-        @return: dictionary {leave_type: duration}
-        """
-        max_leaves = dict.fromkeys(ids, 0)
-        employee_id = context.get('employee_id')
-        # calculation of initializations at the date of leave request
-        # if leave request has no date_from yet, using today
-        self._update_context(cr, uid, context=context)
-        date_from = context.get('date_from')
-        activity_context_id = context.get('activity_context')
-        current_year = hrself_datetime.to_date(date_from).year
-        start_of_year = hrself_datetime.to_string(datetime.date(current_year, 1, 1))
-        for leave_type in self.browse(cr, uid, ids, context): 
-            initialization_object = self.pool.get('hrself.holidays.request.initialization')
-            initialization_ids = initialization_object.search(cr, uid, [
-                    ('type_id', '=', leave_type.id), ('employee_id', '=', employee_id),
-                    ('date_from', '>=', start_of_year), ('date_from', '<=', date_from)],
-                    order='date_from desc')
-            duration = 0
-            if initialization_ids:
-                for initialization in initialization_object.browse(cr, uid, initialization_ids, context=context):
-                    if initialization.activity_context_id.is_compatible(activity_context_id):
-                        duration = initialization.duration
-                        break
-            max_leaves[leave_type.id] = duration
-        return max_leaves
-
     def get_remaining_leaves_for_employee(self, cr, uid, ids, context=None, remaining_date_to=None):
         """Returns the remaining number of leaves for the employee by leave type. Only for the current year and activity context.
            Context must contain employee_id, date_from and activity_context of the leave:
@@ -169,10 +141,9 @@
            remaining_date_to is end of year by default, can be used to specify an end date period for calculation of remaining leaves.
            @return: dictionary {leave_type: duration}
         """
-        result = {}
-        values = self.compute_values(cr, uid, ids, context=context, remaining_date_to=remaining_date_to)
-        for key, value in values.iteritems():
-            result[key] = value['remaining_leaves']
+        result = dict.fromkeys(ids, 0)
+        for type in self.browse(cr, uid, ids, context=context):
+            result[type.id] = type.remaining_leaves
         return result
 
     def _update_context(self, cr, uid, context=None):
@@ -181,46 +152,33 @@
         if not employee_id:
             employee_id = self._user_employee(cr, uid, context)
             context['employee_id'] = employee_id
-        date_from = context.get('date_from')
-        if not date_from:
-            date_from = datetime.date.today()
-            context['date_from']=date_from
+        date_to = context.get('date_to')
+        if not date_to:
+            date_to = datetime.date.today()
+            context['date_to'] = date_to
         if not context.get('activity_context') and employee_id:
             services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
-            activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_from, context=context)
+            activities = services.get_theoretical_activities(cr, uid, employee_id, date_to, date_to, context=context)
             if activities:
                 context['activity_context'] = activities[0]['activity_context']
 
-    def compute_values(self, cr, uid, ids, context, remaining_date_to=None):
-        """Compute values of remaining_leaves and unit functional fields."""
-        return self._compute(cr, uid, ids, None, None, context=context, remaining_date_to=remaining_date_to)
-
     def _compute(self, cr, uid, ids, field_name, arg, context, remaining_date_to=None):
         """Method signature conformed to functional field."""
-        result = dict.fromkeys(ids, {'unit': None, 'remaining_leaves': 0})
+        if not context:
+            context = {}
         self._update_context(cr, uid, context=context)
-        remaining_leaves = self.get_initialization_duration_for_employee(cr, uid, ids, context)
-        date_from = context.get('date_from')
-        current_year = hrself_datetime.to_date(date_from).year
-        start_of_year = hrself_datetime.to_string(datetime.date(current_year, 1, 1))
-        if remaining_date_to:
-            date_to = remaining_date_to
-        else:
-            date_to = hrself_datetime.to_string(datetime.date(current_year, 12, 31))
-        activity_context_id = context.get('activity_context')
-        leave_object = self.pool.get('hrself.holidays.request.leave')
-        for leave_type in self.browse(cr, uid, ids, context): 
-            leave_ids = leave_object.search(cr, uid, [
-                    ('type_id', '=', leave_type.id), ('employee_id', '=', context.get('employee_id')),
-                    ('date_from', '>=', start_of_year), ('date_to', '<=', date_to), 
-                    ('state', 'in', [STATE_CONFIRMED, STATE_APPROVED] ), ('activity_context_id','=', activity_context_id) ])
-            remaining_leaves[leave_type.id] -= sum(leave.duration for leave in leave_object.browse(cr, uid, leave_ids))
-            precision_id = leave_type.precision_id_for_context(activity_context_id)
-            if precision_id:
-                result[leave_type.id] = {
-                    'remaining_leaves': remaining_leaves[leave_type.id],
-                    'unit': self.pool.get('hrself.holidays.type.precision').browse(cr, uid, precision_id).unit,
-                }
+        result = {}
+        for type_id in ids:
+            result[type_id] = {'unit': None, 'remaining_leaves': 0}
+        balance_object = self.pool.get('hrself.holidays.balance')
+        balance_ids = balance_object.get_employee_balance_ids(cr, uid, context.get('employee_id'), ids, context.get('date_to'), context=context)
+        for balance in balance_object.browse(cr, uid, balance_ids, context=context):
+            result[balance.type_id.id] = {'unit' : balance.unit, 'remaining_leaves' : balance.end_year_balance}
+        for type_id in ids:
+            if result[type_id]['unit'] is None:
+                precision_id = self.precision_id_for_context(cr, uid, [type_id], context.get('activity_context'))
+                if precision_id:
+                    result[type_id]['unit'] = self.pool.get('hrself.holidays.type.precision').browse(cr, uid, precision_id).unit
         return result
 
     _columns = {
@@ -503,41 +461,33 @@
         ], 'Generate source'),
     }
 
+    def _get_activity_context(self, cr, uid, date_from, employee_id, type_id, context=None):
+        """Get the activity context."""
+        services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
+        #TODO: verify that get_theoretical_activities don't crash if arguments are None
+        activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_from, context=context)
+        if activities:
+            activity_context_id = activities[0]['activity_context']
+            precision_id = self.pool.get('hrself.holidays.type').precision_id_for_context(cr, uid, [type_id], activity_context_id)
+            return self.pool.get('hrself.holidays.type.precision').browse(cr, uid, precision_id, context=context).activity_context_id.id
+        return False
+    
     def write(self, cr, uid, ids, vals, context=None):
         """Redefining write to add activity context """
         for initialization in self.browse(cr, uid, ids, context=context):
             date_from = vals.get('date_from', initialization.date_from)
             employee_id = initialization.employee_id.id
-            services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
-            activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_from, context=context)
-            if activities:
-                activity_context_id = activities[0]['activity_context']
-                type_id = self.browse(cr, uid, ids[0], context=context).type_id.id
-                precision_id = self.pool.get('hrself.holidays.type').precision_id_for_context(cr, uid, [type_id], activity_context_id)
-                vals['activity_context_id'] = self.pool.get('hrself.holidays.type.precision').browse(cr, uid, precision_id, context=context).activity_context_id.id
-                # test if new duration > number of days/hours already taken
-                context = {'employee_id':employee_id, 'date_from':date_from, 'activity_context':activity_context_id}
-                old_duration_dic = initialization.type_id.get_initialization_duration_for_employee(context)
-                remaining_dic = initialization.type_id.get_remaining_leaves_for_employee(context)
-                remaining = remaining_dic[initialization.type_id.id]
-                old_duration = old_duration_dic[initialization.type_id.id]
-                days_taken = old_duration - remaining
-                new_duration = vals.get('duration', initialization.duration)
-                if new_duration < days_taken:
-                    raise osv.except_osv(_('Error !'), _( 'Duration must be greater than days/hours already taken.\n Days/Hours taken: %s') % (str(days_taken))) 
+            type_id = vals.get('type_id', initialization.type_id.id)
+            vals['activity_context_id'] = self._get_activity_context(cr, uid, date_from, employee_id, type_id)
         return super(hrself_holidays_request_initialization, self).write(cr, uid, ids, vals, context=context)
     
     def create(self, cr, uid, vals, context=None):
         """Redefining create to add activity context """
         if not 'activity_context_id' in vals:
-            date_from = vals['date_from']
-            employee_id = int(vals['employee_id'])
-            services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
-            activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_from, context=context)
-            if activities:
-                activity_context_id = activities[0]['activity_context']
-                precision_id = self.pool.get('hrself.holidays.type').precision_id_for_context(cr, uid, [vals['type_id']], activity_context_id)
-                vals['activity_context_id'] = self.pool.get('hrself.holidays.type.precision').browse(cr, uid, precision_id, context=context).activity_context_id.id
+            date_from = vals.get('date_from')
+            employee_id = int(vals.get('employee_id'))
+            type_id = int(vals.get('type_id'))
+            vals['activity_context_id'] = self._get_activity_context(cr, uid, date_from, employee_id, type_id)
         return super(hrself_holidays_request_initialization, self).create(cr, uid, vals, context=context)
     
     _defaults = {
@@ -572,10 +522,46 @@
                 return False
         return True
 
+    def _check_balance_positive(self, cr, uid, ids, context=None):
+        """Check that final balance is not below zero.
+        """
+        balance_obj = self.pool.get('hrself.holidays.balance')
+        for request in self.browse(cr, uid, ids, context=context):
+            balance_obj.update_balance(cr, uid, request.employee_id.id, request.type_id.id, request.activity_context_id.id, 
+                                       request.date_from, context=context)
+            if not balance_obj.check_all_balance_positive(cr, uid, request.employee_id.id, request.type_id.id, request.activity_context_id.id, request.date_from, context=context):
+                return False
+        return True
+
+    def _check_unicity(self, cr, uid, ids, context=None):
+        for init in self.browse(cr, uid, ids, context=context):
+            init_ids = self.search(cr, uid, [('employee_id', '=', init.employee_id.id), 
+                                             ('date_from', '=', init.date_from), 
+                                             ('type_id', '=', init.type_id.id)], context=context)
+            if len(init_ids) > 1:
+                return False
+        return True
+    
     _constraints = [
         (_check_duration, _('Duration must be greater than 0 !'), ['duration']),
+        (_check_unicity, _('Cannot create two initialization for the same employee for the same type at the same date'), ['duration', 'type', 'employee_id']),
         (_check_type_activity_context, _('This type is not compatible with activity context of employee'), ['type']),
+        (_check_balance_positive, _('The balance at the end of the year cannot be below zero'), ['duration']), #TODO: review message
     ]
+    
+    def unlink(self, cr, uid, ids, context=None):
+        #Likely to be optimized
+        balance_obj = self.pool.get('hrself.holidays.balance')
+        for request_data in self.read(cr, uid, ids, ['employee_id', 'type_id', 'activity_context_id', 'date_from'],context=context):
+            date_from = request_data['date_from']
+            employee_id = request_data['employee_id'][0]
+            type_id = request_data['type_id'][0]
+            activity_context_id = request_data['activity_context_id'][0]
+            res = super(hrself_holidays_request_initialization, self).unlink(cr, uid, [request_data['id']], context=context)
+            balance_obj.update_balance(cr, uid, employee_id, type_id, activity_context_id, date_from, context=context)
+            if not balance_obj.check_all_balance_positive(cr, uid, employee_id, type_id, activity_context_id, date_from, context=context):
+                raise osv.except_osv(_('Warning!'), _('You cannot delete this initialization. Otherwise the remaining leaves for %s would be negative.' % request_data['employee_id'][1]))
+        return res
 
 hrself_holidays_request_initialization()
 
@@ -721,14 +707,35 @@
             if not self._disable_checks(cr, uid, leave_request.type_id.id, activity_context_id) and not (leave_request.duration > 0):
                 return False
         return True
+    
+    def _check_am_pm(self, cr, uid, ids, context=None):
+        for leave in self.browse(cr, uid, ids, context=context):
+            if leave.date_to != leave.date_from and leave.am_pm != AM_PM_ALL_DAY:
+                return False
+        return True
 
     _constraints = [
         (_check_duration, _('Duration must be greater than 0 !'), ['duration']),
-        (_check_mandatory_reason, _('Type of holiday requires a reason'), ['reason']),
+        (_check_am_pm, _('The leave last more then one day, you should select all day'), ['am_pm']),
         (_check_limit_date, _check_limit_date_message, ['date_to']),
         (_check_minimum_date, _check_minimum_date_message, ['date_from']),
+        (_check_mandatory_reason, _('Type of holiday requires a reason'), ['reason']),
         (_check_type_activity_context, _('This type is not compatible with activity context of employee'), ['type']),
     ]
+    
+    #this function is use cause of the stupid web client that doesn't send the right values
+    def onchange_unit(self, cr, uid, ids, employee_id, date_from, date_to, type_id, unit, am_pm, context=None):
+		"""Action to execute when the user changes the unit."""
+		result = {}
+		if employee_id and date_from and date_to and type_id: 
+			services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
+			activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_to, context=context)
+			allowed_unit = self._duration(cr, uid, type_id, am_pm, activities)['value']['unit']
+			if unit <> allowed_unit:
+				result['warning'] = {'title': _('Warning'), 'message': _('You cannot change the unit.')}
+				result['value'] = {'unit': allowed_unit}
+		return result
+			
 
     def write(self, cr, uid, ids, values, context=None):
         """Redefined write to check constraints."""
@@ -752,7 +759,7 @@
             old_date_to = hrself_datetime.to_date(leave.date_to)
             new_date_to = _to_date(values.get('date_to'), old_date_to)
             if (new_date_from != old_date_from) or (new_date_to != old_date_to):
-                on_change = self._onchange_date_type(cr, uid, [leave.id], leave.employee_id.id, new_date_from, new_date_to, leave.type_id.id, leave.am_pm, context)
+                on_change = self.onchange_date_type(cr, uid, [leave.id], leave.employee_id.id, new_date_from, new_date_to, leave.type_id.id, leave.am_pm, context)
                 warning = on_change.get('warning')
                 if warning:
                     logger.warning(warning['message'])
@@ -764,106 +771,53 @@
                 write_ids.append(leave.id)
         return super(hrself_holidays_request_leave, self).write(cr, uid, write_ids, values, context=context)
     
-    def onchange_employee_id(self, cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context):
-        """Action to execute when the user changes employee_id."""
-        return self._onchange_date_type(cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context)
-
-    def onchange_date_from(self, cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context):
-        """Action to execute when the user changes date_from."""
-        return self._onchange_dates_am_pm(cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context)
-
-    def onchange_date_to(self, cr, uid, ids, employee_id, date_to, date_from, type_id, am_pm, context):
+    def onchange_date(self, cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context=None):
         """Action to execute when the user changes date_to."""
-        return self._onchange_dates_am_pm(cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context)
-
-    def onchange_type(self, cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context):
-        """Action to execute when the user changes the type."""
-        return self._onchange_date_type(cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context)
+        if not date_from or not date_to:
+            return {}
+        
+        if date_from > date_to:
+            message = _('The start date (%s) must be smaller or equal to the end date (%s)!') % (date_from, date_to)
+            return {'warning' : {'title': _('Invalid dates'), 'message': message}}
+        return self.onchange_date_type(cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context)
 
     def _disable_checks(self, cr, uid, type_id, activity_context_id):
         """Disable checks?"""
-        result = False
-        if type_id and activity_context_id:
-            precision_id = self.pool.get('hrself.holidays.type').browse(cr, uid, type_id).precision_id_for_context(activity_context_id)
-            if precision_id:
-                prestation_code = self.pool.get('hrself.holidays.type.precision').browse(cr, uid, precision_id).prestation_code_id
-                if prestation_code and prestation_code.gross_leave:
-                    result = True
-        return result
-
-    def onchange_duration(self, cr, uid, ids, employee_id, date_from, date_to, type_id, duration, unit, am_pm, context=None):
-        """Action to execute when the user changes the duration."""
-        result = {}
-        if employee_id and date_from and date_to:
-            services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
-            activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_to, context=context)
-            if not self._disable_checks(cr, uid, type_id, activities and activities[0] and activities[0]['activity_context']):
-                allowed_duration = self._duration(cr, uid, type_id, am_pm, activities)['value']['duration']
-                if unit == hrself.TIME_UNIT_HOUR and date_from == date_to:
-                    if duration > allowed_duration:
-                        result['warning'] = {
-                            'title': _('Warning'), 
-                            'message': _('The leave request duration is greater than allowed. \n You have %d %s(s) left.') % 
-                            (allowed_duration, hrself.TIME_UNITS_DICT[unit])
-                        }
-                        result['value'] = {'duration': allowed_duration}
-                elif duration <> allowed_duration:
-                    result['warning'] = {'title': _('Warning'), 'message': _('You cannot change the duration.')}
-                    result['value'] = {'duration': allowed_duration}
-        return result
-
-    def onchange_unit(self, cr, uid, ids, employee_id, date_from, date_to, type_id, unit, am_pm, context=None):
-        """Action to execute when the user changes the unit."""
-        result = {}
-        date_from = date_from or fields.date.today()
-        date_to = date_to or fields.date.today()
-        if employee_id:
-            services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
-            activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_to, context=context)
-            allowed_unit = self._duration(cr, uid, type_id, am_pm, activities)['value']['unit']
-            if unit <> allowed_unit:
-                result['warning'] = {'title': _('Warning'), 'message': _('You cannot change the unit.')}
-                result['value'] = {'unit': allowed_unit}
-        return result
-
-    def _onchange_dates_am_pm(self, cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context):
-        """Action to execute when the user changes dates (from or to) or the AM PM indicator."""
-        result = {}
-        if am_pm != AM_PM_ALL_DAY and date_from != date_to:
-            am_pm = AM_PM_ALL_DAY
-            result['warning'] = {'title': _('Warning'), 'message': _('You cannot set AM or PM when start date is not equal to end date.')}
-        result.update(self._onchange_date_type(cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context))
-        result['value']['am_pm'] = am_pm
-        return result
-
-    def onchange_am_pm(self, cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context):
-        """Action to execute when the user changes the AM PM indicator."""
-        return self._onchange_dates_am_pm(cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context)
-
-    def _onchange_date_type(self, cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context):
+        if not type_id or not activity_context_id:
+            return False
+            
+        precision_id = self.pool.get('hrself.holidays.type').browse(cr, uid, type_id).precision_id_for_context(activity_context_id)
+        if precision_id:
+            prestation_code = self.pool.get('hrself.holidays.type.precision').browse(cr, uid, precision_id).prestation_code_id
+            if prestation_code and prestation_code.gross_leave:
+                result = True
+                
+        return False
+
+    def onchange_date_type(self, cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context=None):
         """Action to execute when the user changes a date (from or to) or the type."""
         result = {}
         activities = None
-        if date_from and date_to:
-            if date_from > date_to:
-                message = _('The start date (%s) must be smaller or equal to the end date (%s)!') % (date_from, date_to)
+        if not (date_from and date_to and type_id and employee_id):
+            return result
+        
+        
+        services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
+        activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_to, context=context)
+        if not self._disable_checks(cr, uid, type_id, activities and activities[0] and activities[0]['activity_context']):
+            present = False
+            absence_days =  set()
+            for activity in activities:
+                if activity['presence_absence'] == 'A':
+                    date = hrself_datetime.to_string(hrself_datetime.to_date(activity['date']))
+                    absence_days.add(date)
+                elif activity['presence_absence'] == 'P':
+                    present = True
+            if not present:
+                message = _('You cannot take leave on absence days: ') + ', '.join(absence_days) 
                 result['warning'] = {'title': _('Invalid dates'), 'message': message}
-            elif employee_id and type_id:
-                services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
-                activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_to, context=context)
-                if not self._disable_checks(cr, uid, type_id, activities and activities[0] and activities[0]['activity_context']):
-                    presence_days = []
-                    absence_days = []
-                    for activity in activities:
-                        date = hrself_datetime.to_string(hrself_datetime.to_date(activity['date']))
-                        if activity['presence_absence'] == 'A' and date not in absence_days:
-                            absence_days.append(date)
-                        elif activity['presence_absence'] == 'P' and date not in presence_days:
-                            presence_days.append(date)
-                    if not presence_days:
-                        message = _('You cannot take leave on absence days: ') + ', '.join(absence_days) 
-                        result['warning'] = {'title': _('Invalid dates'), 'message': message}
-                result.update(self._duration(cr, uid, type_id, am_pm, activities))
+        
+        result.update(self._duration(cr, uid, type_id, am_pm, activities))
         return result
 
     def _duration(self, cr, uid, type_id, am_pm, activities):
@@ -893,7 +847,7 @@
                     duration = duration_in_hour
             else:
                 type = self.pool.get('hrself.holidays.type').browse (cr, uid, type_id)
-                message = _('No precision defined for the holidays type named %s identified by %d') % (type.name , type.id)
+                message = _('No precision defined for the holidays type named %s identified by %d, please contact your administrator') % (type.name , type.id)
                 result['warning'] = {'title': _('No precision'), 'message': message}
         result['value'] = {
             'duration': duration, 
@@ -919,40 +873,22 @@
             if activity_context_id:
                 leave_request.write({'activity_context_id': activity_context_id})            
 
-    def _check_balance(self, cr, uid, ids):
-        """Check balance limit if override is not allowed.
-           Returns the number of remaining days or hours.
-           @rtype: int
-        """
-
-        for leave_request in self.browse(cr, uid, ids):
-            if leave_request.activity_context_id:
-                activity_context_id = leave_request.activity_context_id.id
-                precision_id = leave_request.type_id.precision_id_for_context(activity_context_id)
-                type_precision = self.pool.get('hrself.holidays.type.precision').browse(cr, uid, precision_id)
-                if not type_precision.is_unlimited :
-                    context = {
-                        'employee_id': leave_request.employee_id.id, 
-                        'date_from': leave_request.date_from, 
-                        'activity_context': activity_context_id,
-                    }
-                    remaining_dic = leave_request.type_id.get_remaining_leaves_for_employee(context)
-                    remaining = remaining_dic[leave_request.type_id.id]
-                    if leave_request.duration > remaining:
-                        return (remaining, hrself.TIME_UNITS_DICT[leave_request.unit])
-            return None 
-
     def _check_allowed_duration(self, cr, uid, ids, context=None):
-        """Check that the leave request duration is not greater than allowed.
-        For the moment, only takes into account leaves 
-        where date from is equal to date to.
-        :return: (allowed duration, unit)
-        :rtype: (int, str)"""
+        """
+            Check that the leave request duration is not greater than allowed.
+            For the moment, only takes into account leaves 
+            where date from is equal to date to.
+            :return: (allowed duration, unit)
+            :rtype: (int, str)
+        """
         for leave in self.browse(cr, uid, ids, context=context):
             date_from = leave.date_from
             date_to = leave.date_to
+            employee_id = leave.employee_id.id
+            services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
+            activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_to, context=context)
             if date_from == date_to:
-                employee_id = leave.employee_id.id
+                
                 search_ids = self.search(cr, uid, [
                     ('employee_id', '=', employee_id),
                     '|', ('state', '=', STATE_APPROVED), ('state', '=', STATE_CONFIRMED),
@@ -968,16 +904,18 @@
                         # then the service will already decrease the allowed duration.
                         # Otherwise, we have to decrease it ourselves.
                         if search_leave.state == STATE_CONFIRMED or not type_precision.prestation_code_id:
-                            if search_leave.unit == hrself.TIME_UNIT_HOUR:
-                                already_taken += search_leave.duration
-                            else:
-                                already_taken += search_leave.duration_in_hour
-                services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
-                activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_to, context=context)
+                            already_taken += search_leave.duration_in_hour
+                
                 max_duration = self._duration(cr, uid, leave.type_id.id, AM_PM_ALL_DAY, activities)['value']['duration_in_hour']
                 allowed_duration = max(round(max_duration - already_taken, 2), 0.0)
-                if leave.duration > allowed_duration:
+                if leave.duration_in_hour > allowed_duration:
                     return (allowed_duration, hrself.TIME_UNIT_HOUR_LABEL)
+            elif leave.unit != hrself.TIME_UNIT_HOUR:
+                compute_duration = self._duration(cr, uid, leave.type_id.id, leave.am_pm, activities).get('value', {}).get('duration', -1)
+                disable_check = self._disable_checks(cr, uid, leave.type_id.id, leave.activity_context_id.id)
+                if leave.duration != compute_duration and not disable_check:
+                    return (compute_duration, hrself.TIME_UNIT_DAY_LABEL)
+                
         return False
 
     def _check_priority(self, cr, uid, ids, context=None):
@@ -1062,13 +1000,9 @@
         if self._overlap(cr, uid, ids):
             raise osv.except_osv(_('Warning!'), _('One of the leave request you want to confirm is overlapping an existing one.'))
 
-        remaining = self._check_balance(cr, uid, ids)
-        if remaining :
-            raise osv.except_osv(_('Warning!'), _('The leave request duration is greater than balance. \n You have %d %s(s) left.') % remaining)
-        
         allowed = self._check_allowed_duration(cr, uid, ids, context=context)
         if allowed :
-            raise osv.except_osv(_('Warning!'), _('The leave request duration is greater than allowed. \n You have %.2f %s(s) left.') % allowed)
+            raise osv.except_osv(_('Warning!'), _('The leave request duration is different than allowed. \n %.2f %s(s) is allowed.') % allowed)
         
         for leave_request in self.browse(cr, uid, ids, context=context):
             type_name = self._check_priority(cr, uid, ids, context)
@@ -1079,6 +1013,16 @@
             workflow_id = leave_request._get_workflow_id()
             self._create_workflow(cr, uid, leave_request.id, workflow_id)
             self.write(cr, uid, [leave_request.id], {'state': STATE_CONFIRMED})
+            
+            self.pool.get('hrself.holidays.balance').update_balance(cr, uid, leave_request.employee_id.id, 
+                                                                    leave_request.type_id.id, leave_request.activity_context_id.id, 
+                                                                    leave_request.date_to, context=context)
+            #Polish error message
+            if not self.pool.get('hrself.holidays.balance').check_all_balance_positive(cr, uid, leave_request.employee_id.id, 
+                                                                                       leave_request.type_id.id, leave_request.activity_context_id.id,
+                                                                                       leave_request.date_to, context=context ):
+                raise osv.except_osv(_('Warning!'), _('The leave request duration is greater than balance.'))
+        
         return True
 
     def _transfer_to_approver(self, cr, uid, ids):
@@ -1139,7 +1083,12 @@
 
     def refuse(self, cr, uid, ids, context=None):
         """Action executed when a leave request is refused"""
-        return self._change_state(cr, uid, ids, STATE_REFUSED, context=context)
+        result = self._change_state(cr, uid, ids, STATE_REFUSED, context=context)
+        for leave_request in self.browse(cr, uid, ids, context=context):
+            self.pool.get('hrself.holidays.balance').update_balance(cr, uid, leave_request.employee_id.id, 
+                                                                    leave_request.type_id.id, leave_request.activity_context_id.id, 
+                                                                    leave_request.date_to, context=context)
+        return result
 
     def cancel(self, cr, uid, ids, context=None):
         """Action executed when a leave request is cancelled"""
@@ -1449,8 +1398,108 @@
         'type_id': fields.many2one('hrself.holidays.type', 'Leave Type', required=True),
         'unit': fields.selection(hrself.TIME_UNITS, 'Time unit', required=True),
         'initial_value': fields.float('Initial value', required=True),
-        'today_balance': fields.float('Balance (Today)', required=True),
         'end_year_balance': fields.float('Balance (End of the year)', required=True),
+        'date' : fields.date("Date of the balance", required=True),
     }
+    
+    def check_all_balance_positive(self, cr, uid, employee_id, type_id, activity_context_id, date, context=None):
+        precision_id = self.pool.get('hrself.holidays.type').precision_id_for_context(cr, uid, [type_id], activity_context_id)
+        type_precision = self.pool.get('hrself.holidays.type.precision').browse(cr, uid, precision_id)
+        if type_precision.is_unlimited :
+            return True
+        
+        balance_ids = self.get_balance_ids(cr, uid, employee_id, type_id, date, context=context)
+        for balance in self.browse(cr, uid, balance_ids, context=context):
+            if balance.end_year_balance < 0:
+                return False
+        return True
+    
+    def get_balance_ids(self, cr, uid, employee_id, type_id, effective_date, context=None):
+        current_year = hrself_datetime.to_date(effective_date).year
+        start_of_year = hrself_datetime.to_string(datetime.date(current_year, 1, 1))
+        return self.search(cr, uid, [('employee_id', '=', employee_id), ('type_id', '=', type_id), ('date', '<=', effective_date), ('date', '>=', start_of_year)], order='date desc', context=context)
+    
+    def get_all_balance_ids(self, cr, uid, employee_ids, date, context=None):
+        """ Get the balance at a given date for an employee and all leave types."""
+        sql = "SELECT DISTINCT ON (employee_id, type_id) id, employee_id, type_id, date " + \
+            "FROM hrself_holidays_balance WHERE date <= '%s' AND employee_id in %%s ORDER BY employee_id, type_id, date DESC;" % date
+        cr.execute(sql, (tuple(employee_ids),))
+        return [r[0] for r in cr.fetchall()]
+    
+    def get_employee_balance_ids(self, cr, uid, employee_id, type_ids, date, context=None):
+        """ Get the balance at a given date for an employee and leave types."""
+        sql = "SELECT DISTINCT ON (employee_id, type_id) id, employee_id, type_id, date " + \
+            "FROM hrself_holidays_balance WHERE date <= '%s' AND employee_id = %s AND type_id in %%s " % (date, employee_id) + \
+            "ORDER BY employee_id, type_id, date DESC;"
+        cr.execute(sql, (tuple(type_ids),))
+        return [r[0] for r in cr.fetchall()]
+            
+    def update_balance(self, cr, uid, employee_id, type_id, activity_context_id, date, context=None):
+        """
+            Update balance after a modification of a initialization or a leave
+            is_init : False, mean the modification come from a leave modification
+                   True mean the modification come from a leave modification
+        """
+        year = hrself_datetime.to_date(date).year
+        self._delete_balance(cr, uid, employee_id, type_id, date, context=context)
+        self._create_balance(cr, uid, employee_id, type_id, date, activity_context_id, context)
+        self.compute_all_balance(cr, uid, employee_id, type_id, activity_context_id, year, context)
+            
+    def _delete_balance(self, cr, uid, employee_id, type_id, date, context=None):
+        year = hrself_datetime.to_date(date).year
+        start_of_year = hrself_datetime.to_string(datetime.date(year, 1, 1))
+        end_of_year = hrself_datetime.to_string(datetime.date(year, 12, 31)) 
+        balance_ids = self.search(cr, uid, [('employee_id', '=', employee_id), ('type_id', '=', type_id), ('date', '<=', end_of_year), ('date', '>=', start_of_year)], context=context)
+        self.unlink(cr, uid, balance_ids, context=context)
+        
+    def _create_balance(self, cr, uid, employee_id, type_id, date, activity_context_id, context=None):
+        year = hrself_datetime.to_date(date).year
+        start_of_year = hrself_datetime.to_string(datetime.date(year, 1, 1))
+        end_of_year = hrself_datetime.to_string(datetime.date(year, 12, 31)) 
+        
+        init_obj = self.pool.get('hrself.holidays.request.initialization')
+        init_request_ids = init_obj.search(cr, uid, [('employee_id', '=', employee_id), ('type_id', '=', type_id), ('date_from', '<=', end_of_year), ('date_from', '>=', start_of_year)], context=context)
+        precision_id = self.pool.get('hrself.holidays.type').precision_id_for_context(cr, uid, [type_id], activity_context_id)
+        unit = self.pool.get('hrself.holidays.type.precision').browse(cr, uid, precision_id, context=context).unit
+        data = {
+                'employee_id' : employee_id,
+                'type_id' : type_id,
+                'unit' : unit,
+                'end_year_balance' : 0,
+            }
+        for init_request in init_obj.browse(cr, uid, init_request_ids, context=context):
+            data.update({
+                'initial_value' : init_request.duration, 
+                'date' : init_request.date_from, 
+            })
+            self.create(cr, uid, data, context=context)
+        #If there is no balance the 1st january, create one with initiatl value = 0 
+        balance_ids = self.search(cr, uid, [('employee_id', '=', employee_id), ('type_id', '=', type_id), ('date', '=', start_of_year)] ,context=context)
+        if not balance_ids:
+            data.update({
+                'initial_value' : 0, 
+                'date' : start_of_year, 
+            })
+            self.create(cr, uid, data, context=context)
+        
+    def compute_all_balance(self, cr, uid, employee_id, type_id, activity_context_id, year, context=None):
+        leave_object = self.pool.get('hrself.holidays.request.leave')
+        
+        start_of_year = hrself_datetime.to_string(datetime.date(year, 1, 1))
+        end_of_year = hrself_datetime.to_string(datetime.date(year, 12, 31))
+        end_of_period_year = hrself_datetime.to_string(datetime.date(year + 1, 1, 1))
+        balance_domain = [('type_id', '=', type_id), ('employee_id', '=', employee_id), ('date', '<=', end_of_year), ('date', '>=', start_of_year)]
+        leave_domain = [('type_id', '=', type_id), ('employee_id', '=', employee_id),
+                  ('date_from', '>=', start_of_year), ('state', 'in', [STATE_CONFIRMED, STATE_APPROVED])]
+        
+        balance_ids = self.search(cr, uid, balance_domain, order='date asc', context=context)
+        balances = self.browse(cr, uid, balance_ids, context=context)
+        for i in xrange(0, len(balance_ids)):
+            date_end = i < len(balances) - 1 and balances[i+1].date or end_of_period_year
+            domain = list(leave_domain)
+            domain.append(('date_to', '<', date_end))
+            leave_ids = leave_object.search(cr, uid, domain, context=context)
+            remaining_leaves = balances[i].initial_value - sum(leave.duration for leave in leave_object.browse(cr, uid, leave_ids))
+            self.write(cr, uid, balances[i].id, {'end_year_balance' : remaining_leaves }, context=context)
 
 hrself_holidays_balance()

=== modified file 'hrself_holidays/security/ir.model.access.csv'
--- hrself_holidays/security/ir.model.access.csv	2011-12-05 15:00:14 +0000
+++ hrself_holidays/security/ir.model.access.csv	2011-12-07 15:08:24 +0000
@@ -33,7 +33,7 @@
 "access_hrself_holidays_calendar_proxy","hrself.holidays.calendar.proxy","model_hrself_holidays_calendar_proxy","base.group_user",1,1,1,1
 "access_hrself_holidays_calendar_proxy_config","hrself.holidays.calendar.proxy.config","model_hrself_holidays_calendar_proxy_config","base.group_user",1,0,0,0
 "access_hrself_holidays_theoretical_activity","hrself.holidays.theoretical.activity","model_hrself_holidays_theoretical_activity","base.group_user",1,1,1,1
-"access_hrself_holidays_balance","hrself.holidays.balance","model_hrself_holidays_balance","base.group_user",1,1,1,0
+"access_hrself_holidays_balance","hrself.holidays.balance","model_hrself_holidays_balance","base.group_user",1,1,1,1
 "access_email_template","email.template employee","email_template.model_email_template","base.group_user",1,0,0,0
 "access_email_template_account_system","email_template.account employee","email_template.model_email_template_account","base.group_user",1,0,0,0
 "access_email_template_account_system","email_template.account hrself manager","email_template.model_email_template_account","hrself.group_hr_admin_hrself",1,1,0,0

=== modified file 'hrself_holidays/security/leave_request_security.xml'
--- hrself_holidays/security/leave_request_security.xml	2011-08-26 14:25:55 +0000
+++ hrself_holidays/security/leave_request_security.xml	2011-12-07 15:08:24 +0000
@@ -89,6 +89,18 @@
         </field>
         <field name="groups" eval="[(6, 0, [ref('base.group_hr_user'), ref('hrself.group_hr_approver')])]"/>
     </record>
+    
+    <record id="ir_rule_functionaladmincannotdeletenotdraftleaverequest0" model="ir.rule">
+			<field name="model_id" ref="hrself_holidays.model_hrself_holidays_request_leave"/>
+			<field name="domain_force">[('state', 'in', ('Draft'))]</field>
+			<field name="name">Functional Admin cannot delete not draft Leave request</field>
+			<field eval="0" name="global"/>
+			<field eval="[(6,0,[ref('base.group_hr_manager')])]" name="groups"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="0" name="perm_write"/>
+			<field eval="0" name="perm_read"/>
+			<field eval="0" name="perm_create"/>
+		</record>
 
     </data>
 </openerp>

=== modified file 'hrself_holidays/view/hrself_holidays_view.xml'
--- hrself_holidays/view/hrself_holidays_view.xml	2011-11-29 15:58:54 +0000
+++ hrself_holidays/view/hrself_holidays_view.xml	2011-12-07 15:08:24 +0000
@@ -36,8 +36,8 @@
                     <field name="type_id"/>
                     <field name="unit"/>
                     <field name="initial_value"/>
-                    <field name="today_balance"/>
                     <field name="end_year_balance"/>
+                	<field name="date" />
                 </form>
             </field>
         </record>
@@ -52,8 +52,23 @@
                     <field name="type_id"/>
                     <field name="unit"/>
                     <field name="initial_value"/>
-                    <field name="today_balance"/>
-                    <field name="end_year_balance"/>
+                    <field name="end_year_balance"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="hrself_holidays_balance_complete_tree_view">
+            <field name="name">hrself.holidays.balance.tree</field>
+            <field name="model">hrself.holidays.balance</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Leave Balances">
+                    <field name="employee_id"/>
+                    <field name="type_id"/>
+                    <field name="unit"/>
+                    <field name="initial_value"/>
+                    <field name="end_year_balance"/>
+                    <field name="date" />
                 </tree>
             </field>
         </record>
@@ -65,11 +80,18 @@
             <field name="search_view_id" eval="hrself_holidays_balance_filter_view"/>
         </record>
 
+        <record model="ir.actions.act_window" id="hrself_holidays_balance_complete_action">
+            <field name="res_model">hrself.holidays.balance</field>
+            <field name="view_type">form</field>
+            <field name="view_id" eval="hrself_holidays_balance_complete_tree_view"/>
+            <field name="search_view_id" eval="hrself_holidays_balance_filter_view"/>
+        </record>
+
         <menuitem
             name="Leave Balances"
             parent="menu_open_request_holidays"
             id="hrself_holidays_balance_menu"
-            action="hrself_holidays_balance_action"
+            action="hrself_holidays_balance_complete_action"
             groups = "-base.group_hr_manager,base.group_erp_manager,hrself.group_hr_admin_hrself"
             sequence="50"
         />
@@ -204,15 +226,15 @@
             <field name="arch" type="xml">
                 <form string="Leave Request">
                     <group col="6" colspan="4">
-                        <field name="employee_id" on_change="onchange_employee_id(employee_id,date_from,date_to,type_id,am_pm,context)"/>
-                        <field name="date_from" on_change="onchange_date_from(employee_id,date_from,date_to,type_id,am_pm,context)"/>
-                        <field name="date_to" required="1" on_change="onchange_date_to(employee_id,date_to,date_from,type_id,am_pm,context)"/>
-                        <field name="type_id" default_focus="1" on_change="onchange_type(employee_id,date_from,date_to,type_id,am_pm,context)" context="{'employee_id': employee_id, 'date_from': date_from, 'date_to': date_to}" attrs="{'readonly': ['|', ('date_from', '=', False), ('employee_id', '=', False)]}"/>
-                        <field name="duration" on_change="onchange_duration(employee_id,date_from,date_to,type_id,duration,unit,am_pm,context)"/>
-                        <field name="unit" on_change="onchange_unit(employee_id,date_from,date_to,type_id,unit,am_pm,context)"/>
-                        <field name="reason_id" domain="[('type_id', '=', type_id)]"/>
-                        <field name="name"/>
-                        <field name="am_pm" on_change="onchange_am_pm(employee_id,date_from,date_to,type_id,am_pm,context)"/>
+                        <field name="employee_id" on_change="onchange_date_type(employee_id,date_from,date_to,type_id,am_pm, context)" />
+                        <field name="date_from" on_change="onchange_date(employee_id,date_from,date_to,type_id,am_pm, context)" />
+                        <field name="date_to" required="1" on_change="onchange_date(employee_id,date_from,date_to,type_id,am_pm, context)" />
+                        <field name="type_id" default_focus="1" on_change="onchange_date_type(employee_id,date_from,date_to,type_id,am_pm, context)" context="{'employee_id': employee_id, 'date_from': date_from, 'date_to': date_to}" attrs="{'readonly': [('employee_id', '=', False)]}" />
+                        <field name="duration"/>
+                        <field name="unit" on_change="onchange_unit(employee_id,date_from,date_to,type_id,am_pm, context)" />
+                        <field name="reason_id" domain="[('type_id', '=', type_id)]" />
+                        <field name="name" />
+                        <field name="am_pm" on_change="onchange_date_type(employee_id,date_from,date_to,type_id,am_pm, context)"/>
                         <!-- Duration (in hour) is visible when the unit is day.
                         So the opposite is: duration (in hour) is invisible when the unit is not day. -->
                         <field name="duration_in_hour" attrs="{'invisible': [('unit', '!=', 1)]}"/>

=== modified file 'hrself_holidays/wizard/hrself_report_wizard.py'
--- hrself_holidays/wizard/hrself_report_wizard.py	2011-12-01 13:46:13 +0000
+++ hrself_holidays/wizard/hrself_report_wizard.py	2011-12-07 15:08:24 +0000
@@ -137,61 +137,13 @@
 
     def print_report(self, cr, uid, ids, context=None):
         """Print the report."""
-        type_object = self.pool.get('hrself.holidays.type')
+        year = datetime.date.today().year
+        end_of_year = to_string(datetime.date(year, 12, 31)) 
         balance_object = self.pool.get('hrself.holidays.balance')
-        activity_context_object = self.pool.get('hrself.activity.context')
         wizard = self.browse(cr, uid, ids[0], context=context)
-        end_year = datetime.date(datetime.date.today().year, 12, 31)
-        balance_ids = []
-        employee_object = self.pool.get('hr.employee')
-        employee_ids = []
-        employee_object = self.pool.get('hr.employee')
-        for employee in wizard.employee_ids:
-            employee_ids.append(employee.id)
-        activity_context_ids = employee_object.get_today_activity_context_id(cr, uid, employee_ids, context=context)
-        end_year_activity_context_ids = employee_object.get_one_day_activity_context_id(cr, uid, employee_ids, end_year, context=context)
-        for employee in wizard.employee_ids:
-            balance_context = {
-                'employee_id': employee.id,
-            }
-            remaining_date_to = datetime.date.today()
-            #employee_activity_context = employee.get_today_activity_context_id(context)
-            activity_context_id = activity_context_ids[employee.id]
-            if activity_context_id:
-                context['activity_context_id']= activity_context_id
-                type_ids = type_object.search(cr, uid, [], context=context)
-                del context['activity_context_id']
-                today_balances = type_object.compute_values(cr, uid, type_ids, context=balance_context, remaining_date_to=remaining_date_to)
-                services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
-                #activities = services.get_theoretical_activities(cr, uid, employee.id, end_year, end_year, context=context)
-                end_year_activity_context_id = end_year_activity_context_ids[employee.id]
-                if end_year_activity_context_id:
-                    balance_context['activity_context'] = end_year_activity_context_id
-                end_year_balances = type_object.get_remaining_leaves_for_employee(cr, uid, type_ids, context=balance_context)
-                for type in type_object.browse(cr, uid, type_ids, context=context):
-                    initial_value = type.get_initialization_duration_for_employee(context=balance_context)[type.id]
-                    search_ids = balance_object.search(cr, uid, [('employee_id', '=', employee.id), ('type_id', '=', type.id)], context=context)
-                    if search_ids:
-                        balance_object.write(cr, uid, search_ids, {
-                            'unit': today_balances[type.id]['unit'],
-                            'initial_value': initial_value,
-                            'today_balance': today_balances[type.id]['remaining_leaves'],
-                            'end_year_balance': end_year_balances.get(type.id, 0),
-                        }, context=context)
-                        balance_id = search_ids[0]
-                    else:
-                        balance_id = balance_object.create(cr, uid, {
-                            'employee_id': employee.id,
-                            'type_id': type.id,
-                            'unit': today_balances[type.id]['unit'],
-                            'initial_value': initial_value,
-                            'today_balance': today_balances[type.id]['remaining_leaves'],
-                            'end_year_balance': end_year_balances.get(type.id, 0),
-                        }, context=context)
-                    balance_ids.append(balance_id)
-            else:
-                raise osv.except_osv(_('Warning!'), _('Unable to find activity context for employee %s %s (id: %d).') % (employee.name, employee.first_name, employee.id))
-
+        employee_ids = [employee.id for employee in wizard.employee_ids]
+        balance_ids = balance_object.get_all_balance_ids(cr, uid, employee_ids, end_of_year, context=context)
+        
         model_data_object = self.pool.get('ir.model.data')
         model_data_id = model_data_object._get_id(cr, uid, 'hrself_holidays', 'hrself_holidays_balance_action')
         window_id = model_data_object.browse(cr, uid, model_data_id, context=context).res_id