Modification condition attribution statut delay

lacagette_addons/lacagette_membership/models/res_partner.py

@@ -76,19 +76,6 @@ class ResPartner(models.Model):
 
 
     @api.multi
-    def get_makeups_choosen_shifts(self):
-        for partner in self:
-            cond = [
-                      ['partner_id', '=', partner.id],
-                      ['shift_type', '=', 'standard'],
-                      ['is_makeup', '=', True],
-                      ['date_begin', '>=', datetime.datetime.now().isoformat()],
-                      ['state', '=', 'open']
-                   ]
-            fields = ['id']
-            return self.env['shift.registration'].search_read(cond, fields)
-
-    @api.multi
     def _compute_lacagette_working_state(self):
         _logger.debug("Dans _compute_lacagette_working_state")
         conf = self.env['ir.config_parameter']
@@ -128,7 +115,7 @@ class ResPartner(models.Model):
                                   self.env['shift.counter.event'].unsubscribe_partner(partner, unsubscribe_limit, points)
                                else:
                                   if partner.date_alert_stop:
-                                        if partner.date_delay_stop and partner.date_delay_stop > current_datetime:
+                                        if partner.makeups_to_do == 0 and partner.date_delay_stop and partner.date_delay_stop > current_datetime:
                                              state = 'delay'
                                         else:
                                              state = 'suspended'

lacagette_addons/lacagette_membership/models/shift_counter_event.py

@@ -181,8 +181,6 @@ class ShiftCounterEvent(models.Model):
                             if partner.makeups_to_do == 0:
                                 target_status = 'up_to_date'
                             else:
-                                already_choosen_makeups_to_do = partner.get_makeups_choosen_shifts()
-                                _logger.info("already_choosen_makeups_to_do : %s", str(already_choosen_makeups_to_do))
                                 target_status = 'delay'
                     if target_status is not None:
                         vals_for_update = {'working_state': target_status, 'cooperative_state': target_status}