From 575d3708d8e0b314c1ea81ed5a2bbcd1c1eb854c Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 2 Sep 2026 14:00:28 +0200 Subject: [PATCH] =?UTF-8?q?Masquer=20case=20=C3=A0=20cocher=20affichage=20?= =?UTF-8?q?=C3=A9critures=20ignor=C3=A9es=20si=20non=20pertinente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _immobilisations_autres.html | 159 +++++++++++++++-------------------- 1 file changed, 68 insertions(+), 91 deletions(-) diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 4684b82..0dca07d 100644 --- a/_immobilisations_autres.html +++ b/_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,94 +78,86 @@ !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}} - {{elseif $immo_line.status == 'managed'}} - {{:assign nb_managed="%d+1"|math:$nb_managed}} - {{elseif $immo_line.status == 'ignored'}} + + {{if $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}} -
-
- {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher les écritures ignorées" }} -
-
+{{if $nb_ignored > 0}} +
+
+ {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher les écritures ignorées" }} +
+
+{{/if}} {{if $immo_lines|count > 0}} - - - - - - - - - - - - - - - - - {{#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}} - - - - - - - - - - - - - {{/foreach}} - -
N°LigneDateLibelléMontantAffectéResteN° compteCompte
#{{$line.immo_trans_id}}{{$line.immo_line_id}}{{$trans_date|date_short}}{{$line.trans_label}}{{if $line.line_label != null && $line.line_label != $line.trans_label}} — {{$line.line_label}}{{/if}}{{"%f"|math:$line.debit|money_html:false|raw}}{{"%f"|math:$line.amount|money_html:false|raw}}{{"%f"|math:$reste|money_html:false|raw}}{{$line.account_code}}{{$line.account_label}} - {{:linkbutton - label="Paramètres" - href="add_infos.html?immo_line_id=%s"|args:$immo_line_id - shape="settings" - target="_dialog" - }} -
+ + + + + + + + + + + + + + + + + {{#foreach from=$immo_lines item="line"}} + {{: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}} + + + + + + + + + + + + + {{/foreach}} + +
N°LigneDateLibelléMontantAffectéResteN° compteCompte
#{{$line.immo_trans_id}}{{$line.immo_line_id}}{{$trans_date|date_short}}{{$line.trans_label}}{{if $line.line_label != null && $line.line_label != $line.trans_label}} — {{$line.line_label}}{{/if}}{{"%f"|math:$line.debit|money_html:false|raw}}{{"%f"|math:$line.amount|money_html:false|raw}}{{"%f"|math:$reste|money_html:false|raw}}{{$line.account_code}}{{$line.account_label}} + {{:linkbutton + label="Paramètres" + href="add_infos.html?immo_line_id=%s"|args:$immo_line_id + shape="settings" + target="_dialog" + }} +
{{else}}

Aucune immobilisation

{{/if}}