Date: Tue, 3 Mar 2026 09:36:36 +0100
Subject: [PATCH 3/7] =?UTF-8?q?Am=C3=A9liorations=20interaction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
_immobilisations.html | 14 ++++++++------
_nav.html | 4 ++--
add_asset.html | 2 +-
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/_immobilisations.html b/_immobilisations.html
index f26b23f..00d2c40 100644
--- a/_immobilisations.html
+++ b/_immobilisations.html
@@ -174,12 +174,14 @@
| {{"%d-%d"|math:$montant_immo:$amort_amount|money_html:false|raw}} |
{{$account_code}} |
- {{:linkbutton
- label="Paramètres"
- href="add_infos.html?immo_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo
- shape="settings"
- target="_dialog"
- }}
+ {{if ! $exist_amort || $status == "unknown"}}
+ {{:linkbutton
+ label="Paramètres"
+ href="add_infos.html?immo_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo
+ shape="settings"
+ target="_dialog"
+ }}
+ {{/if}}
{{:linkbutton
label="Amortissements"
href="amortization.html?immo_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo
diff --git a/_nav.html b/_nav.html
index a7894b5..2192b2e 100644
--- a/_nav.html
+++ b/_nav.html
@@ -3,7 +3,7 @@
|
{{/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 7/7] =?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 @@