diff --git a/_nav.html b/_nav.html index f8b6023..5430e64 100644 --- a/_nav.html +++ b/_nav.html @@ -4,7 +4,7 @@ {{if $subcurrent == null}} {{if $current == "managed" || $current == "amortized" || $current == "archived"}} {{/if}} {{/if}} diff --git a/add_asset.html b/add_asset.html index 6473370..727d50d 100644 --- a/add_asset.html +++ b/add_asset.html @@ -151,7 +151,7 @@ {{* barre de navigation *}} {{if ! $dialog}} - {{:linkbutton href="index.html" label="Retour" shape="left"}} + {{:linkbutton href="index.html?type_immo=%s"|args:$_GET.from label="Retour" shape="left"}} {{/if}} {{:form_errors}} diff --git a/index.html b/index.html index 06ab7e4..aee4165 100644 --- a/index.html +++ b/index.html @@ -7,9 +7,7 @@ {{:assign type_immo=$_GET.type_immo}} {{/if}} -{{if $type_immo == "managed"}} - {{:admin_header title="Immobilisations en cours d'amortissement" custom_css="./style.css" current="module_amortization"}} -{{elseif $type_immo == "amortized"}} +{{if $type_immo == "amortized"}} {{:admin_header title="Immobilisations amorties" custom_css="./style.css" current="module_amortization"}} {{elseif $type_immo == "archived"}} {{:admin_header title="Immobilisations archivées" custom_css="./style.css" current="module_amortization"}} @@ -17,6 +15,9 @@ {{: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"}} +{{else}} + {{:assign type_immo="managed"}} + {{:admin_header title="Immobilisations en cours d'amortissement" custom_css="./style.css" current="module_amortization"}} {{/if}} {{:include file="_nav.html" current=$type_immo}} @@ -46,7 +47,7 @@ {{:include file="_archives.html"}} {{elseif $type_immo == "unfinished"}} {{:include file="_unfinished.html"}} -{{elseif $type_immo == "managed" || $type_immo == "amortized"}} +{{else}} {{:include file="_immobilisations.html"}} {{/if}} {{:admin_footer}} diff --git a/module.ini b/module.ini index 73633af..07ac9b4 100644 --- a/module.ini +++ b/module.ini @@ -1,5 +1,5 @@ name="Amortissements" -description="Immobilisations et amortissements\nversion 0.42" +description="Immobilisations et amortissements\nversion 0.42.1" author="Jean-Christophe Engel" author_url="https://gitea.zaclys.com/lesanges" home_button=false