fusion branche retourhisto

inventaire.html

@@ -48,7 +48,7 @@
 	(SELECT $$.stock - $$.out) AS 'Disponible'
 	"
 	type="equipment"
-	where="$$.status <> 'archived' AND %s"|args:$condition
+	where="$$.status <> 'archived' AND $$.stock != 0 AND %s"|args:$condition
 	order=1
 	}}
 	{{:assign var=cat_name from=categories.%s|args:$category}}
@@ -59,13 +59,6 @@
 		<td class="num">{{$out}}</td>
 		<td class="num">{{$col5}}</td>
 		<td class="actions">
-			{{if $col4 > 0}}
-				{{:linkbutton
-				label="Retour"
-				href="mouvements/entrees/retour.html?key=%s"|args:$key
-				shape="history"
-				target="_dialog"}}
-			{{/if}}
 			{{if $col5 > 0}}
 				{{:linkbutton
 				label="Sortie"