Correction coquille annuité estimée

_immobilisations_autres.html

@@ -39,6 +39,9 @@
 			{{:assign condition=$condition|cat:"0)"}}
 			{{:assign condition=$condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"}}
 
+			{{if $_POST.unhide ==  null}}
+				{{*:assign condition=$condition|cat:" AND NOT (trans.status & 16)"*}}
+
 				{{:assign filter_condition=" NOT ("}}
 				{{#foreach from=$module.config.filters item="filter"}}
 					{{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}}
@@ -46,6 +49,7 @@
 				{{/foreach}}
 				{{:assign filter_condition=$filter_condition|cat:"0)"}}
 				{{:assign condition=$condition|cat:" AND "|cat:$filter_condition}}
+			{{/if}}
 
 			{{:assign nb_immo=0}}
 			{{#select
@@ -75,6 +79,7 @@
 				{{else}}
 					{{:assign status="unknown"}}
 				{{/load}}
+
 				{{if $_POST.unhide ==  null}}
 					{{if $status != "unknown"}}
 						{{:continue}}
@@ -83,6 +88,12 @@
 					{{if $status != "ignored" && $status != "unknown"}}
 						{{:continue}}
 					{{/if}}
+					{{* vérifier si le libellé aurait pu être filtré *}}
+					{{#foreach from=$module.config.filters item="filter"}}
+						{{if $filter|strpos:$trans_label !== false}}
+							{{:assign status="ignored"}}
+						{{/if}}
+					{{/foreach}}
 				{{/if}}
 
 				{{* voir s'il existe des écritures d'amortissement associées *}}
@@ -122,7 +133,7 @@
 				{{/if}}
 				{{:assign nb_immo="%d+1"|math:$nb_immo}}
 
-			<tr {{if $status == "ignored"}}class="checked"{{/if}}>
+			<tr {{if $status == "ignored"}}class="ignored"{{/if}}>
 				<td class="num"><a href={{$trans_url}}>#{{$trans_id}}</a></td>
 				<td>{{$trans_date|date_short}}</td>
 				<td>{{$trans_label}}</td>

amortization.html

@@ -199,7 +199,7 @@
 		{{/if}}
 		{{if $duree != null && $valeur_residuelle > 0}}
 			<dt>Annuité estimée</dt>
-			<dd>{{"%f/%d"|math:$ligne_immo.montant:$duree|money_currency_html:false|raw}}</dd>
+			<dd>{{"min(%d, %f/%d)"|math:$valeur_residuelle:$ligne_immo.montant:$duree|money_currency_html:false|raw}}</dd>
 		{{/if}}
 	</dl>
 </div>

style.css

@@ -62,3 +62,12 @@ table.montant td.label {
 	text-align : right;
 	padding-right : 1em;
 }
+
+table.list tbody tr.ignored:nth-child(odd) {
+	font-style: italic;
+    background: rgba(255, 255, 200, 0.2);
+}
+table.list tbody tr.ignored:nth-child(even) {
+	font-style: italic;
+    background: rgba(255, 255, 200, 0.5);
+}