diff --git a/movements/add_new_equipment.html b/movements/add_new_equipment.html
index 30614d6..74a5f67 100644
--- a/movements/add_new_equipment.html
+++ b/movements/add_new_equipment.html
@@ -134,19 +134,19 @@
 		<fieldset class="entree">
 			<legend>Informations obligatoires</legend>
 			<dl>
-				{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
-				{{:input type="number" name="amount" label="Quantité" min=1 required=true default=1}}
-				{{:input type="text" name="name" label="Désignation" required=true}}
 				{{if $input_labels|count == 1}}
 					{{:input type="select" name="operation" label="Type" required=true options=$input_labels}}
 				{{else}}
 					{{:input type="select" name="operation" label="Type" required=true default_empty="— Aucun —" options=$input_labels|sort}}
 				{{/if}}
+				{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
+				{{:input type="number" name="amount" label="Quantité" min=1 required=true default=1}}
 				{{if $categories|count == 1}}
 					{{:input type="select" name="category" label="Catégorie" options=$categories required=true}}
 				{{else}}
 					{{:input type="select" name="category" label="Catégorie" default_empty="— Aucune —" options=$categories required=true}}
 				{{/if}}
+				{{:input type="text" name="name" label="Désignation" required=true}}
 			</dl>
 		</fieldset>
 		<fieldset>
diff --git a/movements/input_equipment.html b/movements/input_equipment.html
index 31fe136..1f687bf 100644
--- a/movements/input_equipment.html
+++ b/movements/input_equipment.html
@@ -106,13 +106,13 @@
 	<fieldset class="entree">
 		<legend>Informations obligatoires</legend>
 		<dl>
-			{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
-			{{:input type="number" name="amount" label="Quantité" required=true min=1 default=1}}
 			{{if $input_labels|count == 1}}
 				{{:input type="select" name="operation" label="Type d'entrée" required=true options=$input_labels}}
 			{{else}}
 				{{:input type="select" name="operation" label="Type d'entrée" required=true default_empty="— Aucun —" options=$input_labels|sort}}
 			{{/if}}
+			{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
+			{{:input type="number" name="amount" label="Quantité" required=true min=1 default=1}}
 		</dl>
 	</fieldset>
 	<fieldset class="entree">
diff --git a/movements/input_return.html b/movements/input_return.html
index 3b984b3..4512516 100644
--- a/movements/input_return.html
+++ b/movements/input_return.html
@@ -204,9 +204,9 @@
 	<fieldset>
 		<legend>Retour de matériel</legend>
 		<dl>
+			{{:input type="select" name="operation" label="Type de mouvement" required=true options=$return_label}}
 			{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
 			{{:input type="number" name="amount" label="Quantité" min=1 max=$present required=true default=1}}
-			{{:input type="select" name="operation" label="Type de mouvement" required=true options=$return_label}}
 			{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false}}
 		</dl>
 	</fieldset>
diff --git a/movements/modify_movement.html b/movements/modify_movement.html
index 5a9f1bd..f2406c3 100644
--- a/movements/modify_movement.html
+++ b/movements/modify_movement.html
@@ -291,13 +291,13 @@
 	<fieldset>
 		<legend>Informations obligatoires</legend>
 		<dl>
-			{{:input type="date" name="date" label="Date" required=true default=$mvt_new.date}}
-			{{:input type="number" name="amount" label="Quantité" min=1 required=true default=$mvt_new.amount}}
 			{{if $mvt_new.direction == "input"}}
 				{{:input type="select" name="operation" label="Type" required=true options=$input_labels|sort default=$mvt_new.operation}}
 			{{else}}
 				{{:input type="select" name="operation" label="Type" required=true options=$output_labels|sort default=$mvt_new.operation}}
 			{{/if}}
+			{{:input type="date" name="date" label="Date" required=true default=$mvt_new.date}}
+			{{:input type="number" name="amount" label="Quantité" min=1 required=true default=$mvt_new.amount}}
 		</dl>
 	</fieldset>
 
diff --git a/movements/output_return.html b/movements/output_return.html
index ba51ec2..162fc37 100644
--- a/movements/output_return.html
+++ b/movements/output_return.html
@@ -214,9 +214,9 @@
 	<fieldset>
 		<legend>Informations obligatoires</legend>
 		<dl>
+			{{:input type="select" name="operation" label="Type de mouvement" required=true options=$return_label}}
 			{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
 			{{:input type="number" name="amount" label="Quantité" min=1 max=$exterieur required=true default=1}}
-			{{:input type="select" name="operation" label="Type de mouvement" required=true options=$return_label}}
 		</dl>
 	</fieldset>
 	<fieldset class="entree">