Automated merge from 22.0 to 23.0 by tool pullmerge.sh
This commit is contained in:
commit
4908f4acba
1 changed files with 1 additions and 1 deletions
|
|
@ -1023,7 +1023,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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue