Merge remote-tracking branch 'Dolibarr/develop' into develop

htdocs/bom/tpl/objectline_create.tpl.php

@@ -81,7 +81,7 @@ if ($nolinesbefore) {
 		print '</span></td>';
 	}
 	?>
-	<td class="linecollost right"><?php echo $langs->trans('ManufacturingEfficiency'); ?></td>
+	<td class="linecollost right"><?php echo $form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')); ?></td>
 	<td class="linecoledit" colspan="<?php echo $colspan; ?>">&nbsp;</td>
 </tr>
 <?php

htdocs/comm/mailing/card.php

@@ -870,7 +870,7 @@ else
                     }
 				    $text.=$langs->trans('ConfirmSendingEmailing').'<br>';
 					$text.=$langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
-					print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('SendMailing'), $text, 'sendallconfirmed', $formquestion, '', 1, 300);
+					print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('SendMailing'), $text, 'sendallconfirmed', $formquestion, '', 1, 330, 600);
 				}
 			}
 

htdocs/compta/facture/class/facture.class.php

@@ -4602,6 +4602,7 @@ class FactureLigne extends CommonInvoiceLine
 			if ($result <= 0)
 			{
 				$this->error='ErrorProductIdDoesNotExists';
+				dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 				return -1;
 			}
 		}

htdocs/core/class/CMailFile.class.php

@@ -506,7 +506,7 @@ class CMailFile
 			}
 
 			$sendingmode = $this->sendmode;
-			if (! empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail')
+			if ($this->context == 'emailing' && ! empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail')
 			{
 			    // List of sending methods
 			    $listofmethods=array();

htdocs/core/class/html.formfile.class.php

@@ -688,7 +688,9 @@ class FormFile
 			$out.= '<tr class="liste_titre">';
 
 			$addcolumforpicto=($delallowed || $printer || $morepicto);
-			$out.= '<th colspan="'.(3+($addcolumforpicto?1:0)).'" class="formdoc liste_titre maxwidthonsmartphone center">';
+			$colspan = (3+($addcolumforpicto?1:0)); $colspanmore = 0;
+
+			$out.= '<th colspan="'.$colspan.'" class="formdoc liste_titre maxwidthonsmartphone center">';
 
 			// Model
 			if (! empty($modellist))
@@ -745,13 +747,17 @@ class FormFile
 			{
 				foreach($hookmanager->hooks['formfile'] as $module)
 				{
-					if (method_exists($module, 'formBuilddocLineOptions')) $out .= '<th></th>';
+					if (method_exists($module, 'formBuilddocLineOptions'))
+					{
+						$colspanmore++;
+						$out .= '<th></th>';
+					}
 				}
 			}
 			$out.= '</tr>';
 
 			// Execute hooks
-			$parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart);
+			$parameters=array('colspan'=>($colspan+$colspanmore), 'socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''), 'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''), 'modulepart'=>$modulepart);
 			if (is_object($hookmanager))
 			{
 				$reshook = $hookmanager->executeHooks('formBuilddocOptions', $parameters, $GLOBALS['object']);
@@ -848,14 +854,17 @@ class FormFile
 
 					if (is_object($hookmanager))
 					{
-						$parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart,'relativepath'=>$relativepath);
+						$parameters=array('colspan'=>($colspan+$colspanmore), 'socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart,'relativepath'=>$relativepath);
 						$res = $hookmanager->executeHooks('formBuilddocLineOptions', $parameters, $file);
 						if (empty($res))
 						{
 							$out.= $hookmanager->resPrint;		// Complete line
 							$out.= '</tr>';
 						}
-						else $out = $hookmanager->resPrint;		// Replace line
+						else
+						{
+							$out = $hookmanager->resPrint;		// Replace all $out
+						}
 			  		}
 				}
 

htdocs/holiday/card.php

@@ -71,6 +71,11 @@ $error = 0;
  * Actions
  */
 
+if (GETPOST('cancel', 'alpha'))
+{
+    $action = '';
+}
+
 // If create a request
 if ($action == 'create')
 {
@@ -193,7 +198,35 @@ if ($action == 'create')
     }
 }
 
-if ($action == 'update')
+if ($action == 'update' && GETPOSTISSET('savevalidator') && ! empty($user->rights->holiday->approve))
+{
+    $object = new Holiday($db);
+    $object->fetch($id);
+
+    $object->oldcopy = dol_clone($object);
+
+    $object->fk_validator = GETPOST('valideur', 'int');
+
+    if ($object->fk_validator != $object->oldcopy->fk_validator)
+    {
+        $verif = $object->update($user);
+
+        if ($verif <= 0)
+        {
+            setEventMessages($object->error, $object->errors, 'warnings');
+            $action='editvalidator';
+        }
+        else
+        {
+            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+            exit;
+        }
+    }
+
+    $action = '';
+}
+
+if ($action == 'update' && ! GETPOSTISSET('savevalidator'))
 {
 	$date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
 	$date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
@@ -1087,9 +1120,10 @@ else
             {
                 $head=holiday_prepare_head($object);
 
-                if ($action == 'edit' && $object->statut == 1)
+                if (($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) || ($action == 'editvalidator'))
                 {
-                    $edit = true;
+                	if ($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) $edit = true;
+
                     print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">'."\n";
                     print '<input type="hidden" name="action" value="update"/>'."\n";
                     print '<input type="hidden" name="id" value="'.$object->id.'" />'."\n";
@@ -1129,7 +1163,7 @@ else
 			    $starthalfday=($object->halfday == -1 || $object->halfday == 2)?'afternoon':'morning';
 			    $endhalfday=($object->halfday == 1 || $object->halfday == 2)?'morning':'afternoon';
 
-                if(!$edit)
+                if (!$edit)
                 {
                     print '<tr>';
                     print '<td class="nowrap">'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
@@ -1178,7 +1212,7 @@ else
                 print '<td>'.num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday).'</td>';
                 print '</tr>';
 
-                if ($object->statut == 5)
+                if ($object->statut == Holiday::STATUS_REFUSED)
                 {
                 	print '<tr>';
                 	print '<td>'.$langs->trans('DetailRefusCP').'</td>';
@@ -1228,25 +1262,40 @@ else
                 }
 
                 // Validator
-                if (!$edit) {
+                if (!$edit && $action != 'editvalidator') {
                     print '<tr>';
                     print '<td class="titlefield">';
-                    if ($object->statut == 3 || $object->statut == 4) print $langs->trans('ApprovedBy');
+                    if ($object->statut == Holiday::STATUS_APPROVED || $object->statut == Holiday::STATUS_CANCELED) print $langs->trans('ApprovedBy');
                     else print $langs->trans('ReviewedByCP');
                     print '</td>';
-                    print '<td>'.$valideur->getNomUrl(-1).'</td>';
+                    print '<td>'.$valideur->getNomUrl(-1);
+                    $include_users = $object->fetch_users_approver_holiday();
+                    if (is_array($include_users) && in_array($user->id, $include_users) && $object->statut != Holiday::STATUS_DRAFT)
+                    {
+                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editvalidator">'.img_edit($langs->trans("Edit")).'</a>';
+                    }
+                    print '</td>';
                     print '</tr>';
                 } else {
                 	print '<tr>';
                     print '<td class="titlefield">'.$langs->trans('ReviewedByCP').'</td>';
                     print '<td>';
                     $include_users = $object->fetch_users_approver_holiday();
+                    if (! in_array($object->fk_validator, $include_users))  // Add the current validator to the list to not lose it when editing.
+                    {
+                        $include_users[]=$object->fk_validator;
+                    }
                     if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
                     else
                     {
-                    	$s=$form->select_dolusers($object->fk_validator, "valideur", 1, ($user->admin ? '' : array($user->id)), 0, $include_users);
+                        $s=$form->select_dolusers($object->fk_validator, "valideur", (($action == 'editvalidator') ? 0 : 1), ($user->admin ? '' : array($user->id)), 0, $include_users);
                     	print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
                     }
+                    if ($action == 'editvalidator')
+                    {
+                        print '<input type="submit" class="button" name="savevalidator" value="'.$langs->trans("Save").'">';
+                        print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+                    }
                     print '</td>';
                     print '</tr>';
                 }
@@ -1255,19 +1304,19 @@ else
                 print '<td>'.$langs->trans('DateCreateCP').'</td>';
                 print '<td>'.dol_print_date($object->date_create, 'dayhour').'</td>';
                 print '</tr>';
-                if ($object->statut == 3 || $object->statut == 4) {
+                if ($object->statut == Holiday::STATUS_APPROVED || $object->statut == Holiday::STATUS_CANCELED) {
                     print '<tr>';
                     print '<td>'.$langs->trans('DateValidCP').'</td>';
                     print '<td>'.dol_print_date($object->date_valid, 'dayhour').'</td>';		// warning: date_valid is approval date on holiday module
                     print '</tr>';
                 }
-                if ($object->statut == 4) {
+                if ($object->statut == Holiday::STATUS_CANCELED) {
                     print '<tr>';
                     print '<td>'.$langs->trans('DateCancelCP').'</td>';
                     print '<td>'.dol_print_date($object->date_cancel, 'dayhour').'</td>';
                     print '</tr>';
                 }
-                if ($object->statut == 5) {
+                if ($object->statut == Holiday::STATUS_REFUSED) {
                     print '<tr>';
                     print '<td>'.$langs->trans('DateRefusCP').'</td>';
                     print '<td>'.dol_print_date($object->date_refuse, 'dayhour').'</td>';
@@ -1325,20 +1374,21 @@ else
                 	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleSetToDraft"), $langs->trans("ConfirmSetToDraft"), "confirm_draft", '', 1, 1);
                 }
 
-
+                if (($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) || ($action == 'editvalidator'))
-                if ($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT)
                 {
-                    print '<div class="center">';
+                    if ($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT)
-                    if ($cancreate && $object->statut == Holiday::STATUS_DRAFT)
                     {
-                        print '<input type="submit" value="'.$langs->trans("Save").'" class="button">';
+                        print '<div class="center">';
+                        if ($cancreate && $object->statut == Holiday::STATUS_DRAFT)
+                        {
+                            print '<input type="submit" value="'.$langs->trans("Save").'" class="button">';
+                        }
+                        print '</div>';
                     }
-                    print '</div>';
 
                     print '</form>';
                 }
 
-
                 if (! $edit)
                 {
 		            print '<div class="tabsAction">';

htdocs/public/cron/cron_run_jobs.php

@@ -51,7 +51,8 @@ dol_include_once("/cron/class/cronjob.class.php");
 global $langs, $conf;
 
 // Language Management
-$langs->loadLangs(array("admin", "cron"));
+$langs->loadLangs(array("admin", "cron", "dict"));
+
 
 
 
@@ -59,6 +60,9 @@ $langs->loadLangs(array("admin", "cron"));
  * View
  */
 
+// current date
+$now=dol_now();
+
 // Check the key, avoid that a stranger starts cron
 $key = GETPOST('securitykey', 'alpha');
 if (empty($key))
@@ -84,15 +88,15 @@ $result=$user->fetch('', $userlogin);
 if ($result < 0)
 {
 	echo "User Error:".$user->error;
-	dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_WARNING);
+	dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
 	exit;
 }
 else
 {
 	if (empty($user->id))
 	{
-		echo " User user login:".$userlogin." do not exists";
+		echo " User login:".$userlogin." do not exists";
-		dol_syslog(" User user login:".$userlogin." do not exists", LOG_WARNING);
+		dol_syslog(" User login:".$userlogin." do not exists", LOG_ERR);
 		exit;
 	}
 }
@@ -103,8 +107,7 @@ $id = GETPOST('id', 'alpha');	// We accept non numeric id. We will filter later.
 $object = new Cronjob($db);
 
 $filter=array();
-if (! empty($id))
+if (! empty($id)) {
-{
 	if (! is_numeric($id))
 	{
 		echo "Error: Bad value for parameter job id";
@@ -118,7 +121,7 @@ $result = $object->fetch_all('ASC,ASC,ASC', 't.priority,t.entity,t.rowid', 0, 0,
 if ($result<0)
 {
 	echo "Error: ".$object->error;
-	dol_syslog("cron_run_jobs.php fetch Error".$object->error, LOG_WARNING);
+	dol_syslog("cron_run_jobs.php fetch Error".$object->error, LOG_ERR);
 	exit;
 }
 
@@ -132,37 +135,76 @@ foreach($object->lines as $val)
 // TODO Duplicate code. This sequence of code must be shared with code into cron_run_jobs.php script.
 
 // current date
-$now=dol_now();
 $nbofjobs=count($qualifiedjobs);
 $nbofjobslaunchedok=0;
 $nbofjobslaunchedko=0;
 
 if (is_array($qualifiedjobs) && (count($qualifiedjobs)>0))
 {
-	// Loop over job
+    $savconf = dol_clone($conf);
+
+    // Loop over job
 	foreach($qualifiedjobs as $line)
 	{
-		dol_syslog("cron_run_jobs.php cronjobid: ".$line->id, LOG_WARNING);
+	    dol_syslog("cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label, LOG_DEBUG);
+	    echo "cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label;
 
-		//If date_next_jobs is less of current dat, execute the program, and store the execution time of the next execution in database
+		// Force reload of setup for the current entity
+		if ($line->entity != $conf->entity)
+		{
+		    dol_syslog("cron_run_jobs.php we work on another entity so we reload user and conf", LOG_DEBUG);
+		    echo " -> we change entity so we reload user and conf";
+
+		    $conf->entity = (empty($line->entity)?1:$line->entity);
+		    $conf->setValues($db);        // This make also the $mc->setValues($conf); that reload $mc->sharings
+
+		    // Force recheck that user is ok for the entity to process and reload permission for entity
+		    if ($conf->entity != $user->entity && $user->entity != 0)
+		    {
+		        $result=$user->fetch('', $userlogin, '', 0, $conf->entity);
+		        if ($result < 0)
+		        {
+		            echo "\nUser Error: ".$user->error."\n";
+		            dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
+		            exit(-1);
+		        }
+		        else
+		        {
+		            if ($result == 0)
+		            {
+		                echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
+		                dol_syslog("User login:".$userlogin." does not exists", LOG_ERR);
+		                exit(-1);
+		            }
+		        }
+		        $user->getrights();
+		    }
+		}
+
+		//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:: torun line->datenextrun:".dol_print_date($line->datenextrun, 'dayhourtext')." line->dateend:".dol_print_date($line->dateend, 'dayhourtext')." now:".dol_print_date($now, 'dayhourtext'));
+		    echo " - qualified";
+
+		    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);
 			if ($result<0)
 			{
-				echo "Error cronjob->fetch: ".$cronjob->error."<br>\n";
+			    echo "Error cronjobid: ".$line->id." cronjob->fetch: ".$cronjob->error."\n";
+			    echo "Failed to fetch job ".$line->id."\n";
 				dol_syslog("cron_run_jobs.php::fetch Error".$cronjob->error, LOG_ERR);
 				exit;
 			}
-			// Execut job
+			// Execute job
 			$result=$cronjob->run_jobs($userlogin);
 			if ($result < 0)
 			{
-				echo "Error cronjob->run_job: ".$cronjob->error."<br>\n";
+			    echo "Error cronjobid: ".$line->id." cronjob->run_job: ".$cronjob->error."\n";
-				dol_syslog("cron_run_jobs.php::run_jobs Error".$cronjob->error, LOG_ERR);
+			    echo "At least one job failed. Go on menu Home-Setup-Admin tools to see result for each job.\n";
+			    echo "You can also enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
+			    dol_syslog("cron_run_jobs.php::run_jobs Error".$cronjob->error, LOG_ERR);
 				$nbofjobslaunchedko++;
 			}
 			else
@@ -170,16 +212,30 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs)>0))
 				$nbofjobslaunchedok++;
 			}
 
+			echo " - result of run_jobs = ".$result;
+
 			// We re-program the next execution and stores the last execution time for this job
 			$result=$cronjob->reprogram_jobs($userlogin, $now);
 			if ($result<0)
 			{
-				echo "Error cronjob->reprogram_job: ".$cronjob->error."<br>\n";
+			    echo "Error cronjobid: ".$line->id." cronjob->reprogram_job: ".$cronjob->error."\n";
-				dol_syslog("cron_run_jobs.php::reprogram_jobs Error".$cronjob->error, LOG_ERR);
+			    echo "Enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
+			    dol_syslog("cron_run_jobs.php::reprogram_jobs Error".$cronjob->error, LOG_ERR);
 				exit;
 			}
+
+			echo " - reprogrammed\n";
+		}
+		else
+		{
+		    echo " - not qualified\n";
+
+		    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'));
 		}
 	}
+
+	$conf = $savconf;
+
 	echo "Result: ".($nbofjobs)." jobs - ".($nbofjobslaunchedok+$nbofjobslaunchedko)." launched = ".$nbofjobslaunchedok." OK + ".$nbofjobslaunchedko." KO";
 }
 else

scripts/cron/cron_run_jobs.php

@@ -24,17 +24,13 @@
  * \ingroup cron
  * \brief Execute pendings jobs
  */
-if (! defined('NOTOKENRENEWAL'))
+
-	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-	define('NOREQUIREMENU', '1');
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREHTML'))
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-	define('NOREQUIREHTML', '1');
+if (! defined('NOLOGIN'))        define('NOLOGIN','1');
-if (! defined('NOREQUIREAJAX'))
+
-	define('NOREQUIREAJAX', '1');
-if (! defined('NOLOGIN'))
-	define('NOLOGIN', '1');
-// if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
@@ -68,12 +64,14 @@ $userlogin = $argv[2];
 $version = DOL_VERSION;
 $error = 0;
 
+// Language Management
+$langs->loadLangs(array('main', 'admin', 'cron', 'dict'));
+
+
 /*
  * Main
  */
 
-$langs->loadLangs(array('main','dict'));
-
 // current date
 $now = dol_now();
 
@@ -148,31 +146,66 @@ if (! empty($id)) {
 $result = $object->fetch_all('ASC,ASC,ASC', 't.priority,t.entity,t.rowid', 0, 0, 1, $filter, 0);
 if ($result < 0) {
 	echo "Error: " . $object->error;
-	dol_syslog("cron_run_jobs.php:: fetch Error " . $object->error, LOG_ERR);
+	dol_syslog("cron_run_jobs.php fetch Error " . $object->error, LOG_ERR);
 	exit(- 1);
 }
 
 $qualifiedjobs = array();
 foreach ($object->lines as $val) {
 	if (! verifCond($val->test))
+	{
 		continue;
+	}
 	$qualifiedjobs[] = $val;
 }
 
-// TODO Duplicate. This sequence of code must be shared with code into public/cron/cron_run_jobs.php php page.
+// TODO Duplicate code. This sequence of code must be shared with code into public/cron/cron_run_jobs.php php page.
 
 $nbofjobs = count($qualifiedjobs);
 $nbofjobslaunchedok = 0;
 $nbofjobslaunchedko = 0;
 
 if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
+    $savconf = dol_clone($conf);
+
 	// Loop over job
 	foreach ($qualifiedjobs as $line) {
-		dol_syslog("cron_run_jobs.php cronjobid: " . $line->id . " priority=" . $line->priority . " entity=" . $line->entity . " label=" . $line->label, LOG_DEBUG);
+		dol_syslog("cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label, LOG_DEBUG);
+		echo "cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label;
 
-		echo "cron_run_jobs.php cronjobid: " . $line->id . " priority=" . $line->priority . " entity=" . $line->entity . " label=" . $line->label;
+		// Force reload of setup for the current entity
+		if ($line->entity != $conf->entity)
+		{
+		    dol_syslog("cron_run_jobs.php we work on another entity so we reload user and conf", LOG_DEBUG);
+		    echo " -> we change entity so we reload user and conf";
 
-		// If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database
+		    $conf->entity = (empty($line->entity)?1:$line->entity);
+		    $conf->setValues($db);        // This make also the $mc->setValues($conf); that reload $mc->sharings
+
+		    // Force recheck that user is ok for the entity to process and reload permission for entity
+		    if ($conf->entity != $user->entity && $user->entity != 0)
+		    {
+    		    $result=$user->fetch('', $userlogin, '', 0, $conf->entity);
+    		    if ($result < 0)
+    		    {
+    		        echo "\nUser Error: ".$user->error."\n";
+    		        dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
+    		        exit(-1);
+    		    }
+    		    else
+    		    {
+    		        if ($result == 0)
+    		        {
+    		            echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
+    		            dol_syslog("User login:".$userlogin." does not exists", LOG_ERR);
+    		            exit(-1);
+    		        }
+    		    }
+    		    $user->getrights();
+		    }
+		}
+
+		//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)) {
 			echo " - qualified";
 
@@ -200,7 +233,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
 
 			echo " - result of run_jobs = " . $result;
 
-			// we re-program the next execution and stores the last execution time for this job
+			// We re-program the next execution and stores the last execution time for this job
 			$result = $cronjob->reprogram_jobs($userlogin, $now);
 			if ($result < 0) {
 				echo "Error cronjobid: " . $line->id . " cronjob->reprogram_job: " . $cronjob->error . "\n";
@@ -216,7 +249,11 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
 			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 {
+
+	$conf = $savconf;
+}
+else
+{
 	echo "cron_run_jobs.php no qualified job found\n";
 }