Ajout lieu de stockage et membre destinataire sortie

global_history.html

@@ -42,11 +42,19 @@
 			FROM @TABLE AS mat
 			WHERE mat.key = @TABLE.$$.equipment) AS 'Matériel' ;
 		$$.amount AS 'Quantité';
-		$$.comment AS 'Commentaire'"
+		CASE WHEN $$.user NOT NULL
+			THEN (SELECT %s AS nom FROM users WHERE id = $$.user)
+			ELSE ''
+		END as 'Dépositaire';
+		CASE WHEN $$.storage NOT NULL
+				THEN (SELECT $$.name FROM @TABLE as storage WHERE storage.key = @TABLE.$$.storage)
+				ELSE ''
+			END as 'Stockage';
+		$$.comment AS 'Commentaire'
+	"|args:$config.user_fields.name_sql
 	order=1
 	desc=true
-	}}
-
+}}
 	{{* filtrer selon la catégorie *}}
 	{{#load key=$equipment}}
 		{{:assign cat_key=$category}}
@@ -62,6 +70,8 @@
 		<td class="nosort">{{$op_label}}</td>
 		<td>{{$col4}}</td>
 		<td class="num">{{$amount}}</td>
+		<td>{{:link href="/admin/users/details.php?id=%s"|args:$user label="%s"|args:$col6}}</td>
+		<td>{{$col7}}</td>
 		<td>{{$comment}}</td>
 		<td></td>
 	</tr>