From a5662bf383db9974f8975e84bf84083394193f94 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Mon, 9 Mar 2026 12:14:26 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Correction=20erreur=20param=C3=A8tres=20imm?= =?UTF-8?q?obilisation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- add_infos.html | 1 + 1 file changed, 1 insertion(+) diff --git a/add_infos.html b/add_infos.html index 32cca72..7b3b924 100644 --- a/add_infos.html +++ b/add_infos.html @@ -152,6 +152,7 @@ {{if $info_immo != null}} {{:assign date_defaut=$info_immo.date}} {{:assign duree_defaut=$info_immo.duration}} + {{:assign choix_defaut=$info_immo.status}} {{else}} {{:assign duree_defaut=null}} {{/if}} From b937056a62e171417db3b242eb459cac867dfd72 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Mon, 9 Mar 2026 14:25:06 +0100 Subject: [PATCH 2/3] Ne pas afficher les amortissements d'une immobilisation non amortissable --- _immobilisations_autres.html | 5 ----- amortization.html | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 6ebb556..5fa9b49 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -165,11 +165,6 @@ shape="settings" target="_dialog" }} - {{:linkbutton - label="Amortissements" - href="amortization.html?immo_id=%s&type_immo=other"|args:$immo_id - shape="table" - }} {{/select}} diff --git a/amortization.html b/amortization.html index 23dc3f4..61801cf 100644 --- a/amortization.html +++ b/amortization.html @@ -33,6 +33,10 @@ {{:assign status=$status}} {{/load}} +{{if $status == 'ignored'}} + {{:error message="Cette immobilisation ne doit pas être amortie"}} +{{/if}} + {{* chercher des écritures liées à l'immo courante au crédit du même compte et déduire leur montant de celui de l'immo *}} From 367dae5cef9f5af1fa7fda9b452e0aaed235416e Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Fri, 13 Mar 2026 18:21:20 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Petites=20am=C3=A9liorations=20de=20pr?= =?UTF-8?q?=C3=A9sentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _archives.html | 3 ++- _immobilisations.html | 3 ++- _immobilisations_autres.html | 3 ++- _unfinished.html | 2 +- amortization.html | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/_archives.html b/_archives.html index 671ceb4..9252b3b 100644 --- a/_archives.html +++ b/_archives.html @@ -51,6 +51,7 @@ trans.date as trans_date, trans.id_year as trans_id_year, line.id as immo_id, + line.label as line_label, line.debit AS debit, account.id as account_id, account.code as account_code, @@ -149,7 +150,7 @@ #{{$trans_id}} {{$trans_date|date_short}} {{$exit_date|date_short}} - {{$trans_label}} + {{$trans_label}}{{if $line_label != null}} — {{$line_label}}{{/if}} {{"%f"|math:$montant_immo|money_html:false|raw}} {{$account_code}} {{$account_label}} diff --git a/_immobilisations.html b/_immobilisations.html index 00d2c40..fc44739 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -54,6 +54,7 @@ trans.date as trans_date, line.id as immo_line_id, line.debit AS debit, + line.label AS line_label, account.id as account_id, account.code as account_code, trans.id_year as trans_id_year @@ -167,7 +168,7 @@ #{{$immo_trans_id}} {{$trans_date|date_short}} - {{$trans_label}} + {{$trans_label}}{{if $line_label != null}} — {{$line_label}}{{/if}} {{$montant_immo|money_html:false|raw}} {{if $duration != null}}{{$duration}}{{/if}} {{$amort_amount|money_html:false|raw}} diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 5fa9b49..8d82edf 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -75,6 +75,7 @@ trans.label as trans_label, trans.date as trans_date, line.id as immo_id, + line.label as line_label, account.id as account_id, account.code as account_code, account.label as account_label, @@ -154,7 +155,7 @@ #{{$trans_id}} {{$trans_date|date_short}} - {{$trans_label}} + {{$trans_label}}{{if $line_label != null}} — {{$line_label}}{{/if}} {{"%f"|math:$debit|money_html:false|raw}} {{$account_code}} {{$account_label}} diff --git a/_unfinished.html b/_unfinished.html index b639914..cdf42af 100644 --- a/_unfinished.html +++ b/_unfinished.html @@ -32,7 +32,7 @@
Transférer une ou plusieurs lignes vers une immobilisation amortissable

- Cocher les lignes concernées ; les montants seront additionnés par numéro de compte + Cocher les lignes concernées

Montants sélectionnés diff --git a/amortization.html b/amortization.html index 61801cf..86da589 100644 --- a/amortization.html +++ b/amortization.html @@ -10,6 +10,7 @@ {{#select line.id as immo_id, line.debit as montant, + line.label as line_label, trans.id as trans_id, trans.label as label, trans.date, @@ -241,7 +242,7 @@
Immobilisation
-
#{{$ligne_immo.trans_id}} {{$ligne_immo.label}}
+
#{{$ligne_immo.trans_id}} {{$ligne_immo.label}}{{if $ligne_immo.line_label != null}} — {{$ligne_immo.line_label}}{{/if}}
Montant
{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}
Début d'amortissement