lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: leave request blocking when balance negative: don't check when creating, check only when updating not in draft

Browse Source
This commit is contained in:
Marc de Lima Lucio 2021-09-30 17:48:20 +02:00
parent 78b593c067
commit 7c8fb4a5fb
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/holiday/class/holiday.class.php
View File

@ -270,17 +270,6 @@ class Holiday extends CommonObject
$this->error = "ErrorBadParameterFkType"; return -1;
}
$checkBalance = getDictvalue(MAIN_DB_PREFIX.'c_holiday_types', 'block_if_negative', $this->fk_type);
if ($checkBalance > 0) {
$balance = $this->getCPforUser($this->fk_user, $this->fk_type);
if ($balance < 0) {
$this->error = 'LeaveRequestCreationBlockedBecauseBalanceIsNegative';
return -1;
}
}
// Insert request
$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday(";
$sql .= "ref,";
@ -910,7 +899,7 @@ class Holiday extends CommonObject
$checkBalance = getDictvalue(MAIN_DB_PREFIX.'c_holiday_types', 'block_if_negative', $this->fk_type);
if ($checkBalance > 0) {
if ($checkBalance > 0 && $this->statut != self::STATUS_DRAFT) {
$balance = $this->getCPforUser($this->fk_user, $this->fk_type);
if ($balance < 0) {