From 243441f4fa9d5c479bee93dd3d05a8ca604c2e14 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Tue, 12 May 2026 17:21:15 +0200 Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20pr=C3=A9sentation=20et=20co?= =?UTF-8?q?rrection=20erreur=20libell=C3=A9=20nouvel=20amortissement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- amortization.html | 16 ++++++++-------- save_amort.html | 3 +-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/amortization.html b/amortization.html index 3875a05..747ff8f 100644 --- a/amortization.html +++ b/amortization.html @@ -239,20 +239,20 @@
Immobilisation
#{{$ligne_immo.immo_trans_id}} {{$ligne_immo.label}}{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} — {{$ligne_immo.line_label}}{{/if}}
-
Montant de l'immobilisation
-
{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}
- {{if $total_credits > 0}} -
Montant des avoirs
-
{{"%f"|math:$total_credits|money_currency_html:false|raw}}
-
Montant à amortir
-
{{"%f"|math:$montant_amortissable|money_currency_html:false|raw}}
- {{/if}}
Début d'amortissement
{{$date_debut|date_short}}
{{if $duree != null}}
Durée
{{$duree}} ans
{{/if}} +
Montant de l'immobilisation
+
{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}
+ {{if $total_credits > 0}} +
Montant des avoirs
+
{{"%f"|math:$total_credits|money_currency_html:false|raw}}
+
Montant à amortir
+
{{"%f"|math:$montant_amortissable|money_currency_html:false|raw}}
+ {{/if}} {{if $valeur_residuelle > 0}}
Montant des amortissements
{{"%d-%d"|math:$montant_amortissable:$valeur_residuelle|money_currency_html:false|raw}}
diff --git a/save_amort.html b/save_amort.html index 4aa8e64..3be761c 100644 --- a/save_amort.html +++ b/save_amort.html @@ -111,7 +111,6 @@ {{/load}} {{/select}} - {{:assign total_amort=0}} {{:assign valeur_residuelle=$ligne_immo.montant}} {{#foreach from=$linked_amort}} @@ -120,7 +119,7 @@ {{:assign date_debut=$amort_date}} {{:assign code_amort=$account_code}} {{:assign amort_account_label=$account_label}} - {{:assign amort_label=$amort_label}} + {{:assign amort_label=$trans_label}} {{/foreach}} {{if $valeur_residuelle == 0}}