From bc42bdef49b688d954b776cf4f4d7b1d74da53d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Courtier?= <noe.courtier@scopen.fr>
Date: Thu, 11 May 2023 09:25:07 +0200
Subject: [PATCH 1/4] FIX: wrong colspan for tasks list

---
 htdocs/projet/tasks.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 64d134a7254..53ad98eb194 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -773,7 +773,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	print '</tr>';
 
 	// Other options
-	$parameters = array();
+	$parameters = array('arrayfields' => &$arrayfields);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $taskstatic, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
@@ -1046,7 +1046,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		$j = 0; $level = 0;
 		$nboftaskshown = projectLinesa($j, 0, $tasksarray, $level, true, 0, $tasksrole, $object->id, 1, $object->id, $filterprogresscalc, ($object->usage_bill_time ? 1 : 0), $arrayfields);
 	} else {
-		$colspan = 10;
+		$colspan = count($arrayfields);
 		if ($object->usage_bill_time) {
 			$colspan += 2;
 		}

From 4ad585facc76bc62ff2f3c841bb4bd3b914275e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Courtier?= <noe.courtier@scopen.fr>
Date: Thu, 11 May 2023 11:41:58 +0200
Subject: [PATCH 2/4] FIX: Add Missing rights check on holiday calendar

---
 htdocs/comm/action/index.php | 132 +++++++++++++++++++----------------
 1 file changed, 71 insertions(+), 61 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 9b451a47659..4878ecaa13c 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -582,10 +582,18 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 	// Local calendar
 	$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_mytasks" name="check_mytasks" value="1" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; </div>';
 
-	// Holiday calendar
-	$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="check_holiday"'.($check_holiday ? ' checked' : '').'><label for="check_holiday"> <span class="check_holiday_text">'.$langs->trans("Holidays").'</span></label> &nbsp; </div>';
+    if ($user->rights->holiday->read) {
+        // Holiday calendar
+        $s .= '
+            <div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="check_holiday"' . ($check_holiday
+                    ? ' checked' : '') . '>
+                <label for="check_holiday"> 
+                    <span class="check_holiday_text">' . $langs->trans("Holidays") . '</span>
+                </label> &nbsp; 
+            </div>';
+    }
 
-	// External calendars
+    // External calendars
 	if (is_array($showextcals) && count($showextcals) > 0) {
 		$s .= '<script type="text/javascript">'."\n";
 		$s .= 'jQuery(document).ready(function () {
@@ -1004,77 +1012,79 @@ if ($showbirthday) {
 	}
 }
 
-// LEAVE CALENDAR
-$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.statut, x.rowid, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.statut as status";
-$sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
-$sql .= " WHERE u.rowid = x.fk_user";
-$sql .= " AND u.statut = '1'"; // Show only active users  (0 = inactive user, 1 = active user)
-$sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
+if ($user->rights->holiday->read) {
+    // LEAVE CALENDAR
+    $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.statut, x.rowid, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.statut as status";
+    $sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
+    $sql .= " WHERE u.rowid = x.fk_user";
+    $sql .= " AND u.statut = '1'"; // Show only active users  (0 = inactive user, 1 = active user)
+    $sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
 
-if ($mode == 'show_day') {
-	// Request only leaves for the current selected day
-	$sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin";	// date_debut and date_fin are date without time
-} elseif ($mode == 'show_week') {
-	// TODO: Add filter to reduce database request
-} elseif ($mode == 'show_month') {
-	// TODO: Add filter to reduce database request
-}
+    if ($mode == 'show_day') {
+        // Request only leaves for the current selected day
+        $sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin";	// date_debut and date_fin are date without time
+    } elseif ($mode == 'show_week') {
+        // TODO: Add filter to reduce database request
+    } elseif ($mode == 'show_month') {
+        // TODO: Add filter to reduce database request
+    }
 
-$resql = $db->query($sql);
-if ($resql) {
-	$num = $db->num_rows($resql);
-	$i   = 0;
+    $resql = $db->query($sql);
+    if ($resql) {
+        $num = $db->num_rows($resql);
+        $i   = 0;
 
-	while ($i < $num) {
-		$obj = $db->fetch_object($resql);
+        while ($i < $num) {
+            $obj = $db->fetch_object($resql);
 
-		$event = new ActionComm($db);
+            $event = new ActionComm($db);
 
-		// Need the id of the leave object for link to it
-		$event->id                      = $obj->rowid;
-		$event->ref                     = $event->id;
+            // Need the id of the leave object for link to it
+            $event->id                      = $obj->rowid;
+            $event->ref                     = $event->id;
 
-		$event->type_code = 'HOLIDAY';
-		$event->type_label = '';
-		$event->type_color = '';
-		$event->type = 'holiday';
-		$event->type_picto = 'holiday';
+            $event->type_code = 'HOLIDAY';
+            $event->type_label = '';
+            $event->type_color = '';
+            $event->type = 'holiday';
+            $event->type_picto = 'holiday';
 
-		$event->datep                   = $db->jdate($obj->date_start) + (empty($halfday) || $halfday == 1 ? 0 : 12 * 60 * 60 - 1);
-		$event->datef                   = $db->jdate($obj->date_end) + (empty($halfday) || $halfday == -1 ? 24 : 12) * 60 * 60 - 1;
-		$event->date_start_in_calendar  = $event->datep;
-		$event->date_end_in_calendar    = $event->datef;
+            $event->datep                   = $db->jdate($obj->date_start) + (empty($halfday) || $halfday == 1 ? 0 : 12 * 60 * 60 - 1);
+            $event->datef                   = $db->jdate($obj->date_end) + (empty($halfday) || $halfday == -1 ? 24 : 12) * 60 * 60 - 1;
+            $event->date_start_in_calendar  = $event->datep;
+            $event->date_end_in_calendar    = $event->datef;
 
-		if ($obj->status == 3) {
-			// Show no symbol for leave with state "leave approved"
-			$event->percentage = -1;
-		} elseif ($obj->status == 2) {
-			// Show TO-DO symbol for leave with state "leave wait for approval"
-			$event->percentage = 0;
-		}
+            if ($obj->status == 3) {
+                // Show no symbol for leave with state "leave approved"
+                $event->percentage = -1;
+            } elseif ($obj->status == 2) {
+                // Show TO-DO symbol for leave with state "leave wait for approval"
+                $event->percentage = 0;
+            }
 
-		if ($obj->halfday == 1) {
-			$event->label = $obj->lastname.' ('.$langs->trans("Morning").')';
-		} elseif ($obj->halfday == -1) {
-			$event->label = $obj->lastname.' ('.$langs->trans("Afternoon").')';
-		} else {
-			$event->label = $obj->lastname;
-		}
+            if ($obj->halfday == 1) {
+                $event->label = $obj->lastname.' ('.$langs->trans("Morning").')';
+            } elseif ($obj->halfday == -1) {
+                $event->label = $obj->lastname.' ('.$langs->trans("Afternoon").')';
+            } else {
+                $event->label = $obj->lastname;
+            }
 
-		$daycursor = $event->date_start_in_calendar;
-		$annee = dol_print_date($daycursor, '%Y', 'tzuserrel');
-		$mois = dol_print_date($daycursor, '%m', 'tzuserrel');
-		$jour = dol_print_date($daycursor, '%d', 'tzuserrel');
+            $daycursor = $event->date_start_in_calendar;
+            $annee = dol_print_date($daycursor, '%Y', 'tzuserrel');
+            $mois = dol_print_date($daycursor, '%m', 'tzuserrel');
+            $jour = dol_print_date($daycursor, '%d', 'tzuserrel');
 
-		$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
-		do {
-			$eventarray[$daykey][] = $event;
+            $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
+            do {
+                $eventarray[$daykey][] = $event;
 
-			$daykey += 60 * 60 * 24;
-		} while ($daykey <= $event->date_end_in_calendar);
+                $daykey += 60 * 60 * 24;
+            } while ($daykey <= $event->date_end_in_calendar);
 
-		$i++;
-	}
+            $i++;
+        }
+    }
 }
 
 // EXTERNAL CALENDAR

From d25b226796134b912d91a895017888afd794d3ac Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 11 May 2023 09:50:17 +0000
Subject: [PATCH 3/4] Fixing style errors.

---
 htdocs/comm/action/index.php | 130 +++++++++++++++++------------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 4878ecaa13c..d01351a32a8 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -582,18 +582,18 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 	// Local calendar
 	$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_mytasks" name="check_mytasks" value="1" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; </div>';
 
-    if ($user->rights->holiday->read) {
-        // Holiday calendar
-        $s .= '
+	if ($user->rights->holiday->read) {
+		// Holiday calendar
+		$s .= '
             <div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="check_holiday"' . ($check_holiday
-                    ? ' checked' : '') . '>
+					? ' checked' : '') . '>
                 <label for="check_holiday"> 
                     <span class="check_holiday_text">' . $langs->trans("Holidays") . '</span>
                 </label> &nbsp; 
             </div>';
-    }
+	}
 
-    // External calendars
+	// External calendars
 	if (is_array($showextcals) && count($showextcals) > 0) {
 		$s .= '<script type="text/javascript">'."\n";
 		$s .= 'jQuery(document).ready(function () {
@@ -1013,78 +1013,78 @@ if ($showbirthday) {
 }
 
 if ($user->rights->holiday->read) {
-    // LEAVE CALENDAR
-    $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.statut, x.rowid, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.statut as status";
-    $sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
-    $sql .= " WHERE u.rowid = x.fk_user";
-    $sql .= " AND u.statut = '1'"; // Show only active users  (0 = inactive user, 1 = active user)
-    $sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
+	// LEAVE CALENDAR
+	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.statut, x.rowid, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.statut as status";
+	$sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
+	$sql .= " WHERE u.rowid = x.fk_user";
+	$sql .= " AND u.statut = '1'"; // Show only active users  (0 = inactive user, 1 = active user)
+	$sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
 
-    if ($mode == 'show_day') {
-        // Request only leaves for the current selected day
-        $sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin";	// date_debut and date_fin are date without time
-    } elseif ($mode == 'show_week') {
-        // TODO: Add filter to reduce database request
-    } elseif ($mode == 'show_month') {
-        // TODO: Add filter to reduce database request
-    }
+	if ($mode == 'show_day') {
+		// Request only leaves for the current selected day
+		$sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin";	// date_debut and date_fin are date without time
+	} elseif ($mode == 'show_week') {
+		// TODO: Add filter to reduce database request
+	} elseif ($mode == 'show_month') {
+		// TODO: Add filter to reduce database request
+	}
 
-    $resql = $db->query($sql);
-    if ($resql) {
-        $num = $db->num_rows($resql);
-        $i   = 0;
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		$i   = 0;
 
-        while ($i < $num) {
-            $obj = $db->fetch_object($resql);
+		while ($i < $num) {
+			$obj = $db->fetch_object($resql);
 
-            $event = new ActionComm($db);
+			$event = new ActionComm($db);
 
-            // Need the id of the leave object for link to it
-            $event->id                      = $obj->rowid;
-            $event->ref                     = $event->id;
+			// Need the id of the leave object for link to it
+			$event->id                      = $obj->rowid;
+			$event->ref                     = $event->id;
 
-            $event->type_code = 'HOLIDAY';
-            $event->type_label = '';
-            $event->type_color = '';
-            $event->type = 'holiday';
-            $event->type_picto = 'holiday';
+			$event->type_code = 'HOLIDAY';
+			$event->type_label = '';
+			$event->type_color = '';
+			$event->type = 'holiday';
+			$event->type_picto = 'holiday';
 
-            $event->datep                   = $db->jdate($obj->date_start) + (empty($halfday) || $halfday == 1 ? 0 : 12 * 60 * 60 - 1);
-            $event->datef                   = $db->jdate($obj->date_end) + (empty($halfday) || $halfday == -1 ? 24 : 12) * 60 * 60 - 1;
-            $event->date_start_in_calendar  = $event->datep;
-            $event->date_end_in_calendar    = $event->datef;
+			$event->datep                   = $db->jdate($obj->date_start) + (empty($halfday) || $halfday == 1 ? 0 : 12 * 60 * 60 - 1);
+			$event->datef                   = $db->jdate($obj->date_end) + (empty($halfday) || $halfday == -1 ? 24 : 12) * 60 * 60 - 1;
+			$event->date_start_in_calendar  = $event->datep;
+			$event->date_end_in_calendar    = $event->datef;
 
-            if ($obj->status == 3) {
-                // Show no symbol for leave with state "leave approved"
-                $event->percentage = -1;
-            } elseif ($obj->status == 2) {
-                // Show TO-DO symbol for leave with state "leave wait for approval"
-                $event->percentage = 0;
-            }
+			if ($obj->status == 3) {
+				// Show no symbol for leave with state "leave approved"
+				$event->percentage = -1;
+			} elseif ($obj->status == 2) {
+				// Show TO-DO symbol for leave with state "leave wait for approval"
+				$event->percentage = 0;
+			}
 
-            if ($obj->halfday == 1) {
-                $event->label = $obj->lastname.' ('.$langs->trans("Morning").')';
-            } elseif ($obj->halfday == -1) {
-                $event->label = $obj->lastname.' ('.$langs->trans("Afternoon").')';
-            } else {
-                $event->label = $obj->lastname;
-            }
+			if ($obj->halfday == 1) {
+				$event->label = $obj->lastname.' ('.$langs->trans("Morning").')';
+			} elseif ($obj->halfday == -1) {
+				$event->label = $obj->lastname.' ('.$langs->trans("Afternoon").')';
+			} else {
+				$event->label = $obj->lastname;
+			}
 
-            $daycursor = $event->date_start_in_calendar;
-            $annee = dol_print_date($daycursor, '%Y', 'tzuserrel');
-            $mois = dol_print_date($daycursor, '%m', 'tzuserrel');
-            $jour = dol_print_date($daycursor, '%d', 'tzuserrel');
+			$daycursor = $event->date_start_in_calendar;
+			$annee = dol_print_date($daycursor, '%Y', 'tzuserrel');
+			$mois = dol_print_date($daycursor, '%m', 'tzuserrel');
+			$jour = dol_print_date($daycursor, '%d', 'tzuserrel');
 
-            $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
-            do {
-                $eventarray[$daykey][] = $event;
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
+			do {
+				$eventarray[$daykey][] = $event;
 
-                $daykey += 60 * 60 * 24;
-            } while ($daykey <= $event->date_end_in_calendar);
+				$daykey += 60 * 60 * 24;
+			} while ($daykey <= $event->date_end_in_calendar);
 
-            $i++;
-        }
-    }
+			$i++;
+		}
+	}
 }
 
 // EXTERNAL CALENDAR

From d6a1a4b3d667272d286ea5426660de102cd22a06 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 11 May 2023 15:45:52 +0200
Subject: [PATCH 4/4] fix: html better than text because product label can
 contain html

---
 htdocs/takepos/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 2c44acdaae2..95b53331f49 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -335,7 +335,7 @@ function LoadProducts(position, issubcat) {
 				var titlestring = <?php echo $titlestring; ?>;
 				<?php if (!$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) {
 					echo '$("#prodivdesc"+ishow).show();';
-					echo '$("#prodesc"+ishow).text(data[parseInt(idata)][\'label\']);';
+					echo '$("#prodesc"+ishow).html(data[parseInt(idata)][\'label\']);';
 					echo '$("#proimg"+ishow).attr("title", titlestring);';
 					echo '$("#proimg"+ishow).attr("src", "genimg/index.php?query=pro&id="+data[idata][\'id\']);';
 				} else {