diff --git a/htdocs/public/bookcal/bookcalAjax.php b/htdocs/public/bookcal/bookcalAjax.php index e90acd821e5..7ba08e409d8 100644 --- a/htdocs/public/bookcal/bookcalAjax.php +++ b/htdocs/public/bookcal/bookcalAjax.php @@ -98,8 +98,8 @@ if ($action == 'verifyavailability') { $i = 0; while ($i < $num) { $obj = $db->fetch_object($resql); - $starttime = dol_stringtotime($obj->start, 0); - $endtime = dol_stringtotime($obj->end, 0); + $starttime = $db->jdate($obj->start); + $endtime = $db->jdate($obj->end); $offsetmin = $obj->duration % 60; if ($offsetmin == 0) { $offsetmin = 60; diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php index b94ed396326..fa6e1d120b5 100644 --- a/htdocs/salaries/class/paymentsalary.class.php +++ b/htdocs/salaries/class/paymentsalary.class.php @@ -124,15 +124,16 @@ class PaymentSalary extends CommonObject public $type_label; /** - * @var bank_account description] + * @var int bank account description */ public $bank_account; /** - * @var validation date + * @var int|string validation date */ public $datev = ''; + /** * @var int chid * @deprecated * @see $id from CommonObject