From 2f4a7759395f29adcb6688bab5805a72c4ae2659 Mon Sep 17 00:00:00 2001
From: Faustin <faustin.boitel@bordeaux-inp.fr>
Date: Mon, 13 Jun 2022 16:11:02 +0200
Subject: [PATCH 1/3] wrong branch...

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

diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index f9cd7b3c9dd..9a0a21484b1 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -461,7 +461,7 @@ if ($jobposition->id > 0 && (empty($action) || ($action != 'edit' && $action !=
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, -1, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
 			if (!empty($object->fk_project)) {

From 7d02cdeb62e1754d5bca8883af9bdbfcef2d19de Mon Sep 17 00:00:00 2001
From: Faustin <faustin.boitel@bordeaux-inp.fr>
Date: Wed, 15 Jun 2022 11:18:27 +0200
Subject: [PATCH 2/3] Declared attribute salary in class Salary

---
 htdocs/salaries/card.php               | 2 +-
 htdocs/salaries/class/salary.class.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index e4c4bb24464..00591b5a32f 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -232,7 +232,7 @@ if ($action == 'add' && empty($cancel)) {
 	// Set user current salary as ref salary for the payment
 	$fuser = new User($db);
 	$fuser->fetch(GETPOST("fk_user", "int"));
-	$object->amount = $fuser->salary;
+	$object->salary = $fuser->salary;
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost(null, $object);
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index 1f4d2920914..e6d7eb2a4a6 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -56,8 +56,9 @@ class Salary extends CommonObject
 
 	public $datep;
 	public $datev;
-	public $amount;
 
+	public $salary;
+	public $amount; 
 	/**
 	 * @var int ID
 	 */

From fddb6a08b4fe5c75153178b0186a05adfbec70e1 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 15 Jun 2022 09:19:14 +0000
Subject: [PATCH 3/3] Fixing style errors.

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

diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index e6d7eb2a4a6..a7e96741862 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -58,7 +58,7 @@ class Salary extends CommonObject
 	public $datev;
 
 	public $salary;
-	public $amount; 
+	public $amount;
 	/**
 	 * @var int ID
 	 */