Harmonisation libellés pour classification (suite)

_immobilisations.html

@@ -1,6 +1,6 @@
 {{* -*- brindille -*- *}}
 
-{{* Liste des immobilisations amortissable ou à définir *}}
+{{* Liste des immobilisations en cours ou amorties *}}
 
 <section class="immobilisation">
 	{{if $type_immo == "encours"}}

_immobilisations_autres.html

@@ -110,21 +110,21 @@
 					{{if $status == "nsp"}}
 						{{:linkbutton
 							label="Amortir"
-							href="add_infos.html?immo_id=%s&amort=0&op=new&type_immo=autres"|args:$immo_id
+							href="add_infos.html?immo_id=%s&amort=0&op=new&type_immo=autre"|args:$immo_id
 							shape="settings"
 							target="_dialog"
 						}}
 					{{else}}
 						{{:linkbutton
 							label="Amortir"
-							href="add_infos.html?immo_id=%s&amort=0&op=modif&type_immo=autres"|args:$immo_id
+							href="add_infos.html?immo_id=%s&amort=0&op=modif&type_immo=autre"|args:$immo_id
 							shape="settings"
 							target="_dialog"
 						}}
 					{{/if}}
 					{{:linkbutton
 						label="Amortissements"
-						href="amortization.html?immo_id=%s&type_immo=autres"|args:$immo_id
+						href="amortization.html?immo_id=%s&type_immo=autre"|args:$immo_id
 						shape="table"
 					}}
 				</td>

_nav.html

@@ -5,7 +5,7 @@
 		<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 == "autres"}}
+	{{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "encours" || $type_immo == "autre"}}
 		<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"}}
@@ -20,7 +20,7 @@
 			<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 == 'autres'}}class="current"{{/if}}><a href="index.html?type_immo=autres">Autres</a></li>
+			<li {{if $subcurrent == 'autre'}}class="current"{{/if}}><a href="index.html?type_immo=autre">Autres</a></li>
 		</ul>
 	{{/if}}
 

add_asset.html

@@ -117,11 +117,11 @@
 		status=$status
 	}}
 	{{if $_POST.amortir}}
-		{{:assign amort="encours"}}
+		{{:assign type_immo="encours"}}
 	{{else}}
-		{{:assign amort="autres"}}
+		{{:assign type_immo="autre"}}
 	{{/if}}
-	{{:redirect force="index.html?ok=1&msg=immobilisation&amort=%s"|args:$amort}}
+	{{:redirect force="index.html?ok=1&msg=immobilisation&type_immo=%s"|args:$type_immo}}
 {{/form}}
 
 {{:admin_header title="Ajout immobilisation" current="module_amortissement"}}

add_infos.html

@@ -63,7 +63,7 @@
 	}}
 
 	{{if ! $_POST.amortir}}
-		{{:assign type_immo="autres"}}
+		{{:assign type_immo="autre"}}
 	{{else}}
 		{{:assign type_immo=$_GET.type_immo}}
 	{{/if}}

amortization.html

@@ -115,7 +115,7 @@
 {{elseif $_GET.type_immo == null || $_GET.type_immo == "encours"}}
 	{{:assign subcurrent="encours"}}
 {{else}}
-	{{:assign subcurrent="autres"}}
+	{{:assign subcurrent="autre"}}
 {{/if}}
 
 {{:include

index.html

@@ -34,7 +34,7 @@
 	{{/select}}
 {{/load}}
 
-{{if $type_immo == "autres"}}
+{{if $type_immo == "autre"}}
 	{{:include file="_immobilisations_autres.html"}}
 {{elseif $type_immo == "sortie"}}
 	{{:include file="_archives.html"}}

other_amortizations.html

@@ -61,9 +61,9 @@
 	{{:include
 		file="_nav.html"
 		current="index"
-		subcurrent="autres"
+		subcurrent="autre"
 		subsubcurrent="amortization"
-		type_immo="autres"
+		type_immo="autre"
 		autres_amort=$autres_amortissements
 }}
 {{/if}}

write_exit.html

@@ -260,7 +260,7 @@
 		}}
 	{{/if}}
 
-	{{:redirect to="index.html?amort=sortie"}}
+	{{:redirect to="index.html?type_immo=sortie"}}
 {{/form}}
 
 {{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortissement"}}