Automated merge from 23.0 to develop

This commit is contained in:
Laurent Destailleur 2026-03-15 12:16:23 +01:00
commit bc29bc1a8a

View file

@ -1024,7 +1024,7 @@ class Holiday extends CommonObject
$checkBalance = getDictionaryValue('c_holiday_types', 'block_if_negative', $this->fk_type, true);
if ($checkBalance > 0 && $this->status != self::STATUS_DRAFT) {
if ($checkBalance > 0 && $this->statut != self::STATUS_DRAFT && $this->statut != self::STATUS_CANCELED) {
$balance = $this->getCPforUser($this->fk_user, $this->fk_type);
$daysAsked = num_open_day($this->date_debut, $this->date_fin, 0, 1);