From ee56a9e8a2152c0519d6f8fbf07f2ff3103ce783 Mon Sep 17 00:00:00 2001
From: Irvine Fleith <irvine.fleith@atm-consulting.fr>
Date: Mon, 25 Nov 2024 16:49:35 +0100
Subject: [PATCH 1/7] FIX : Position class select inactive users

---
 htdocs/hrm/class/position.class.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 7d257e5d41c80..9838f923cf403 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -97,7 +97,7 @@ class Position extends CommonObject
 		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2,),
 		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2,),
 		'fk_contrat' => array('type' => 'integer:Contrat:contrat/class/contrat.class.php', 'label' => 'fk_contrat', 'enabled' => 'isModEnabled("contract")', 'position' => 50, 'notnull' => 0, 'visible' => 0,),
-		'fk_user' => array('type' => 'integer:User:user/class/user.class.php:0:(t.statut:=:1)', 'label' => 'Employee', 'enabled' => 1, 'position' => 55, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'picto' => 'user', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'fk_user' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'Employee', 'enabled' => 1, 'position' => 55, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'picto' => 'user', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
 		'fk_job' => array('type' => 'integer:Job:/hrm/class/job.class.php', 'label' => 'JobProfile', 'enabled' => 1, 'position' => 56, 'notnull' => 1, 'visible' => 1, 'picto' => 'jobprofile', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
 		'date_start' => array('type' => 'date', 'label' => 'DateStart', 'enabled' => 1, 'position' => 101, 'notnull' => 1, 'visible' => 1,),
 		'date_end' => array('type' => 'date', 'label' => 'DateEnd', 'enabled' => 1, 'position' => 102, 'notnull' => 0, 'visible' => 1,),
@@ -847,12 +847,15 @@ public function LibStatut($status, $mode = 0)
 	 */
 	public function showInputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = 0, $nonewbutton = 0)
 	{
-		global $langs;
+		global $langs, $db;
+
+		$form = new Form($db);
 
 		if ($key == 'fk_user') {
 			$vacantId = $keyprefix.$key.'vacant'.$keysuffix;
 
-			$out = parent::showInputField($val, $key, $value, $moreparam, $keysuffix, $keyprefix, $morecss);
+			$out = $form->select_dolusers($value, 'search_'.$key, 1, null, 0, '', '', '0', 0, 0, '', 0, '', (!empty($val['css']) ? $val['css'] : 'maxwidth100'));
+
 			$out .= '<label class="nowrap position-fk-user classfortooltip" title="'.dol_escape_js($langs->trans('VacantCheckboxHelper')).'"><input type="checkbox" id="'.$vacantId.'" name="'.$vacantId.'">&nbsp;'.$langs->trans("Vacant").'</label>'; ?>
 			<script type="text/javascript">
 				$(document).ready(function () {

From f909ce15ec4f5a464295b1530129ceb62d461a5c Mon Sep 17 00:00:00 2001
From: Irvine Fleith <irvine.fleith@atm-consulting.fr>
Date: Tue, 26 Nov 2024 09:12:42 +0100
Subject: [PATCH 2/7] Fixed returns of PR

---
 htdocs/hrm/class/position.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 9838f923cf403..1d9a4ce2ecd28 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -847,9 +847,9 @@ public function LibStatut($status, $mode = 0)
 	 */
 	public function showInputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = 0, $nonewbutton = 0)
 	{
-		global $langs, $db;
+		global $langs, $db, $form;
 
-		$form = new Form($db);
+		$form ??= new Form($db);
 
 		if ($key == 'fk_user') {
 			$vacantId = $keyprefix.$key.'vacant'.$keysuffix;

From a6d3e6fa595c50c32be7b9baf704981fbe937eca Mon Sep 17 00:00:00 2001
From: Irvine Fleith <irvine.fleith@atm-consulting.fr>
Date: Tue, 26 Nov 2024 09:46:53 +0100
Subject: [PATCH 3/7] Changed $db to $this->db

---
 htdocs/hrm/class/position.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 1d9a4ce2ecd28..2593280224e7f 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -847,9 +847,9 @@ public function LibStatut($status, $mode = 0)
 	 */
 	public function showInputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = 0, $nonewbutton = 0)
 	{
-		global $langs, $db, $form;
+		global $langs, $form;
 
-		$form ??= new Form($db);
+		$form ??= new Form($this->db);
 
 		if ($key == 'fk_user') {
 			$vacantId = $keyprefix.$key.'vacant'.$keysuffix;

From 444579023f50703d07dcda545e61b51f37441f2e Mon Sep 17 00:00:00 2001
From: Irvine Fleith <irvine.fleith@atm-consulting.fr>
Date: Fri, 29 Nov 2024 14:58:07 +0100
Subject: [PATCH 4/7] More readable condition

---
 htdocs/hrm/class/position.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 2593280224e7f..8e42c548f840d 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -849,7 +849,9 @@ public function showInputField($val, $key, $value, $moreparam = '', $keysuffix =
 	{
 		global $langs, $form;
 
-		$form ??= new Form($this->db);
+		if (empty($form)) {
+			$form = new Form($this->db);
+		}
 
 		if ($key == 'fk_user') {
 			$vacantId = $keyprefix.$key.'vacant'.$keysuffix;

From 77a1dcbc897aca0155782801d72fc4107d18fc28 Mon Sep 17 00:00:00 2001
From: Irvine Fleith <irvine.fleith@atm-consulting.fr>
Date: Fri, 29 Nov 2024 14:59:45 +0100
Subject: [PATCH 5/7] More readable condition

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

diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 8e42c548f840d..bd11eec5e595a 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -849,7 +849,7 @@ public function showInputField($val, $key, $value, $moreparam = '', $keysuffix =
 	{
 		global $langs, $form;
 
-		if (empty($form)) {
+		if (!($form instanceof Form)) {
 			$form = new Form($this->db);
 		}
 

From 36c4926deb8607281de0e3601a7dc34dd95cbb6b Mon Sep 17 00:00:00 2001
From: Irvine Fleith <irvine.fleith@atm-consulting.fr>
Date: Thu, 19 Dec 2024 09:13:28 +0100
Subject: [PATCH 6/7] Added changelog

---
 ChangeLog_cdcconseil | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog_cdcconseil b/ChangeLog_cdcconseil
index 24c4b21f62cc9..4c204458a1f46 100644
--- a/ChangeLog_cdcconseil
+++ b/ChangeLog_cdcconseil
@@ -1,3 +1,4 @@
+- FIX/SUPPORT/DA025748/SELECT_INACTIVE_USERS - *19/12/2024*
 - FIX/SUPPORT/DA025871/FiltreEvalListe - **16/12/2024**
 - FIX/SUPPORT/DA025787/HRM_closed_job_position_on_application - *04/12/2024*
 - FIX/SUPPORT/DA025778/Missing_trigger_on_situation_invoice for demat4dolibarr Easya - *03/12/2024*

From 0fd87f6068531af334f6e4202d107e4c92be0b40 Mon Sep 17 00:00:00 2001
From: Irvine Fleith <irvine.fleith@atm-consulting.fr>
Date: Thu, 19 Dec 2024 09:14:51 +0100
Subject: [PATCH 7/7] Added comment

---
 htdocs/hrm/class/position.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index bd11eec5e595a..df39f5ae89479 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -97,7 +97,9 @@ class Position extends CommonObject
 		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2,),
 		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2,),
 		'fk_contrat' => array('type' => 'integer:Contrat:contrat/class/contrat.class.php', 'label' => 'fk_contrat', 'enabled' => 'isModEnabled("contract")', 'position' => 50, 'notnull' => 0, 'visible' => 0,),
+		// BACKPORT STD #32092
 		'fk_user' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'Employee', 'enabled' => 1, 'position' => 55, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'picto' => 'user', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		// END BACKPORT
 		'fk_job' => array('type' => 'integer:Job:/hrm/class/job.class.php', 'label' => 'JobProfile', 'enabled' => 1, 'position' => 56, 'notnull' => 1, 'visible' => 1, 'picto' => 'jobprofile', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
 		'date_start' => array('type' => 'date', 'label' => 'DateStart', 'enabled' => 1, 'position' => 101, 'notnull' => 1, 'visible' => 1,),
 		'date_end' => array('type' => 'date', 'label' => 'DateEnd', 'enabled' => 1, 'position' => 102, 'notnull' => 0, 'visible' => 1,),
@@ -849,9 +851,11 @@ public function showInputField($val, $key, $value, $moreparam = '', $keysuffix =
 	{
 		global $langs, $form;
 
+		// BACKPORT STD #32092
 		if (!($form instanceof Form)) {
 			$form = new Form($this->db);
 		}
+		// END BACKPORT
 
 		if ($key == 'fk_user') {
 			$vacantId = $keyprefix.$key.'vacant'.$keysuffix;