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

Dolibarr · Apr 27, 2024 · 8db9b30 · 8db9b30
2 parents c0359b3 + 74bc383
commit 8db9b30
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
@@ -214,7 +214,7 @@
 					}
 
 					if ($module->isEnabled()) {
-						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
+						print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
 						print $module->info($langs);
 						print '</td>';
 

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
@@ -1508,6 +1508,9 @@
 $totalarray['val']['f.total_localtax1'] = 0;
 $totalarray['val']['f.total_localtax1'] = 0;
 $totalarray['val']['f.total_ttc'] = 0;
+$totalarray['val']['totalam']=0;
+$totalarray['val']['rtp']=0;
+
 $imaxinloop = ($limit ? min($num, $limit) : $num);
 while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);

diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php
@@ -46,6 +46,7 @@
 $result = restrictedArea($user, $object->element, $object->id, 'paiementfourn', '');
 
 // Security check
+$socid = ''; // Prevents PHP Warning:  Undefined variable $socid on line 55
 if ($user->socid) {
 	$socid = $user->socid;
 }

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
@@ -308,7 +308,14 @@ public function create($user, $notrigger = 0)
 
 		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task");
+			// Update extrafield
+			$result = $this->insertExtraFields();
+			if ($result < 0) {
+				$error++;
+			}
+		}
 
+		if (!$error) {
 			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('TASK_CREATE', $user);
@@ -319,14 +326,6 @@ public function create($user, $notrigger = 0)
 			}
 		}
 
-		// Update extrafield
-		if (!$error) {
-			$result = $this->insertExtraFields();
-			if ($result < 0) {
-				$error++;
-			}
-		}
-
 		// Commit or rollback
 		if ($error) {
 			foreach ($this->errors as $errmsg) {