Amélioration présentation onglets et menu

_nav.html

@@ -24,13 +24,15 @@
 		<li {{if $current == "config"}} class="current"{{/if}}><a href="config.html">Configuration</a></li>
 	</ul>
 
-	{{if $subsubcurrent == "amortization"}}
+	{{if $subsubcurrent != null}}
 		<ul class="sub">
-			<li class="title strong">Amortissements</li>
-		</ul>
-		{{elseif $subsubcurrent == "balance_exit"}}
-		<ul class="sub">
-			<li class="title strong">Sortie de bilan</li>
+			{{if $subsubcurrent == "amortization"}}
+				<li class="title strong">Amortissements</li>
+			{{elseif $subsubcurrent == "balance_exit"}}
+				<li class="title strong">Sortie de bilan</li>
+			{{elseif $subsubcurrent == "transfer"}}
+				<li class="title strong">Transfert d'immobilisations</li>
+			{{/if}}
 		</ul>
 	{{/if}}
 

_unfinished.html

@@ -59,6 +59,11 @@
 
 			{{:assign accounts_condition="("}}
 			{{#foreach from=$module.config.unfinished item="elem"}}
+				{{if $elem|has_key:"code"}}
+					{{:assign code=$elem.code}}
+				{{else}}
+					{{:assign code=$elem}}
+				{{/if}}
 				{{:assign code=$elem.code|cat:"%"|quote_sql}}
 				{{:assign accounts_condition=$accounts_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}}
 			{{/foreach}}

add_account.html

@@ -1,5 +1,5 @@
 {{* -*- brindille -*- *}}
-{{:admin_header title="Ajout immobilisation" current="module_amortissement"}}
+{{:admin_header title="Ajout immobilisation" current="module_amortization"}}
 
 {{* barre de navigation *}}
 {{if ! $dialog}}

add_asset.html

@@ -56,7 +56,12 @@
 	{{#foreach from=$module.config.prefixes item="code"}}
 		{{:assign var="prefix_array." value=$code}}
 	{{/foreach}}
-	{{#foreach from=$module.config.unfinished item="code"}}
+	{{#foreach from=$module.config.unfinished item="elem"}}
+		{{if $elem|has_key:"code"}}
+			{{:assign code=$elem.code}}
+		{{else}}
+			{{:assign code=$elem}}
+		{{/if}}
 		{{:assign var="prefix_array." value=$code}}
 	{{/foreach}}
 
@@ -77,7 +82,12 @@
 	{{:assign credit_account=$credit_account|keys|value:0}}
 
 	{{* déterminer si le compte d'immo est un compte d'immo en cours *}}
-	{{#foreach from=$module.config.unfinished item="code"}}
+	{{#foreach from=$module.config.unfinished item="elem"}}
+		{{if $elem|has_key:"code"}}
+			{{:assign code=$elem.code}}
+		{{else}}
+			{{:assign code=$elem}}
+		{{/if}}
 		{{if $debit_account|strpos:$code === 0}}
 			{{:assign status="unfinished"}}
 		{{/if}}
@@ -147,7 +157,7 @@
 
 {{/form}}
 
-{{:admin_header title="Ajout immobilisation" current="module_amortissement"}}
+{{:admin_header title="Ajout immobilisation" current="module_amortization"}}
 {{* barre de navigation *}}
 {{if ! $dialog}}
 	{{:include file="_nav.html" current="index"}}
@@ -164,8 +174,13 @@
 {{#foreach from=$module.config.prefixes item="code"}}
 	{{:assign var="pattern_array." value="%s*"|args:$code}}
 {{/foreach}}
-{{#foreach from=$module.config.unfinished item="code"}}
-	{{:assign var="pattern_array." value="%s*"|args:$code}}
+{{#foreach from=$module.config.unfinished item="elem"}}
+	{{if $elem|has_key:"code"}}
+		{{:assign code=$elem.code}}
+	{{else}}
+		{{:assign code=$elem}}
+	{{/if}}
+{{:assign var="pattern_array." value="%s*"|args:$code}}
 {{/foreach}}
 {{:assign var="patterns" value=$pattern_array|implode:"|"}}
 

add_infos.html

@@ -76,7 +76,7 @@
 	{{:form_errors}}
 {{/form}}
 
-{{:admin_header title="Informations amortissement" custom_css=$custom_css current="module_amortissement"}}
+{{:admin_header title="Informations amortissement" custom_css=$custom_css current="module_amortization"}}
 
 {{* barre de navigation *}}
 {{if ! $dialog}}

aide.html

@@ -1,6 +1,6 @@
 {{* -*- brindille -*- *}}
 
-{{:admin_header title="Aide" custom_css="./style.css" current="module_amortissement"}}
+{{:admin_header title="Aide" custom_css="./style.css" current="module_amortization"}}
 
 {{* barre de navigation *}}
 {{:include file="_nav.html" current="aide"}}

amortization.html

@@ -120,7 +120,7 @@
 {{/select}}
 
 
-{{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortissement"}}
+{{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortization"}}
 
 {{* barre de navigation *}}
 {{if $_GET.type_immo == "amortized" || $valeur_residuelle== 0 }}

balance_sheet_exit.html

@@ -170,7 +170,7 @@
 	{{:redirect to="compute_exit_data.html?immo_id=%s&amort_amount=%s&year=%s&date_mes=%s&date_debut=%s&exit_date=%s&duree_amort=%s"|args:$_GET.immo_id:$amort_amount:$selected_year:$ts_mes:$ts_debut:$ts_exit:$duree_amort}}
 {{/form}}
 
-{{:admin_header title="Sortie de bilan" custom_css="./style.css" current="module_amortissement"}}
+{{:admin_header title="Sortie de bilan" custom_css="./style.css" current="module_amortization"}}
 {{* barre de navigation *}}
 {{if ! $dialog}}
 	{{:include file="_nav.html" current="index" subcurrent="%s"|args:$_GET.type_immo subsubcurrent="balance_exit"}}

compute_exit_data.html

@@ -46,7 +46,7 @@
 	{{:redirect to="write_exit.html?immo_id=%s&amort_amount=%s&year=%s&date_mes=%s&date_debut=%s&exit_date=%s&duree_amort=%s&cession=%s"|args:$_GET.immo_id:$_GET.amort_amount:$_GET.year:$_GET.date_mes:$_GET.date_debut:$_GET.exit_date:$_GET.duree_amort:$_POST.montant_cession}}
 
 {{/form}}
-{{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortissement"}}
+{{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortization"}}
 
 {{* barre de navigation *}}
 {{if ! $dialog}}

config.html

@@ -45,7 +45,7 @@
 	{{:form_errors}}
 {{/form}}
 
-{{:admin_header title="Configuration" custom_css="./style.css" current="module_amortissement"}}
+{{:admin_header title="Configuration" custom_css="./style.css" current="module_amortization"}}
 {{:include file="_nav.html" current="config"}}
 {{if $_GET.ok == 1}}
 	<p class="block confirm">Configuration enregistrée.</p>
@@ -99,6 +99,11 @@
 	{{* libellés des comptes d'immobilisation en cours de constitution *}}
 	{{:assign condition="("}}
 	{{#foreach from=$module.config.unfinished item="elem"}}
+		{{if $elem|has_key:"code"}}
+			{{:assign code=$elem.code}}
+		{{else}}
+			{{:assign code=$elem}}
+		{{/if}}
 		{{:assign code=$elem.code|quote_sql}}
 		{{:assign condition=$condition|cat:" account.code = "|cat:$code|cat:" OR "}}
 	{{/foreach}}

filters.html

@@ -1,6 +1,6 @@
 {{* -*- brindille -*- *}}
 
-{{:admin_header title="Configuration" custom_css="./style.css" current="module_amortissement"}}
+{{:admin_header title="Configuration" custom_css="./style.css" current="module_amortization"}}
 {{:include file="_nav.html" current="config" subcurrent="filters"}}
 
 {{if $_GET.ok == 1}}

ignore.html

@@ -49,7 +49,7 @@
 	{{:form_errors}}
 {{/form}}
 
-{{:admin_header title="Ignorer l'écriture" custom_css="./style.css" current="module_amortissement"}}
+{{:admin_header title="Ignorer l'écriture" custom_css="./style.css" current="module_amortization"}}
 
 {{* barre de navigation *}}
 {{if ! $dialog}}

index.html

@@ -16,7 +16,7 @@
 	{{elseif $type_immo == "other"}}
 		{{:admin_header title="Autres immobilisations" custom_css="./style.css" current="module_amortization"}}
 	{{elseif $type_immo == "unfinished"}}
-		{{:admin_header title="Immobilisations en cours" custom_css="./style.css" current="module_amortization"}}
+		{{:admin_header title="Immobilisations en cours de constitution" custom_css="./style.css" current="module_amortization"}}
 	{{/if}}
 
 {{:include file="_nav.html" current="index" subcurrent="%s"|args:$type_immo}}

other_amortizations.html

@@ -63,7 +63,7 @@
 	{{/select}}
 {{/select}}
 
-{{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortissement"}}
+{{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortization"}}
 
 {{* barre de navigation *}}
 {{if ! $dialog}}

save_amort.html

@@ -208,7 +208,7 @@
 	{{:redirect force="amortization.html?immo_id=%s&ok=1&msg=amortissement"|args:$_GET.immo_id}}
 {{/form}}
 
-{{:admin_header title="Ajout amortissement" current="module_amortissement"}}
+{{:admin_header title="Ajout amortissement" current="module_amortization"}}
 
 {{* barre de navigation *}}
 {{if ! $dialog}}

transfer.html

@@ -1,6 +1,6 @@
 {{* -*- brindille -*- *}}
 
-{{:admin_header title="Transfert d'immobilisation en cours" current="module_amortissement"}}
+{{:admin_header title="Transfert d'immobilisation en cours" custom_css="./style.css" current="module_amortization"}}
 {{:include file="_get_config.html" keep="module.config.prefixes"}}
 
 {{#years closed=false order="start_date" assign=years.}}
@@ -21,6 +21,11 @@
 {{:include file="_get_config.html" keep="module.config.unfinished"}}
 {{:assign condition="("}}
 {{#foreach from=$module.config.unfinished item="elem"}}
+	{{if $elem|has_key:"code"}}
+		{{:assign code=$elem.code}}
+	{{else}}
+		{{:assign code=$elem}}
+	{{/if}}
 	{{:assign code=$elem.code|cat:"%"|quote_sql}}
 	{{:assign condition=$condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}}
 {{/foreach}}
@@ -191,7 +196,7 @@
 
 {{* barre de navigation *}}
 {{if ! $dialog}}
-	{{:include file="_nav.html" current="index"}}
+	{{:include file="_nav.html" current="index" subcurrent="unfinished" subsubcurrent="transfer"}}
 {{/if}}
 
 {{:form_errors}}

write_exit.html

@@ -248,7 +248,7 @@
 	{{:redirect to="index.html?type_immo=archived"}}
 {{/form}}
 
-{{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortissement"}}
+{{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortization"}}
 
 {{* barre de navigation *}}
 {{if ! $dialog}}