Automated merge from 19.0 to 20.0 by tool pullmerge.sh

This commit is contained in:
Laurent Destailleur 2026-03-15 12:15:32 +01:00
commit e77af9c26c

View file

@ -1009,7 +1009,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);
if ($balance < 0) {