diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 2b8dad9..694379e 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -39,17 +39,13 @@ {{: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}} - {{:assign filter_condition=$filter_condition|cat:" trans_label LIKE "|cat:$filter|cat:" OR "}} - {{/foreach}} - {{:assign filter_condition=$filter_condition|cat:"0)"}} - {{:assign condition=$condition|cat:" AND "|cat:$filter_condition}} - {{/if}} + {{:assign filter_condition=" NOT ("}} + {{#foreach from=$module.config.filters item="filter"}} + {{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}} + {{:assign filter_condition=$filter_condition|cat:" trans_label LIKE "|cat:$filter|cat:" OR "}} + {{/foreach}} + {{:assign filter_condition=$filter_condition|cat:"0)"}} + {{:assign condition=$condition|cat:" AND "|cat:$filter_condition}} {{:assign nb_immo=0}} {{#select @@ -79,7 +75,6 @@ {{else}} {{:assign status="unknown"}} {{/load}} - {{if $_POST.unhide == null}} {{if $status != "unknown"}} {{:continue}} @@ -88,12 +83,6 @@ {{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 *}} @@ -133,7 +122,7 @@ {{/if}} {{:assign nb_immo="%d+1"|math:$nb_immo}} - + #{{$trans_id}} {{$trans_date|date_short}} {{$trans_label}} diff --git a/amortization.html b/amortization.html index 9a5f16f..25e7ba9 100644 --- a/amortization.html +++ b/amortization.html @@ -199,7 +199,7 @@ {{/if}} {{if $duree != null && $valeur_residuelle > 0}}
Annuité estimée
-
{{"min(%d, %f/%d)"|math:$valeur_residuelle:$ligne_immo.montant:$duree|money_currency_html:false|raw}}
+
{{"%f/%d"|math:$ligne_immo.montant:$duree|money_currency_html:false|raw}}
{{/if}} diff --git a/style.css b/style.css index e01bc5d..d6ab989 100644 --- a/style.css +++ b/style.css @@ -62,12 +62,3 @@ 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); -}