Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
01a94d22bb
@ -103,7 +103,7 @@ class box_scheduled_jobs extends ModeleBoxes
|
|||||||
$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 < $obj->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;
|
||||||
$cronstatic->ref = $objp->rowid;
|
$cronstatic->ref = $objp->rowid;
|
||||||
$cronstatic->label = $langs->trans($objp->label);
|
$cronstatic->label = $langs->trans($objp->label);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user