diff --git a/_calcul_dispo.html b/_calcul_dispo.html index 7ede91c..a1115e1 100644 --- a/_calcul_dispo.html +++ b/_calcul_dispo.html @@ -37,7 +37,13 @@ {{:include file="./_get_config.html" keep="config"}} {{* parcourir les mouvements et cumuler les entrées/sorties *}} -{{#load type="movement" where="$$.equipment IN %s"|args:$in_equipments assign="mvt"}} +{{if $date == null}} + {{:assign condition="$$.equipment IN %s"|args:$in_equipments}} +{{else}} + {{:assign condition="$$.equipment IN %s AND $$.date <= '%s'"|args:$in_equipments:$date}} +{{/if}} + +{{#load type="movement" where="%s"|args:$condition assign="mvt" order="$$.date ASC"}} {{* matériel propriété de l'asso en stock *}} {{:assign var="stock"