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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-29 17:05:15 +01:00
commit c606e4b943
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/boxes/box_scheduled_jobs.php
View File

@ -42,6 +42,9 @@ class box_scheduled_jobs extends ModeleBoxes
*/ */
public $db; public $db;
/**
* @var string params
*/
public $param; public $param;
public $info_box_head = array(); public $info_box_head = array();
@ -101,7 +104,9 @@ class box_scheduled_jobs extends ModeleBoxes
if (dol_eval($objp->test, 1, 1)) { if (dol_eval($objp->test, 1, 1)) {
$nextrun = $this->db->jdate($objp->datenextrun); $nextrun = $this->db->jdate($objp->datenextrun);
if (empty($nextrun)) $nextrun = $this->db->jdate($objp->datestart); if (empty($nextrun)) {
$nextrun = $this->db->jdate($objp->datestart);
}
if ($line == 0 || ($nextrun < $cronstatic->datenextrun && (empty($objp->nbrun) || empty($objp->maxrun) || $objp->nbrun < $objp->maxrun))) { if ($line == 0 || ($nextrun < $cronstatic->datenextrun && (empty($objp->nbrun) || empty($objp->maxrun) || $objp->nbrun < $objp->maxrun))) {
$cronstatic->id = $objp->rowid; $cronstatic->id = $objp->rowid;