From 5848d73196c5b812d5b91fa79fa498e27f109117 Mon Sep 17 00:00:00 2001
From: Jean-Christophe Engel <lesanges@zaclys.net>
Date: Thu, 16 Oct 2025 12:12:16 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20coh=C3=A9rence=20infos=20fo?=
 =?UTF-8?q?rmulaires?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 movements/copy_movement.html    | 11 +++++++----
 movements/modify_movement.html  | 15 ++++++++-------
 movements/movement_details.html | 32 ++++++++++++++++++--------------
 3 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/movements/copy_movement.html b/movements/copy_movement.html
index 17f2fa1..459cde5 100644
--- a/movements/copy_movement.html
+++ b/movements/copy_movement.html
@@ -202,7 +202,12 @@
 	{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=copie"|args:$eqpmt_key:$prop}}
 {{/form}}
 
-{{:admin_header title="Dupliquer un mouvement" custom_css="./../style.css" current="module_equipment"}}
+{{if $mvt_new.direction == "input"}}
+	{{:assign mvt_label="entrée"}}
+{{else}}
+	{{:assign mvt_label="sortie"}}
+{{/if}}
+{{:admin_header title="Dupliquer une %s"|args:$mvt_label custom_css="./../style.css" current="module_equipment"}}
 {{:form_errors}}
 
 {{*
@@ -261,9 +266,7 @@
 				}}
 			{{/if}}
 			{{if $mvt_new.direction == "input"}}
-				{{if $storage != null}}
-					{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
-				{{/if}}
+				{{:input type="select" name="storage" default=$mvt_new.storage label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
 				{{if $type_mvt != "retour"}}
 					{{:input type="list" name="transactions" label="Écritures liées" target="!acc/transactions/selector.php" multiple=true help="par exemple écriture avec facture"}}
 				{{/if}}
diff --git a/movements/modify_movement.html b/movements/modify_movement.html
index bc50aa8..e737d9d 100644
--- a/movements/modify_movement.html
+++ b/movements/modify_movement.html
@@ -219,7 +219,12 @@
 	{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}}
 {{/form}}
 
-{{:admin_header title="Modifier un mouvement" custom_css="./../style.css" current="module_equipment"}}
+{{if $mvt_new.direction == "input"}}
+	{{:assign mvt_label="entrée"}}
+{{else}}
+	{{:assign mvt_label="sortie"}}
+{{/if}}
+{{:admin_header title="Modifier une %s"|args:$mvt_label custom_css="./../style.css" current="module_equipment"}}
 {{:form_errors}}
 
 {{*
@@ -232,11 +237,6 @@
 	{{#select id, !name as nom FROM users WHERE id=:id; !name=$config.user_fields.name_sql :id=$mvt_new.user}}
 		{{:assign var="user.%s"|args:$id value=$nom}}
 	{{/select}}
-	{{#load type="link" where="$$.direction="output" AND $$.temp_key = :mvt_key" :mvt_key=$mvt_new.key limit=1}}
-		{{:assign retour=true}}
-	{{else}}
-		{{:assign retour=false}}
-	{{/load}}
 {{/if}}
 
 {{#load type="storage" order="$$.name"}}
@@ -274,10 +274,11 @@
 			{{:input type="number" name="amount" label="Quantité" min=1 required=true default=$mvt_new.amount}}
 		</dl>
 	</fieldset>
+
 	<fieldset class="entree">
 		<legend>Informations facultatives</legend>
 		<dl>
-			{{if $prop == 1 && $mvt_new.direction == "output" && ! $retour}}
+			{{if $prop == 1 && $mvt_new.direction == "output"}}
 				{{:input
 					type="list"
 					name="user"
diff --git a/movements/movement_details.html b/movements/movement_details.html
index c83528f..16a170f 100644
--- a/movements/movement_details.html
+++ b/movements/movement_details.html
@@ -70,20 +70,24 @@
 	<dd>{{$mvt.date|date_short}}</dd>
 	<dt>Quantité</dt>
 	<dd>{{$mvt.amount}}</dd>
-	<dt>Membre destinataire</dt>
-	<dd>
-		{{if $mvt.user != null}}
-			{{$user_name}}
-		{{else}}—
-		{{/if}}
-	</dd>
-	<dt>Lieu de stockage</dt>
-	<dd>
-		{{if $storage != null}}
-			{{$storage.name}}
-		{{else}}—
-		{{/if}}
-	</dd>
+	{{if $mvt.direction == "output" && $type_mvt != "retour"}}
+		<dt>Membre destinataire</dt>
+		<dd>
+			{{if $mvt.user != null}}
+				{{$user_name}}
+			{{else}}—
+			{{/if}}
+		</dd>
+	{{/if}}
+	{{if $mvt.direction == "input"}}
+		<dt>Lieu de stockage</dt>
+		<dd>
+			{{if $storage != null}}
+				{{$storage.name}}
+			{{else}}—
+			{{/if}}
+		</dd>
+	{{/if}}
 	<dt>Écritures liées</dt>
 	<dd>
 		{{#foreach from=$mvt.transactions item="trans"}}