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}} -
+{{if $nb_ignored > 0}} + +{{/if}} {{if $immo_lines|count > 0}} -| N° | -Ligne | -Date | -Libellé | -Montant | -Affecté | -Reste | -N° compte | -Compte | -- |
|---|---|---|---|---|---|---|---|---|---|
| #{{$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" - }} - | -
| N° | +Ligne | +Date | +Libellé | +Montant | +Affecté | +Reste | +N° compte | +Compte | ++ |
|---|---|---|---|---|---|---|---|---|---|
| #{{$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" + }} + | +
Aucune immobilisation
{{/if}}