';
print '
'; // ancre
@@ -1251,8 +1252,6 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
$genallowed=$user->rights->societe->lire;
$delallowed=$user->rights->societe->creer;
- $var=true;
-
print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
// Show direct download link
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 8f3ea9c2588..97b31e09010 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -292,6 +292,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{
$result = $db->query($sql);
$nbtotalofrecords = $db->num_rows($result);
+ if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0
+ {
+ $page = 0;
+ $offset = 0;
+ }
}
$sql.= $db->plimit($limit+1, $offset);
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 8e391b0f1dd..1c9b4afc5ec 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -527,8 +527,8 @@ if (empty($reshook))
$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
$date_end=dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
$ref_supplier = GETPOST('fourn_ref','alpha');
-
- if (GETPOST('prod_entry_mode') == 'free')
+ $prod_entry_mode = GETPOST('prod_entry_mode');
+ if ($prod_entry_mode == 'free')
{
$idprod=0;
$price_ht = GETPOST('price_ht');
@@ -543,6 +543,7 @@ if (empty($reshook))
$qty = GETPOST('qty' . $predef);
$remise_percent = GETPOST('remise_percent' . $predef);
+ $price_ht_devise = GETPOST('multicurrency_price_ht');
// Extrafields
$extrafieldsline = new ExtraFields($db);
@@ -556,17 +557,17 @@ if (empty($reshook))
}
}
- if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && GETPOST('type') < 0) {
+ if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('type') < 0) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
$error ++;
}
- if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && $price_ht == '') // Unit price can be 0 but not ''. Also price can be negative for proposal.
+ if ($prod_entry_mode == 'free' && empty($idprod) && $price_ht == '') // Unit price can be 0 but not ''. Also price can be negative for proposal.
{
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
$error ++;
}
- if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc)) {
+ if ($prod_entry_mode == 'free' && empty($idprod) && empty($product_desc)) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")), null, 'errors');
$error ++;
}
@@ -581,16 +582,14 @@ if (empty($reshook))
// Ecrase $pu par celui du produit
// Ecrase $desc par celui du produit
// Ecrase $txtva par celui du produit
- if ((GETPOST('prod_entry_mode') != 'free') && empty($error)) // With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
+ if ($prod_entry_mode != 'free' && empty($error)) // With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
{
$productsupplier = new ProductFournisseur($db);
- if (empty($conf->global->SUPPLIER_PROPOSAL_WITH_NOPRICEDEFINED)) // TODO this test seems useless
- {
- $idprod=0;
- if (GETPOST('idprodfournprice') == -1 || GETPOST('idprodfournprice') == '') $idprod=-99; // Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)
- }
- if (preg_match('/^idprod_([0-9]+)$/',GETPOST('idprodfournprice'), $reg))
+ $idprod=0;
+ if (GETPOST('idprodfournprice') == -1 || GETPOST('idprodfournprice') == '') $idprod=-99; // Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)
+
+ if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice'), $reg))
{
$idprod=$reg[1];
$res=$productsupplier->fetch($idprod);
@@ -608,12 +607,16 @@ if (empty($reshook))
if ($idprod > 0)
{
- $pu_ht = $productsupplier->fourn_pu;
- $price_base_type = $productsupplier->fourn_price_base_type;
- $type = $productsupplier->type;
$label = $productsupplier->label;
+
$desc = $productsupplier->description;
if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
+
+ $pu_ht = $productsupplier->fourn_pu;
+
+ $type = $productsupplier->type;
+ $price_base_type = ($productsupplier->fourn_price_base_type?$productsupplier->fourn_price_base_type:'HT');
+
$ref_supplier = $productsupplier->ref_supplier;
$tva_tx = get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
@@ -665,7 +668,7 @@ if (empty($reshook))
setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
}
}
- else if((GETPOST('price_ht')!=='' || GETPOST('price_ttc')!=='') && empty($error)) // Free product
+ else if((GETPOST('price_ht')!=='' || GETPOST('price_ttc')!=='') && empty($error)) // Free product. // $price_ht is already set
{
$pu_ht = price2num($price_ht, 'MU');
$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
@@ -683,20 +686,19 @@ if (empty($reshook))
$localtax1_tx= get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
$localtax2_tx= get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
- if (GETPOST('price_ht')!=='')
+ if ($price_ht !== '')
{
- $price_base_type = 'HT';
- $ht = price2num(GETPOST('price_ht'));
- $ttc = 0;
+ $pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
}
else
{
- $ttc = price2num(GETPOST('price_ttc'));
- $ht = $ttc / (1 + ($tva_tx / 100));
- $price_base_type = 'HT';
+ $pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
+ $pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
}
+ $price_base_type = 'HT';
+ $pu_ht_devise = price2num($price_ht_devise, 'MU');
- $result = $object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $ref_supplier, $fk_unit);
+ $result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $ref_supplier, $fk_unit);
//$result = $object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, $ttc, $type,'','', $date_start, $date_end, $array_options, $fk_unit);
}
@@ -772,6 +774,7 @@ if (empty($reshook))
// Mise a jour d'une ligne dans la demande de prix
else if ($action == 'updateligne' && $user->rights->supplier_proposal->creer && GETPOST('save') == $langs->trans("Save")) {
+
// Define info_bits
$info_bits = 0;
if (preg_match('/\*/', GETPOST('tva_tx')))
@@ -810,6 +813,16 @@ if (empty($reshook))
// Check minimum price
$productid = GETPOST('productid', 'int');
if (! empty($productid)) {
+
+ $productsupplier = new ProductFournisseur($db);
+ if (! empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY))
+ {
+ if ($productid > 0 && $productsupplier->get_buyprice(0, price2num($_POST['qty']), $productid, 'none', GETPOST('socid','int')) < 0 )
+ {
+ setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
+ }
+ }
+
$product = new Product($db);
$res = $product->fetch($productid);
@@ -1674,7 +1687,9 @@ if ($action == 'create')
// Add free products/services form
global $forceall, $senderissupplier, $dateSelector;
- $forceall=1; $senderissupplier=2; $dateSelector=0; // $senderissupplier=2 is same than 1 but disable test on minimum qty.
+ $forceall=1; $dateSelector=0;
+ $senderissupplier=2; // $senderissupplier=2 is same than 1 but disable test on minimum qty.
+ if (! empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY)) $senderissupplier=1;
if (! empty($object->lines))
$ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1);
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index b88d24070c6..a39fba04b81 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -394,10 +394,72 @@ class SupplierProposal extends CommonObject
// Check parameters
if ($type < 0) return -1;
- if ($this->statut == 0)
+ if ($this->statut == self::STATUS_DRAFT)
{
$this->db->begin();
+ if ($fk_product > 0)
+ {
+ if (! empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY))
+ {
+ // Check quantity is enough
+ dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." fk_prod_fourn_price=".$fk_prod_fourn_price." qty=".$qty." ref_supplier=".$ref_supplier);
+ $prod = new Product($this->db, $fk_product);
+ if ($prod->fetch($fk_product) > 0)
+ {
+ $product_type = $prod->type;
+ $label = $prod->label;
+
+ // We use 'none' instead of $ref_supplier, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
+ // If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
+ $result=$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc?$this->fk_soc:$this->socid)); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
+ if ($result > 0)
+ {
+ $pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
+ $ref_supplier = $prod->ref_supplier; // Ref supplier price set by get_buyprice
+ // is remise percent not keyed but present for the product we add it
+ if ($remise_percent == 0 && $prod->remise_percent !=0)
+ $remise_percent =$prod->remise_percent;
+ }
+ if ($result == 0) // If result == 0, we failed to found the supplier reference price
+ {
+ $langs->load("errors");
+ $this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
+ $this->db->rollback();
+ dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
+ //$pu = $prod->fourn_pu; // We do not overwrite unit price
+ //$ref = $prod->ref_fourn; // We do not overwrite ref supplier price
+ return -1;
+ }
+ if ($result == -1)
+ {
+ $langs->load("errors");
+ $this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
+ $this->db->rollback();
+ dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
+ return -1;
+ }
+ if ($result < -1)
+ {
+ $this->error=$prod->error;
+ $this->db->rollback();
+ dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
+ return -1;
+ }
+ }
+ else
+ {
+ $this->error=$prod->error;
+ $this->db->rollback();
+ return -1;
+ }
+ }
+ }
+ else
+ {
+ $product_type = $type;
+ }
+
// Calcul du total TTC et de la TVA pour la ligne a partir de
// qty, pu, remise_percent et txtva
// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 15392dcb1c1..6cc5b54f050 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -332,6 +332,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{
$resql = $db->query($sql);
$nbtotalofrecords = $db->num_rows($resql);
+ if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0
+ {
+ $page = 0;
+ $offset = 0;
+ }
}
$sql.= $db->plimit($limit + 1,$offset);
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 93981a73c2e..b7fa85d5194 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -994,9 +994,6 @@ select.selectarrowonleft option {
text-overflow: ellipsis;
white-space: nowrap;
}
- div.fiche {
- margin-top: px !important;
- }
div.titre {
/* margin-top: 12px; */
/* line-height: 2em; */
@@ -1229,8 +1226,8 @@ div.fiche {
div.fiche {
margin-: dol_optimize_smallscreen)?'25':'6')); ?>px;
margin-: dol_optimize_smallscreen)?'24':'6')); ?>px;
- dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
- dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
+
+
}
body.onlinepaymentbody div.fiche { /* For online payment page */
margin: 20px !important;
@@ -1280,7 +1277,6 @@ div.secondcolumn div.box {
div.fiche {
margin-: px;
margin-: px;
- dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
}
div.fichecenter {
width: 100%;
@@ -3230,6 +3226,9 @@ span.boxstatstext img, a.dashboardlineindicatorlate img {
a img {
border: 0;
}
+.boxstatsindicator.thumbstat150 { /* If we remove this, box position is ko on ipad */
+ display: inline-flex;
+}
span.boxstatsindicator {
font-size: 130%;
font-weight: normal;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5970ad6ef84..fdc0a3e908b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1234,7 +1234,7 @@ div.fiche {
div.fiche {
margin-: dol_optimize_smallscreen)?'24':'6')); ?>px;
margin-: dol_optimize_smallscreen)?'22':'6')); ?>px;
- dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
+
margin-bottom: 15px;
}
body.onlinepaymentbody div.fiche { /* For online payment page */
@@ -3190,6 +3190,9 @@ span.boxstatstext {
color: #000;
/* opacity: 0.7; */ /* a bug if browser make z-index infintie when opacity is set so we disable it */
}
+.boxstatsindicator.thumbstat150 { /* If we remove this, box position is ko on ipad */
+ display: inline-flex;
+}
span.boxstatsindicator {
font-size: 110%;
font-weight: normal;
diff --git a/htdocs/ticketsup/class/api_ticketsups.class.php b/htdocs/ticketsup/class/api_ticketsups.class.php
index ee696b34505..98af42fd262 100644
--- a/htdocs/ticketsup/class/api_ticketsups.class.php
+++ b/htdocs/ticketsup/class/api_ticketsups.class.php
@@ -258,16 +258,15 @@ class Ticketsups extends DolibarrApi
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
$result = $db->query($sql);
$nbtotalofrecords = $db->num_rows($result);
- }
-
- if ($limit) {
- if ($page < 0) {
- $page = 0;
+ if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0
+ {
+ $page = 0;
+ $offset = 0;
}
- $offset = $limit * $page;
-
- $sql.= $db->plimit($limit + 1, $offset);
}
+
+ $sql.= $db->plimit($limit + 1, $offset);
+
$result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
diff --git a/htdocs/ticketsup/list.php b/htdocs/ticketsup/list.php
index 61dcf45ba83..d2127fd875f 100644
--- a/htdocs/ticketsup/list.php
+++ b/htdocs/ticketsup/list.php
@@ -255,12 +255,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{
$result = $db->query($sql);
$nbtotalofrecords = $db->num_rows($result);
-}
-// if total resultset is smaller then paging size (filtering), goto and load page 0
-if (($page * $limit) > $nbtotalofrecords)
-{
- $page = 0;
- $offset = 0;
+ if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0
+ {
+ $page = 0;
+ $offset = 0;
+ }
}
// if total resultset is smaller the limit, no need to do paging.
if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 096567d728a..2bcf4fc0663 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -411,6 +411,11 @@ if ($result > 0)
{
$result = $db->query($sql);
$nbtotalofrecords = $db->num_rows($result);
+ if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0
+ {
+ $page = 0;
+ $offset = 0;
+ }
}
$sql.= $db->plimit($limit+1, $offset);
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index a53db61a83c..ffc0f3a6af5 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -37,19 +37,25 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
// Some value of modulepart can be used to get resources that are public so no login are required.
-if ((isset($_GET["modulepart"]) && ($_GET["modulepart"] == 'mycompany' || $_GET["modulepart"] == 'companylogo')) && ! defined("NOLOGIN"))
+if ((isset($_GET["modulepart"]) && ($_GET["modulepart"] == 'mycompany' || $_GET["modulepart"] == 'companylogo')))
{
- define("NOLOGIN",'1');
+ if (! defined("NOLOGIN")) define("NOLOGIN",1);
+ if (! defined("NOCSRFCHECK")) define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
+ if (! defined("NOIPCHECK")) define("NOIPCHECK",1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
}
// For direct external download link, we don't need to load/check we are into a login session
if (isset($_GET["hashp"]) && ! defined("NOLOGIN"))
{
- define("NOLOGIN",1);
+ if (! defined("NOLOGIN")) define("NOLOGIN",1);
+ if (! defined("NOCSRFCHECK")) define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
+ if (! defined("NOIPCHECK")) define("NOIPCHECK",1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
}
// Some value of modulepart can be used to get resources that are public so no login are required.
-if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias') && ! defined("NOLOGIN"))
+if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias'))
{
- define("NOLOGIN",'1');
+ if (! defined("NOLOGIN")) define("NOLOGIN",1);
+ if (! defined("NOCSRFCHECK")) define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
+ if (! defined("NOIPCHECK")) define("NOIPCHECK",1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
// For multicompany
$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
if (is_numeric($entity)) define("DOLENTITY", $entity);
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 5113e5971b0..43ff66dc656 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -73,7 +73,14 @@ $error=0;
$now=dol_now();
@set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." ***** userlogin=" . $userlogin . " ***** " . $now . " *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." ***** userlogin=" . $userlogin . " ***** " . dol_print_date($now, 'dayrfc') . " *****\n";
+
+// Check module cron is activated
+if (empty($conf->cron->enabled))
+{
+ print "Error: module Scheduled jobs (cron) not activated\n";
+ exit(-1);
+}
// Check module cron is activated
if (empty($conf->cron->enabled))
@@ -161,7 +168,7 @@ $nbofjobs=count($qualifiedjobs);
$nbofjobslaunchedok=0;
$nbofjobslaunchedko=0;
-if(is_array($qualifiedjobs) && (count($qualifiedjobs)>0))
+if (is_array($qualifiedjobs) && (count($qualifiedjobs)>0))
{
// Loop over job
foreach($qualifiedjobs as $line)
@@ -172,7 +179,7 @@ if(is_array($qualifiedjobs) && (count($qualifiedjobs)>0))
//If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database
if (($line->datenextrun < $now) && (empty($line->datestart) || $line->datestart <= $now) && (empty($line->dateend) || $line->dateend >= $now))
{
- dol_syslog("cron_run_jobs.php:: to run line->datenextrun:".dol_print_date($line->datenextrun,'dayhourrfc')." line->datestart:".dol_print_date($line->datestart,'dayhourrfc')." line->dateend:".dol_print_date($line->dateend,'dayhourrfc')." now:".dol_print_date($now,'dayhourrfc'));
+ dol_syslog("cron_run_jobs.php line->datenextrun:".dol_print_date($line->datenextrun,'dayhourrfc')." line->datestart:".dol_print_date($line->datestart,'dayhourrfc')." line->dateend:".dol_print_date($line->dateend,'dayhourrfc')." now:".dol_print_date($now,'dayhourrfc'));
$cronjob=new Cronjob($db);
$result=$cronjob->fetch($line->id);
@@ -211,10 +218,14 @@ if(is_array($qualifiedjobs) && (count($qualifiedjobs)>0))
}
else
{
- dol_syslog("cron_run_jobs.php:: job not qualified line->datenextrun:".dol_print_date($line->datenextrun,'dayhourrfc')." line->datestart:".dol_print_date($line->datestart,'dayhourrfc')." line->dateend:".dol_print_date($line->dateend,'dayhourrfc')." now:".dol_print_date($now,'dayhourrfc'));
+ dol_syslog("cron_run_jobs.php job not qualified line->datenextrun:".dol_print_date($line->datenextrun,'dayhourrfc')." line->datestart:".dol_print_date($line->datestart,'dayhourrfc')." line->dateend:".dol_print_date($line->dateend,'dayhourrfc')." now:".dol_print_date($now,'dayhourrfc'));
}
}
}
+else
+{
+ echo "cron_run_jobs.php no qualified job found\n";
+}
$db->close();