From 049080991d38453b715071126dc3643442ccd06f Mon Sep 17 00:00:00 2001
From: x <x@x.x>
Date: Wed, 3 Mar 2021 14:13:36 +0100
Subject: [PATCH] FIX : label must be over user

---
 htdocs/salaries/card.php | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 htdocs/salaries/card.php

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
old mode 100644
new mode 100755
index 72148a30c35..91330cf318e
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -614,10 +614,24 @@ if ($id)
 
 	$morehtmlref = '<div class="refidno">';
 
+	// Label
+	if ($action != 'editlabel') {
+		$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1);
+		$morehtmlref .= $object->label;
+	} else {
+		$morehtmlref .= '<br>'.$langs->trans('Label').' :&nbsp;';
+		$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+		$morehtmlref .= '<input type="hidden" name="action" value="setlabel">';
+		$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$morehtmlref .= '<input type="text" name="label" value="'.$object->label.'"/>';
+		$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+		$morehtmlref .= '</form>';
+	}
+	
 	// Employee
 	$userstatic = new User($db);
 	$userstatic->fetch($object->fk_user);
-	$morehtmlref .= $langs->trans('Employee').' : '.$userstatic->getNomUrl(1);
+	$morehtmlref .= '<br>' .$langs->trans('Employee').' : '.$userstatic->getNomUrl(1);
 
 	// Project
 	if (!empty($conf->projet->enabled))
@@ -652,22 +666,6 @@ if ($id)
 		}
 	}
 
-	// Label
-	if ($action != 'editlabel') {
-		$morehtmlref .= '<br>' . $form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1);
-		$morehtmlref .= $object->label;
-	} else {
-		$morehtmlref .= '<br>'.$langs->trans('Label').' :&nbsp;';
-		$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-		$morehtmlref .= '<input type="hidden" name="action" value="setlabel">';
-		$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-		$morehtmlref .= '<input type="text" name="label" value="'.$object->label.'"/>';
-		$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-		$morehtmlref .= '</form>';
-	}
-
-
-
 	$morehtmlref .= '</div>';
 
 	$totalpaye = $object->getSommePaiement();