From 8dd7a22482dcb0a5048dce045dad04881f87cd73 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Mon, 20 Mar 2023 09:45:02 +0100
Subject: [PATCH 1/4] FIX limit after order in get objects in category

---
 htdocs/categories/class/categorie.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 786af013dc6..87c0888ed6f 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -848,10 +848,10 @@ class Categorie extends CommonObject
 		if (($type == 'customer' || $type == 'supplier') && $user->socid > 0) {
 			$sql .= " AND o.rowid = ".((int) $user->socid);
 		}
+		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit > 0 || $offset > 0) {
 			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
-		$sql .= $this->db->order($sortfield, $sortorder);
 
 		dol_syslog(get_class($this)."::getObjectsInCateg", LOG_DEBUG);
 		$resql = $this->db->query($sql);

From fe4b99387151db4ce204eba25926464900ca52d3 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Tue, 21 Mar 2023 17:05:46 +0100
Subject: [PATCH 2/4] FIX change date on select date input when prefix is used

---
 htdocs/core/class/html.form.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 890e662f726..f10ecf5f763 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6522,7 +6522,7 @@ class Form
 			if (empty($labeladddateof)) {
 				$labeladddateof = $langs->trans("DateInvoice");
 			}
-			$retstring .= ' - <button class="dpInvisibleButtons datenowlink" id="dateofinvoice" type="button" name="_dateofinvoice" value="now" onclick="console.log(\'Click on now link\'); jQuery(\'#re\').val(\''.dol_print_date($adddateof, 'dayinputnoreduce').'\');jQuery(\'#reday\').val(\''.$tmparray['mday'].'\');jQuery(\'#remonth\').val(\''.$tmparray['mon'].'\');jQuery(\'#reyear\').val(\''.$tmparray['year'].'\');">'.$labeladddateof.'</a>';
+			$retstring .= ' - <button class="dpInvisibleButtons datenowlink" id="dateofinvoice" type="button" name="_dateofinvoice" value="now" onclick="console.log(\'Click on now link\'); jQuery(\'#'.dol_escape_js($prefix).'\').val(\''.dol_print_date($adddateof, 'dayinputnoreduce').'\');jQuery(\'#'.dol_escape_js($prefix).'day\').val(\''.$tmparray['mday'].'\');jQuery(\'#'.dol_escape_js($prefix).'month\').val(\''.$tmparray['mon'].'\');jQuery(\'#'.dol_escape_js($prefix).'year\').val(\''.$tmparray['year'].'\');">'.$labeladddateof.'</a>';
 		}
 
 		return $retstring;

From b23d3a0edd0e1ebc71fc149d0ab0bfb4a59db3da Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Tue, 21 Mar 2023 17:42:19 +0100
Subject: [PATCH 3/4] fix stickler-ci

---
 htdocs/core/class/html.form.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f10ecf5f763..06616b40d98 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6522,7 +6522,11 @@ class Form
 			if (empty($labeladddateof)) {
 				$labeladddateof = $langs->trans("DateInvoice");
 			}
-			$retstring .= ' - <button class="dpInvisibleButtons datenowlink" id="dateofinvoice" type="button" name="_dateofinvoice" value="now" onclick="console.log(\'Click on now link\'); jQuery(\'#'.dol_escape_js($prefix).'\').val(\''.dol_print_date($adddateof, 'dayinputnoreduce').'\');jQuery(\'#'.dol_escape_js($prefix).'day\').val(\''.$tmparray['mday'].'\');jQuery(\'#'.dol_escape_js($prefix).'month\').val(\''.$tmparray['mon'].'\');jQuery(\'#'.dol_escape_js($prefix).'year\').val(\''.$tmparray['year'].'\');">'.$labeladddateof.'</a>';
+			$reset_scripts = 'jQuery(\'#'.dol_escape_js($prefix).'\').val(\''.dol_print_date($adddateof, 'dayinputnoreduce').'\');';
+			$reset_scripts .= 'jQuery(\'#'.dol_escape_js($prefix).'day\').val(\''.$tmparray['mday'].'\');';
+			$reset_scripts .= 'jQuery(\'#'.dol_escape_js($prefix).'month\').val(\''.$tmparray['mon'].'\');';
+			$reset_scripts .= 'jQuery(\'#'.dol_escape_js($prefix).'year\').val(\''.$tmparray['year'].'\');';
+			$retstring .= ' - <button class="dpInvisibleButtons datenowlink" id="dateofinvoice" type="button" name="_dateofinvoice" value="now" onclick="'.$reset_scripts.'">'.$labeladddateof.'</a>';
 		}
 
 		return $retstring;

From 738c50772469959918f5827263518e96dc704516 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Tue, 21 Mar 2023 17:53:29 +0100
Subject: [PATCH 4/4] no need escape js

---
 htdocs/core/class/html.form.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 06616b40d98..283df4c995f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6522,10 +6522,10 @@ class Form
 			if (empty($labeladddateof)) {
 				$labeladddateof = $langs->trans("DateInvoice");
 			}
-			$reset_scripts = 'jQuery(\'#'.dol_escape_js($prefix).'\').val(\''.dol_print_date($adddateof, 'dayinputnoreduce').'\');';
-			$reset_scripts .= 'jQuery(\'#'.dol_escape_js($prefix).'day\').val(\''.$tmparray['mday'].'\');';
-			$reset_scripts .= 'jQuery(\'#'.dol_escape_js($prefix).'month\').val(\''.$tmparray['mon'].'\');';
-			$reset_scripts .= 'jQuery(\'#'.dol_escape_js($prefix).'year\').val(\''.$tmparray['year'].'\');';
+			$reset_scripts = 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date($adddateof, 'dayinputnoreduce').'\');';
+			$reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.$tmparray['mday'].'\');';
+			$reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.$tmparray['mon'].'\');';
+			$reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.$tmparray['year'].'\');';
 			$retstring .= ' - <button class="dpInvisibleButtons datenowlink" id="dateofinvoice" type="button" name="_dateofinvoice" value="now" onclick="'.$reset_scripts.'">'.$labeladddateof.'</a>';
 		}