From 8db7ef7d731d6b490c0dc78eaee678b53ef9d246 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Sun, 30 Aug 2026 18:37:44 +0200 Subject: [PATCH] =?UTF-8?q?Correction=20erreur=20calcul=20montant=20affect?= =?UTF-8?q?=C3=A9=20immos=20hors=20paheko?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _immobilisations_autres.html | 8 ++++---- index.html | 2 +- module.ini | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 383ba12..dc90104 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -32,7 +32,7 @@ {{if $module.table != null}} {{:assign columns="$$.status as status, SUM($$.amount) as amount,"}} {{: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}} {{:assign columns=""}} {{:assign table_join=""}} @@ -102,11 +102,11 @@ {{:continue}} {{/if}} {{/if}} - {{if $status == null}} + {{if $immo_line.status == 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}} - {{elseif $status == 'ignored'}} + {{elseif $immo_line.status == 'ignored'}} {{:assign nb_ignored="%d+1"|math:$nb_ignored}} {{else}} {{:assign nb_other="%d+1"|math:$nb_other}} diff --git a/index.html b/index.html index 79da91d..291587b 100644 --- a/index.html +++ b/index.html @@ -21,7 +21,7 @@ {{:include file="_nav.html" current=$type_immo}} {{* Mise à niveau *}} -{{:assign module_version="0.40.1"}} +{{:assign module_version="0.40.2"}} {{:include file="upgrade.html" module_version=$module_version}} {{* supprimer les documents sans écriture associée *}} diff --git a/module.ini b/module.ini index 8dcc149..27c0392 100644 --- a/module.ini +++ b/module.ini @@ -1,5 +1,5 @@ name="Amortissements" -description="Immobilisations et amortissements\nversion 0.40.1" +description="Immobilisations et amortissements\nversion 0.40.2" author="Jean-Christophe Engel" author_url="https://gitea.zaclys.com/lesanges" home_button=false