Masquer case à cocher affichage écritures ignorées si non pertinente

_immobilisations_autres.html

@@ -50,24 +50,9 @@
 	{{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}}
 {{/foreach}}
 {{:assign account_condition=$account_condition|cat:"0)"}}
+{{:assign condition=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16) AND "|cat:$doc_condition}}
 
-{{if $unhide ==  null}}
-	{{: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)"}}
-{{else}}
-	{{:assign filter_condition="1"}}
-{{/if}}
-
-{{:assign condition=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16) AND "|cat:$filter_condition|cat:" AND "|cat:$doc_condition}}
-
-{{:assign nb_managed=0}}
 {{:assign nb_ignored=0}}
-{{:assign nb_null=0}}
-{{:assign nb_other=0}}
 {{#select
 	trans.id as immo_trans_id,
 	trans.label as trans_label,
@@ -93,37 +78,45 @@
 	!table=$module.table
 	!condition=$condition
 	assign="immo_line"
-	}}
+}}
-	{{*
-		parmi les immos gérées, ne conserver que celles dont le montant dans le doc est non nul
-		et inférieur au montant de l'écriture d'immo
-	*}}
 	{{if $immo_line.status == 'managed'}}
 		{{if $immo_line.amount == null || $immo_line.amount == 0 || $immo_line.amount == $immo_line.debit}}
 			{{:continue}}
 		{{/if}}
 	{{/if}}
-	{{if $immo_line.status == null}}
+
-		{{:assign nb_null="%d+1"|math:$nb_null}}
+	{{if $immo_line.status == 'ignored'}}
-	{{elseif $immo_line.status == 'managed'}}
-		{{:assign nb_managed="%d+1"|math:$nb_managed}}
-	{{elseif $immo_line.status == 'ignored'}}
 		{{:assign nb_ignored="%d+1"|math:$nb_ignored}}
-	{{else}}
-		{{:assign nb_other="%d+1"|math:$nb_other}}
 	{{/if}}
 
+	{{if $unhide == null && $immo_line.status == "ignored"}}
+		{{:continue}}
+	{{/if}}
+
+	{{* vérifier si le libellé aurait pu être filtré *}}
+	{{#foreach from=$module.config.filters item="filter"}}
+		{{if $trans_label|strpos:$filter !== false}}
+			{{:assign var="immo_line.status" value="ignored"}}
+			{{:assign nb_ignored="%d+1"|math:$nb_ignored}}
+		{{/if}}
+	{{/foreach}}
+
+	{{if $unhide == null && $immo_line.status == "ignored"}}
+		{{:continue}}
+	{{/if}}
 	{{:assign var="immo_lines." value=$immo_line}}
 {{/select}}
 
-<form method="post" action="">
+{{if $nb_ignored > 0}}
+	<form method="post" action="">
 		<fieldset>
 			{{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher les écritures ignorées" }}
 		</fieldset>
-</form>
+	</form>
+{{/if}}
 
 {{if $immo_lines|count > 0}}
-<table class="list">
+	<table class="list">
 		<thead>
 			<tr>
 				<th class="num">N°</th>
@@ -140,22 +133,6 @@
 		</thead>
 		<tbody>
 			{{#foreach from=$immo_lines item="line"}}
-
-		{{if $unhide == null}}
-			{{if $status == "ignored"}}
-				{{:continue}}
-			{{/if}}
-		{{else}}
-			{{* vérifier si le libellé aurait pu être filtré *}}
-			{{#foreach from=$module.config.filters item="filter"}}
-				{{if $trans_label|strpos:$filter !== false}}
-					{{:assign status="ignored"}}
-				{{else}}
-					{{:assign status=""}}
-				{{/if}}
-			{{/foreach}}
-		{{/if}}
-
 			{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.immo_trans_id}}
 			{{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.trans_id_year}}
 			{{:assign reste="%d-%d"|math:$line.debit:$line.amount}}
@@ -180,7 +157,7 @@
 			</tr>
 		{{/foreach}}
 		</tbody>
-</table>
+	</table>
 {{else}}
 	<p class="block alert">Aucune immobilisation</p>
 {{/if}}