Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove warnings

Browse Source
This commit is contained in:
Laurent Destailleur 2019-03-15 18:09:44 +01:00
parent ab4076c54a
commit d075e97ba6
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/cron/class/cronjob.class.php
View File

@ -67,7 +67,13 @@ class Cronjob extends CommonObject
public $md5params;
public $module_name;
public $priority;
/**
* @var string|int Date for last job execution
*/
public $datelastrun='';
/**
* @var string|int Date for next job execution
*/
public $datenextrun='';
public $dateend='';
public $datestart='';
@ -1220,7 +1226,7 @@ class Cronjob extends CommonObject
$result=$user->fetch('', $userlogin);
if ($result<0)
{
$this->error="User Error:".$user->error;
$this->error="User Error : ".$user->error;
dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
return -1;
}

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

@ -1023,12 +1023,12 @@ class Holiday extends CommonObject
* Warning: It consumes a lot of memory because it load in ->holiday all holiday of a dedicated user at each call.
*
* @param int $fk_user Id user
* @param date $dateStart Start date of period to check
* @param date $dateEnd End date of period to check
* @param integer $dateStart Start date of period to check
* @param integer $dateEnd End date of period to check
* @param int $halfday Tag to define how start and end the period to check:
* 0:Full days, 2:Start afternoon end morning, -1:Start afternoon end afternoon, 1:Start morning end morning
* @return boolean False = New range overlap an existing holiday, True = no overlapping (is never on holiday during checked period).
* @see verifDateHolidayForTimestamp
* @see verifDateHolidayForTimestamp()
*/
public function verifDateHolidayCP($fk_user, $dateStart, $dateEnd, $halfday = 0)
{
@ -1107,10 +1107,10 @@ class Holiday extends CommonObject
* Check that a user is not on holiday for a particular timestamp
*
* @param int $fk_user Id user
* @param timestamp $timestamp Time stamp date for a day (YYYY-MM-DD) without hours (= 12:00AM in english and not 12:00PM that is 12:00)
* @param integer $timestamp Time stamp date for a day (YYYY-MM-DD) without hours (= 12:00AM in english and not 12:00PM that is 12:00)
* @param string $status Filter on holiday status. '-1' = no filter.
* @return array array('morning'=> ,'afternoon'=> ), Boolean is true if user is available for day timestamp.
* @see verifDateHolidayCP
* @see verifDateHolidayCP()
*/
public function verifDateHolidayForTimestamp($fk_user, $timestamp, $status = '-1')
{
@ -1222,7 +1222,7 @@ class Holiday extends CommonObject
*
* @param int $statut id statut
* @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
* @param date $startdate Date holiday should start
* @param integer $startdate Date holiday should start
* @return string Label
*/
public function LibStatut($statut, $mode = 0, $startdate = '')