Correction erreur calcul montant affecté immos hors paheko

This commit is contained in:
Jean-Christophe Engel 2026-08-30 18:37:44 +02:00
parent b505aa5f4a
commit 8db7ef7d73
3 changed files with 6 additions and 6 deletions

View file

@ -32,7 +32,7 @@
{{if $module.table != null}} {{if $module.table != null}}
{{:assign columns="$$.status as status, SUM($$.amount) as amount,"}} {{:assign columns="$$.status as status, SUM($$.amount) as amount,"}}
{{:assign table_join="LEFT JOIN !table AS info ON $$.line = line.id"}} {{:assign table_join="LEFT JOIN !table AS info ON $$.line = line.id"}}
{{:assign doc_condition="($$.status IS NULL OR $$.status == 'managed' OR $$.status == 'ignored')"}} {{:assign doc_condition="($$.status IS NULL OR $$.status == 'managed' OR $$.status == 'ignored' OR $$.status == 'amortized')"}}
{{else}} {{else}}
{{:assign columns=""}} {{:assign columns=""}}
{{:assign table_join=""}} {{:assign table_join=""}}
@ -102,11 +102,11 @@
{{:continue}} {{:continue}}
{{/if}} {{/if}}
{{/if}} {{/if}}
{{if $status == null}} {{if $immo_line.status == null}}
{{:assign nb_null="%d+1"|math:$nb_null}} {{:assign nb_null="%d+1"|math:$nb_null}}
{{elseif $status == 'managed'}} {{elseif $immo_line.status == 'managed'}}
{{:assign nb_managed="%d+1"|math:$nb_managed}} {{:assign nb_managed="%d+1"|math:$nb_managed}}
{{elseif $status == 'ignored'}} {{elseif $immo_line.status == 'ignored'}}
{{:assign nb_ignored="%d+1"|math:$nb_ignored}} {{:assign nb_ignored="%d+1"|math:$nb_ignored}}
{{else}} {{else}}
{{:assign nb_other="%d+1"|math:$nb_other}} {{:assign nb_other="%d+1"|math:$nb_other}}

View file

@ -21,7 +21,7 @@
{{:include file="_nav.html" current=$type_immo}} {{:include file="_nav.html" current=$type_immo}}
{{* Mise à niveau *}} {{* Mise à niveau *}}
{{:assign module_version="0.40.1"}} {{:assign module_version="0.40.2"}}
{{:include file="upgrade.html" module_version=$module_version}} {{:include file="upgrade.html" module_version=$module_version}}
{{* supprimer les documents sans écriture associée *}} {{* supprimer les documents sans écriture associée *}}

View file

@ -1,5 +1,5 @@
name="Amortissements" name="Amortissements"
description="Immobilisations et amortissements\nversion 0.40.1" description="Immobilisations et amortissements\nversion 0.40.2"
author="Jean-Christophe Engel" author="Jean-Christophe Engel"
author_url="https://gitea.zaclys.com/lesanges" author_url="https://gitea.zaclys.com/lesanges"
home_button=false home_button=false