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

Dolibarr · Feb 12, 2024 · 2e620c9 · 2e620c9
2 parents 6553336 + 6ef86d2
commit 2e620c9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
@@ -179,8 +179,8 @@
 
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate) {
-		if (!GETPOST('socid', 3)) {
-			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
+		if (!($socid > 0)) {
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('IdThirdParty')), null, 'errors');
 		} else {
 			if ($object->id > 0) {
 				if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY)) {

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
@@ -207,7 +207,7 @@ public function executeHooks($method, $parameters = array(), &$object = '', &$ac
 		}
 
 		// Init return properties
-		$this->resPrint = '';
+		$localResPrint = '';
 		$this->resArray = array();
 		$this->resNbOfHooks = 0;
 
@@ -270,9 +270,9 @@ public function executeHooks($method, $parameters = array(), &$object = '', &$ac
 						}
 						if (!empty($actionclassinstance->resprints)) {
 							if ($resactiontmp > 0) {
-								$this->resPrint = $actionclassinstance->resprints;
+								$localResPrint = $actionclassinstance->resprints;
 							} else {
-								$this->resPrint .= $actionclassinstance->resprints;
+								$localResPrint .= $actionclassinstance->resprints;
 							}
 						}
 					} else {
@@ -294,7 +294,7 @@ public function executeHooks($method, $parameters = array(), &$object = '', &$ac
 							$this->resArray = array_merge($this->resArray, $actionclassinstance->results);
 						}
 						if (!empty($actionclassinstance->resprints)) {
-							$this->resPrint .= $actionclassinstance->resprints;
+							$localResPrint .= $actionclassinstance->resprints;
 						}
 						if (is_numeric($resactiontmp) && $resactiontmp < 0) {
 							$error++;
@@ -307,7 +307,7 @@ public function executeHooks($method, $parameters = array(), &$object = '', &$ac
 						if (!is_array($resactiontmp) && !is_numeric($resactiontmp)) {
 							dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
 							if (empty($actionclassinstance->resprints)) {
-								$this->resPrint .= $resactiontmp;
+								$localResPrint .= $resactiontmp;
 							}
 						}
 					}
@@ -320,6 +320,8 @@ public function executeHooks($method, $parameters = array(), &$object = '', &$ac
 			}
 		}
 
+		$this->resPrint = $localResPrint;
+
 		return ($error ? -1 : $resaction);
 	}
 }
diff --git a/htdocs/fichinter/agenda.php b/htdocs/fichinter/agenda.php
@@ -90,7 +90,8 @@
 	$socid = $user->socid;
 }
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
-restrictedArea($user, 'ficheinter', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
+restrictedArea($user, 'ficheinter', $object->id, 'fichinter', '', 'fk_soc', 'rowid', $isdraft);
+
 
 
 /*

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
@@ -60,7 +60,7 @@
 $object = new Mo($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->mrp->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('mocard', 'globalcard')); // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('moproduction', 'globalcard')); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);