vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0

Browse source
This commit is contained in:
Laurent Destailleur 2025-12-11 01:58:16 +01:00
commit fe123327bc
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
htdocs/comm/propal/class/propal.class.php
View file

@ -272,12 +272,12 @@ class Propal extends CommonObject
public $address;
/**
* @var int availability ID
* @var ?int availability ID can be null in db
*/
public $availability_id;
/**
* @var int availability ID
* @var ?int availability ID
* @deprecated
* @see $availability_id
*/

2
htdocs/core/class/commonobject.class.php
View file

@ -490,7 +490,7 @@ abstract class CommonObject
public $fk_delivery_address;
/**
* @var int Shipping method ID
* @var ?int Shipping method ID
* @see setShippingMethod()
*/
public $shipping_method_id;

5
htdocs/holiday/class/holiday.class.php
View file

@ -898,8 +898,9 @@ class Holiday extends CommonObject
if ($checkBalance > 0) {
$balance = $this->getCPforUser($this->fk_user, $this->fk_type);
$days = num_between_day($this->date_debut, $this->date_fin);
if ($balance - $days < 0 && getDolGlobalString('HOLIDAY_DISALLOW_NEGATIVE_BALANCE')) {
$days = num_public_holiday($this->date_debut, $this->date_fin);
if ((($balance - $days) < 0) && getDolGlobalString('HOLIDAY_DISALLOW_NEGATIVE_BALANCE')) {
$this->error = 'LeaveRequestCreationBlockedBecauseBalanceIsNegative';
return -1;
}