From 91795c69a8a423b6dda867a0146bc3d2021416c8 Mon Sep 17 00:00:00 2001
From: Jean-Christophe Engel <lesanges@zaclys.net>
Date: Fri, 22 May 2026 09:46:28 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20et=20correction=20libell?=
 =?UTF-8?q?=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 attach_amort.html        | 11 +++++++----
 details_immo.html        |  2 +-
 index.html               |  2 +-
 other_amortizations.html |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/attach_amort.html b/attach_amort.html
index 31e0ae9..4676ce3 100644
--- a/attach_amort.html
+++ b/attach_amort.html
@@ -9,7 +9,6 @@
 
 {{* données de l'immobilisation *}}
 {{#load id=$_GET.immo_doc_id|intval assign="info_immo"}}
-	{{:assign label_immo=$label|or:$ligne_immo.trans_label}}
 {{else}}
 	{{:error message="Immobilisation non trouvée"}}
 {{/load}}
@@ -29,11 +28,11 @@
 	{{:error message="Immobilisation non trouvée"}}
 {{/select}}
 
-{{:assign montant_immo=$info_immo.amount|or:$ligne_immo.montant}}
-
+{{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
 {{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
 	{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
 {{/if}}
+{{:assign montant_immo=$info_immo.amount|or:$ligne_immo.montant}}
 
 {{* chercher l'écriture d'amortissement *}}
 {{#select
@@ -54,6 +53,10 @@
 {{else}}
 	{{:error message="Amortissement non trouvé"}}
 {{/select}}
+{{:assign amort_label=$amort_line.trans_label}}
+{{if $amort_line.line_label != null && $amort_line.line_label != $amort_label}}
+	{{:assign amort_label=$amort_label|cat:"— "|cat:$amort_line.line_label}}
+{{/if}}
 {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$amort_line.trans_id}}
 
 {{* montant de l'écriture d'amortissement déjà affecté *}}
@@ -206,7 +209,7 @@
 		<dt>Immobilisation</dt>
 		<dd>{{$label_immo}}</dd>
 		<dt>Amortissement</dt>
-		<dd><span class="num"><a href="{{$trans_url}}">#{{$amort_line.trans_id}}</a></span> {{$label_immo}}</dd>
+		<dd><span class="num"><a href="{{$trans_url}}">#{{$amort_line.trans_id}}</a></span> {{$amort_label}}</dd>
 		<dt>Montant de l'écriture d'amortissement</dt>
 		<dd>{{$amort_line.amount|money_currency_html:false|raw}}</dd>
 		{{if $montant_affecte > 0}}
diff --git a/details_immo.html b/details_immo.html
index f84f08b..4d060dc 100644
--- a/details_immo.html
+++ b/details_immo.html
@@ -107,7 +107,7 @@
 <nav class="tabs">
 	<aside>
 		{{*if $total_credits == 0*}}
-		{{:linkbutton label="Rattacher une écriture d'immobilisation" href="link_immo.html?immo_doc_id=%s"|args:$_GET.immo_doc_id shape="link" target="_dialog"}}
+		{{:linkbutton label="Rattacher une écriture d'avoir" href="link_immo.html?immo_doc_id=%s"|args:$_GET.immo_doc_id shape="link" target="_dialog"}}
 		{{*/if*}}
 	</aside>
 	<nav style="margin-bottom: 1em;">
diff --git a/index.html b/index.html
index 356f42c..234de28 100644
--- a/index.html
+++ b/index.html
@@ -14,7 +14,7 @@
 	{{elseif $type_immo == "archived"}}
 		{{:admin_header title="Immobilisations archivées" custom_css="./style.css" current="module_amortization"}}
 	{{elseif $type_immo == "other"}}
-		{{:admin_header title="Autres immobilisations" custom_css="./style.css" current="module_amortization"}}
+		{{:admin_header title="Immobilisations à classer" custom_css="./style.css" current="module_amortization"}}
 	{{elseif $type_immo == "unfinished"}}
 		{{:admin_header title="Immobilisations en cours de constitution" custom_css="./style.css" current="module_amortization" subcurrent="unfinished"}}
 	{{/if}}
diff --git a/other_amortizations.html b/other_amortizations.html
index e185d27..925ad19 100644
--- a/other_amortizations.html
+++ b/other_amortizations.html
@@ -8,7 +8,6 @@
 
 {{* données de l'immobilisation *}}
 {{#load id=$_GET.immo_doc_id|intval assign="info_immo"}}
-	{{:assign label_immo=$label|or:$ligne_immo.label}}
 {{else}}
 	{{:error message="Immobilisation non trouvée"}}
 {{/load}}
@@ -26,6 +25,7 @@
 	{{:error message="Immobilisation non trouvée"}}
 {{/select}}
 
+{{:assign label_immo=$info_immo.label|or:$ligne_immo.label}}
 {{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
 	{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
 {{/if}}