From 688cada3e83e717dbbfeeb6091ee6db4b0b995fb Mon Sep 17 00:00:00 2001
From: Jean-Christophe Engel <lesanges@zaclys.net>
Date: Thu, 3 Jul 2025 10:42:45 +0200
Subject: [PATCH] Harmonisation types immo

---
 _immobilisations.html    | 15 ++++++++-------
 _nav.html                | 18 +++++++++---------
 add_asset.html           |  4 ++--
 amortization.html        | 18 +++++++++---------
 index.html               |  8 ++++----
 other_amortizations.html |  4 ++--
 save_amort.html          |  2 +-
 7 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/_immobilisations.html b/_immobilisations.html
index 2f28b30..8765d7f 100644
--- a/_immobilisations.html
+++ b/_immobilisations.html
@@ -3,9 +3,9 @@
 {{* Liste des immobilisations en cours ou amorties *}}
 
 <section class="immobilisation">
-	{{if $type_immo == "encours"}}
+	{{if $type_immo == "managed"}}
 		<h2 class="ruler">Immobilisations en cours</h2>
-	{{elseif $type_immo == "amortie"}}
+	{{elseif $type_immo == "amortized"}}
 		<h2 class="ruler">Immobilisations amorties</h2>
 	{{/if}}
 	{{:assign nb_immo=0}}
@@ -133,10 +133,11 @@
 
 
 				{{* classement par onglet *}}
-				{{if $type_immo == "encours" && $amort_amount >= $debit}}{{:continue}}{{/if}}
-				{{if $type_immo == "encours" && $status == "amortized"}}{{:continue}}{{/if}}
+				{{if $type_immo == "managed" && $amort_amount >= $debit}}{{:continue}}{{/if}}
+				{{if $type_immo == "managed" && $status == "amortized"}}{{:continue}}{{/if}}
 				{{if $status == "unknown" && ! $exist_amort}}{{:continue}}{{/if}}
-				{{if $type_immo == "amortie" && $amort_amount < $debit && $status != "amortized"}}{{:continue}}{{/if}}
+				{{if $type_immo == "amortized" && $amort_amount < $debit && $status != "amortized"}}{{:continue}}{{/if}}
+
 				{{:assign nb_immo="%d+1"|math:$nb_immo}}
 			<tr>
 				<td class="num"><a href={{$trans_url}}>#{{$trans_id}}</a></td>
@@ -150,14 +151,14 @@
 					{{if ! $exist_amort}}
 						{{:linkbutton
 							label="Paramètres"
-							href="add_infos.html?immo_id=%s&amort=1&op=modif&type_immo=%s"|args:$immo_id:$type_immo
+							href="add_infos.html?immo_id=%s&op=modif&type_immo=%s"|args:$immo_id:$type_immo
 							shape="settings"
 							target="_dialog"
 						}}
 					{{elseif $status == "unknown"}}
 						{{:linkbutton
 							label="Paramètres"
-							href="add_infos.html?immo_id=%s&amort=1&op=new&type_immo=%s"|args:$immo_id:$type_immo
+							href="add_infos.html?immo_id=%s&op=new&type_immo=%s"|args:$immo_id:$type_immo
 							shape="settings"
 							target="_dialog"
 						}}
diff --git a/_nav.html b/_nav.html
index f5c6b94..fc5c3c3 100644
--- a/_nav.html
+++ b/_nav.html
@@ -1,11 +1,11 @@
 {{* -*- brindille -*- *}}
 
 <nav class="tabs">
-	{{if $current == 'index' && $subsubcurrent == null}}
+	{{if $current == "index" && $subsubcurrent == null}}
 		<aside>
 			{{:linkbutton label="Ajouter une immobilisation" shape="plus" href="add_asset.html" target="_dialog"}}
 		</aside>
-	{{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "encours" || $type_immo == "autre"}}
+	{{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "managed" || $type_immo == "other"}}
 		<aside>
 			{{if $autres_amort != null}}
 				{{:linkbutton label="Attacher un amortissement" href="other_amortizations.html?immo_id=%s"|args:$_GET.immo_id shape="plus" target="_dialog"}}
@@ -15,20 +15,20 @@
 			</aside>
 	{{/if}}
 
-	{{if $current == 'index'}} {{* && $subsubcurrent != 'balance_exit' *}}
+	{{if $current == "index"}} {{* && $subsubcurrent != "balance_exit" *}}
 		<ul>
-			<li {{if $subcurrent == 'encours'}}class="current"{{/if}}><a href="index.html?type_immo=encours">En cours</a></li>
-			<li {{if $subcurrent == 'amortie'}}class="current"{{/if}}><a href="index.html?type_immo=amortie">Amorties</a></li>
-			<li {{if $subcurrent == 'sortie'}}class="current"{{/if}}><a href="index.html?type_immo=sortie">Sorties du bilan</a></li>
-			<li {{if $subcurrent == 'autre'}}class="current"{{/if}}><a href="index.html?type_immo=autre">Autres</a></li>
+			<li {{if $subcurrent == "managed"}}class="current"{{/if}}><a href="index.html?type_immo=managed">En cours</a></li>
+			<li {{if $subcurrent == "amortized"}}class="current"{{/if}}><a href="index.html?type_immo=amortized">Amorties</a></li>
+			<li {{if $subcurrent == "archived"}}class="current"{{/if}}><a href="index.html?type_immo=archived">Sorties du bilan</a></li>
+			<li {{if $subcurrent == "other"}}class="current"{{/if}}><a href="index.html?type_immo=other">Autres</a></li>
 		</ul>
 	{{/if}}
 
-	{{if $subsubcurrent == 'amortization'}}
+	{{if $subsubcurrent == "amortization"}}
 		<ul class="sub">
 			<li class="title"><strong>Amortissements</strong></li>
 		</ul>
-		{{elseif $subsubcurrent == 'balance_exit'}}
+		{{elseif $subsubcurrent == "balance_exit"}}
 		<ul class="sub">
 			<li class="title"><strong>Sortie de bilan</strong></li>
 		</ul>
diff --git a/add_asset.html b/add_asset.html
index 0c2a654..2ec8c91 100644
--- a/add_asset.html
+++ b/add_asset.html
@@ -117,9 +117,9 @@
 		status=$status
 	}}
 	{{if $_POST.amortir}}
-		{{:assign type_immo="encours"}}
+		{{:assign type_immo="managed"}}
 	{{else}}
-		{{:assign type_immo="autre"}}
+		{{:assign type_immo="other"}}
 	{{/if}}
 	{{:redirect force="index.html?ok=1&msg=immobilisation&type_immo=%s"|args:$type_immo}}
 {{/form}}
diff --git a/amortization.html b/amortization.html
index c8280c0..1a84a12 100644
--- a/amortization.html
+++ b/amortization.html
@@ -3,7 +3,7 @@
 {{*
 	Lister les écritures d'amortissement associées à une immobilisation
 	@param immo_id : id de la ligne d'immo
-	@param type_immo : encours, amortie, sortie, autres
+	@param type_immo : managed, amortized, archived, others
 *}}
 
 {{* récupérer les infos de l'immobilisation *}}
@@ -114,14 +114,14 @@
 {{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortissement"}}
 
 {{* barre de navigation *}}
-{{if $_GET.type_immo == "amortie" || $valeur_residuelle== 0 }}
-	{{:assign subcurrent="amortie"}}
-{{elseif $_GET.type_immo == "sortie"}}
-	{{:assign subcurrent="sortie"}}
-{{elseif $_GET.type_immo == null || $_GET.type_immo == "encours"}}
-	{{:assign subcurrent="encours"}}
+{{if $_GET.type_immo == "amortized" || $valeur_residuelle== 0 }}
+	{{:assign subcurrent="amortized"}}
+{{elseif $_GET.type_immo == "archived"}}
+	{{:assign subcurrent="archived"}}
+{{elseif $_GET.type_immo == null || $_GET.type_immo == "managed"}}
+	{{:assign subcurrent="managed"}}
 {{else}}
-	{{:assign subcurrent="autre"}}
+	{{:assign subcurrent="other"}}
 {{/if}}
 
 {{:include
@@ -241,7 +241,7 @@
 	<p class="block alert">Aucun amortissement enregistré pour cette immobilisation</p>
 {{/if}}
 
-{{if $_GET.type_immo == null || $_GET.type_immo != "amortie"}}
+{{if $_GET.type_immo == null || $_GET.type_immo != "amortized"}}
 
 	{{* Autres amortissements non rattachés *}}
 
diff --git a/index.html b/index.html
index ac5c003..586ea5b 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
 
 {{* barre de navigation *}}
 {{if $_GET.type_immo == null}}
-	{{:assign type_immo="encours"}}
+	{{:assign type_immo="managed"}}
 {{else}}
 	{{:assign type_immo=$_GET.type_immo}}
 {{/if}}
@@ -34,11 +34,11 @@
 	{{/select}}
 {{/load}}
 
-{{if $type_immo == "autre"}}
+{{if $type_immo == "other"}}
 	{{:include file="_immobilisations_autres.html"}}
-{{elseif $type_immo == "sortie"}}
+{{elseif $type_immo == "archived"}}
 	{{:include file="_archives.html"}}
-{{elseif $type_immo == "encours" || $type_immo == "amortie"}}
+{{elseif $type_immo == "managed" || $type_immo == "amortized"}}
 	{{:include file="_immobilisations.html"}}
 {{/if}}
 
diff --git a/other_amortizations.html b/other_amortizations.html
index 6e32724..84d6eaa 100644
--- a/other_amortizations.html
+++ b/other_amortizations.html
@@ -61,9 +61,9 @@
 	{{:include
 		file="_nav.html"
 		current="index"
-		subcurrent="autre"
+		subcurrent="other"
 		subsubcurrent="amortization"
-		type_immo="autre"
+		type_immo="other"
 		autres_amort=$autres_amortissements
 }}
 {{/if}}
diff --git a/save_amort.html b/save_amort.html
index 1c9df59..06f5a26 100644
--- a/save_amort.html
+++ b/save_amort.html
@@ -214,7 +214,7 @@
 
 {{* barre de navigation *}}
 {{if ! $dialog}}
-	{{:include file="_nav.html" current="index" subcurrent="encours" subsubcurrent="amortization"}}
+	{{:include file="_nav.html" current="index" subcurrent="managed" subsubcurrent="amortization"}}
 {{/if}}
 
 {{:form_errors}}