config/misc.html

@@ -1,34 +0,0 @@
-{{* -*- brindille -*- *}}
-
-{{:admin_header title="Configuration" current="module_equipment"}}
-
-{{#form on="save"}}
-	{{:save
-	key="config"
-	loan_duration=$_POST.loan_duration
-	}}
-{{/form}}
-
-{{* barre de navigation *}}
-{{:include file="../_nav.html" current="config" subcurrent="divers"}}
-
-{{if $_GET.ok}}
-	<p class="block confirm">Configuration enregistrée.</p>
-{{/if}}
-
-{{* lecture config (défaut ou enregistrée) *}}
-{{:include file="../_get_config.html" keep="loan_duration"}}
-
-<form method="post" action="" data-focus="1">
-	<fieldset class="storage">
-		<legend>Autres paramètres</legend>
-		<dl>
-			{{:input type="number" name="loan_duration" label="Durée de prêt par défaut" min=1 required=true default=$loan_duration help="Durée en nombre de jours"}}
-
-		</dl>
-	</fieldset>
-	<p class="submit">
-		{{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}}
-	</p>
-</form>
-{{:admin_footer}}

loan_history.html

@@ -40,7 +40,7 @@
 		json_extract(mvt.document, '$.return_date') AS return_date,
 		json_extract(mvt.document, '$.amount') - IFNULL(SUM(json_extract(retour.document, '$.amount')), 0) AS remain
 	FROM {!$module.table} AS mvt
-	LEFT JOIN users ON json_extract(mvt.document, '$.user') = users.id
+	INNER JOIN users ON json_extract(mvt.document, '$.user') = users.id
 	LEFT JOIN {!$module.table} AS links ON mvt.key = json_extract(links.document, '$.temp_key')
 	LEFT JOIN {!$module.table} AS retour ON retour.key = json_extract(links.document, '$.return')
 	INNER JOIN {!$module.table} AS mat ON mat.key = json_extract(mvt.document, '$.equipment')

movements/modify_movement.html

@@ -202,7 +202,7 @@
 
 	{{* enregistrer le mouvement modifié *}}
 	{{if $user == null}}
-		{{:assign user_id=null}}
+		{{:assign user_id=$mvt_new.user}}
 	{{else}}
 		{{:assign user_id=$user.id}}
 	{{/if}}