diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 694379e..2b8dad9 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -39,13 +39,17 @@ {{:assign condition=$condition|cat:"0)"}} {{:assign condition=$condition|cat:" AND debit > 0 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 $_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 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}} -