From 18e97956fed14a957555b34c4a57928591e00cc2 Mon Sep 17 00:00:00 2001
From: Jean-Christophe Engel <lesanges@zaclys.net>
Date: Sat, 11 Jul 2026 11:28:17 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20affichage=20libell=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _immobilisations.html    |  2 +-
 amortization.html        |  2 +-
 attach_amort.html        |  2 +-
 attach_credit.html       |  2 +-
 balance_sheet_exit.html  |  2 +-
 compute_exit_data.html   |  2 +-
 exit_step1.html          |  9 +++++----
 exit_step2.html          |  6 +++---
 exit_step3.html          |  6 +++---
 exit_step4.html          | 26 ++++++++++++++++++++------
 link_immo.html           |  2 +-
 other_amortizations.html |  2 +-
 write_exit.html          |  2 +-
 13 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/_immobilisations.html b/_immobilisations.html
index ab4d4d6..93648ec 100644
--- a/_immobilisations.html
+++ b/_immobilisations.html
@@ -76,7 +76,7 @@
 				{{:assign montant_immo=$doc_amount|or:$debit}}
 				{{:assign immo_date = $doc_date_achat|or:$trans_date}}
 				{{:assign label_immo=$doc_label|or:$trans_label}}
-				{{if $line_label != null && $line_label != $label_immo}}
+				{{if $label_immo|strpos:$line_label === false}}
 					{{:assign label_immo=$label_immo|cat:" — "|cat:$line_label}}
 				{{/if}}
 
diff --git a/amortization.html b/amortization.html
index cafea18..7d73749 100644
--- a/amortization.html
+++ b/amortization.html
@@ -15,7 +15,7 @@
 {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}}
 {{:assign date_debut=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date_achat}}
 {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
-{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
+{{if $label_immo|strpos:$ligne_immo.line_label === false}}
 	{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
 {{/if}}
 {{if $info_immo.amount != null}}
diff --git a/attach_amort.html b/attach_amort.html
index a6d05bb..95767e2 100644
--- a/attach_amort.html
+++ b/attach_amort.html
@@ -14,7 +14,7 @@
 {{/if}}
 
 {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
-{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
+{{if $label_immo|strpos:$ligne_immo.line_label === false}}
 	{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
 {{/if}}
 {{:assign montant_immo=$info_immo.amount|or:$ligne_immo.amount}}
diff --git a/attach_credit.html b/attach_credit.html
index 0652ce3..e081434 100644
--- a/attach_credit.html
+++ b/attach_credit.html
@@ -14,7 +14,7 @@
 {{/if}}
 
 {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
-{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
+{{if $label_immo|strpos:$ligne_immo.line_label === false }}
 	{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
 {{/if}}
 
diff --git a/balance_sheet_exit.html b/balance_sheet_exit.html
index a561c80..f3c4ae0 100644
--- a/balance_sheet_exit.html
+++ b/balance_sheet_exit.html
@@ -18,7 +18,7 @@
 *}}
 
 {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
-{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
+{{if $label_immo|strpos:$ligne_immo.line_label === false}}
 	{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
 {{/if}}
 
diff --git a/compute_exit_data.html b/compute_exit_data.html
index c824af5..f45a6fe 100644
--- a/compute_exit_data.html
+++ b/compute_exit_data.html
@@ -19,7 +19,7 @@
 {{/if}}
 
 {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
-{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
+{{if $label_immo|strpos:$ligne_immo.line_label === false}}
 	{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
 {{/if}}
 
diff --git a/exit_step1.html b/exit_step1.html
index 83b6752..5744fb6 100644
--- a/exit_step1.html
+++ b/exit_step1.html
@@ -13,7 +13,7 @@
 {{/if}}
 
 {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
-{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
+{{if $label_immo|strpos:$ligne_immo.line_label === false}}
 	{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
 {{/if}}
 {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}}
@@ -123,12 +123,13 @@
 {{/select}}
 
 {{:admin_header title="Immobilisation sortie du bilan" custom_css="./style.css" current="module_amortization"}}
+
 {{if $_GET.from == "exit"}}
 	{{:assign current="other"}}
 {{else}}
 	{{:assign current="archived"}}
 {{/if}}
-{{:include file="_nav.html" current=$current subcurrent="exit"}}
+{{*:include file="_nav.html" current=$current subcurrent="exit"*}}
 
 {{if $_GET.ok}}
 	{{if $_GET.msg|match:"attach_avoir"}}
@@ -146,7 +147,7 @@
 		<dt>Compte d'immobilisation</dt>
 		<dd>{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}</dd>
 		<dt>Montant de l'immobilisation</dt>
-		<dd><span class="money">{{$ligne_immo.amount|money_html|raw}}</dd>
+		<dd><span class="money">{{$montant_immo|money_currency_html:false|raw}}</dd>
 		{{if $total_credits > 0}}
 			<dt>Montant des avoirs</dt>
 			<dd class="money">{{"%f"|math:$total_credits|money_currency_html:false|raw}}</dd>
@@ -210,7 +211,7 @@
 				<td class="num">N°</td>
 				<td>Date</td>
 				<td>Libellé</td>
-				<td>Montant</td>
+				<td class="nombre">Montant</td>
 				<td>N° compte</td>
 				<td>Compte</td>
 				<td class="actions"></td>
diff --git a/exit_step2.html b/exit_step2.html
index f5a7a40..6c451fc 100644
--- a/exit_step2.html
+++ b/exit_step2.html
@@ -21,7 +21,7 @@
 {{/form}}
 
 {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
-{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
+{{if $label_immo|strpos:$ligne_immo.line_label === false}}
 	{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
 {{/if}}
 {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}}
@@ -95,7 +95,7 @@
 {{else}}
 	{{:assign current="archived"}}
 {{/if}}
-{{:include file="_nav.html" current=$current subcurrent="exit"}}
+{{*:include file="_nav.html" current=$current subcurrent="exit"*}}
 
 {{if $_GET.ok}}
 	{{if $_GET.msg|match:"attach_amort"}}
@@ -113,7 +113,7 @@
 		<dt>Compte d'immobilisation</dt>
 		<dd>{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}</dd>
 		<dt>Montant de l'immobilisation</dt>
-		<dd><span class="money">{{$ligne_immo.amount|money_html|raw}}</dd>
+		<dd><span class="money">{{$montant_immo|money_currency_html:false|raw}}</dd>
 		{{if $total_credits > 0}}
 			<dt>Montant des avoirs</dt>
 			<dd class="money">{{"%f"|math:$total_credits|money_currency_html:false|raw}}</dd>
diff --git a/exit_step3.html b/exit_step3.html
index b935642..f55e5b5 100644
--- a/exit_step3.html
+++ b/exit_step3.html
@@ -21,7 +21,7 @@
 {{/form}}
 
 {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
-{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
+{{if  $label_immo|strpos:$ligne_immo.line_label === false}}
 	{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
 {{/if}}
 {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}}
@@ -100,7 +100,7 @@
 {{else}}
 	{{:assign current="archived"}}
 {{/if}}
-{{:include file="_nav.html" current=$current subcurrent="exit"}}
+{{*:include file="_nav.html" current=$current subcurrent="exit"*}}
 
 {{if $_GET.ok}}
 	{{if $_GET.msg|match:"attach_cession"}}
@@ -118,7 +118,7 @@
 		<dt>Compte d'immobilisation</dt>
 		<dd>{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}</dd>
 		<dt>Montant de l'immobilisation</dt>
-		<dd><span class="money">{{$ligne_immo.amount|money_html|raw}}</dd>
+		<dd><span class="money">{{$montant_immo|money_currency_html:false|raw}}</dd>
 		{{if $total_credits > 0}}
 			<dt>Montant des avoirs</dt>
 			<dd class="money">{{"%f"|math:$total_credits|money_currency_html:false|raw}}</dd>
diff --git a/exit_step4.html b/exit_step4.html
index 08e0cd4..5bc9f23 100644
--- a/exit_step4.html
+++ b/exit_step4.html
@@ -26,11 +26,11 @@
 {{/form}}
 
 {{#form on="finish"}}
-	{{:redirect to="index.html?type_immo=managed"}}
+	{{:redirect to="index.html?type_immo=other"}}
 {{/form}}
 
 {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
-{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
+{{if $label_immo|strpos:$ligne_immo.line_label === false}}
 	{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
 {{/if}}
 {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}}
@@ -187,7 +187,7 @@
 {{else}}
 	{{:assign current="archived"}}
 {{/if}}
-{{:include file="_nav.html" current=$current subcurrent="exit"}}
+{{*:include file="_nav.html" current=$current subcurrent="exit"*}}
 
 {{if $_GET.ok}}
 	{{if $_GET.msg|match:"attach_exit"}}
@@ -205,7 +205,7 @@
 		<dt>Compte d'immobilisation</dt>
 		<dd>{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}</dd>
 		<dt>Montant de l'immobilisation</dt>
-		<dd><span class="money">{{$ligne_immo.amount|money_html|raw}}</dd>
+		<dd><span class="money">{{$montant_immo|money_currency_html:false|raw}}</dd>
 		{{if $total_credits > 0}}
 			<dt>Montant des avoirs</dt>
 			<dd class="money">{{"%f"|math:$total_credits|money_currency_html:false|raw}}</dd>
@@ -227,6 +227,7 @@
 
 <h3 class="ruler">Écriture de sortie du bilan attachée à l'immobilisation</h3>
 {{if $exit_line != null}}
+	{{:assign exit_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$exit_line.trans_id}}
 	<table class="list">
 		<thead>
 			<tr>
@@ -241,7 +242,7 @@
 		</thead>
 		<tbody>
 			<tr>
-				<td class="num"><a href="{{$trans_url}}">#{{$exit_line.trans_id}}</a></td>
+				<td class="num"><a href="{{$exit_url}}">#{{$exit_line.trans_id}}</a></td>
 				<td>{{$exit_line.date|date_short}}</td>
 				<td>
 					{{if $exit_line.line_label != null}}
@@ -301,7 +302,20 @@
 			</tbody>
 	</table>
 {{elseif $exit_line == null}}
-	<p class="block alert">Aucune écriture de sortie du bilan. Vérifiez l'attachement d'écriture d'avoir.</p>
+	<p class="block alert">Aucune écriture de sortie du bilan avec un
+	montant de {{$solde|money_currency_html:false|raw}} au crédit du
+		compte {{$ligne_immo.account_code}}	— {{$ligne_immo.account_label}} ;
+		<br />
+		Vérifiez si vous avez correctement attaché les éventuelles écritures d'avoir.
+		<br />
+		Si vous avez supprimé l'écriture de sortie de bilan, il faut
+		la recréer avant de pouvoir classer cette immobilisation
+		« Sortie du bilan » !
+	</p>
+	{{:save
+		key=$info_immo.key
+		status=null
+	}}
 {{/if}}
 
 <form method="post" action="">
diff --git a/link_immo.html b/link_immo.html
index c925988..73e071b 100644
--- a/link_immo.html
+++ b/link_immo.html
@@ -14,7 +14,7 @@
 {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}}
 {{:assign date_debut=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date_achat}}
 {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
-{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
+{{if $label_immo|strpos:$ligne_immo.line_label ===false }}
 	{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
 {{/if}}
 {{if $info_immo.amount != null}}
diff --git a/other_amortizations.html b/other_amortizations.html
index 4c53fb2..d1b2909 100644
--- a/other_amortizations.html
+++ b/other_amortizations.html
@@ -13,7 +13,7 @@
 
 {{:assign montant_immo=$info_immo.amount|or:$ligne_immo.amount}}
 {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
-{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
+{{if $label_immo|strpos:$ligne_immo.line_label === false}}
 	{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
 {{/if}}
 {{:assign date_mes=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date_achat}}
diff --git a/write_exit.html b/write_exit.html
index dd00705..fa92190 100644
--- a/write_exit.html
+++ b/write_exit.html
@@ -18,7 +18,7 @@
 {{/if}}
 
 {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
-{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
+{{if $label_immo|strpos:$ligne_immo.line_label === false}}
 	{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
 {{/if}}