diff --git a/_immobilisations.html b/_immobilisations.html index 2d8281d..f59530c 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -1,6 +1,6 @@ {{* -*- brindille -*- *}} -{{* Liste des immobilisations amortissable ou à définir *}} +{{* Liste des immobilisations en cours ou amorties *}}
{{if $type_immo == "encours"}} diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index a24f4b7..0b3a22b 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -110,21 +110,21 @@ {{if $status == "nsp"}} {{:linkbutton label="Paramètres" - 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="Paramètres" - 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" }} diff --git a/_nav.html b/_nav.html index f847605..1ef59e0 100644 --- a/_nav.html +++ b/_nav.html @@ -20,7 +20,7 @@
  • En cours
  • Terminées
  • Archivées
  • -
  • Autres
  • +
  • Autres
  • {{/if}} diff --git a/add_asset.html b/add_asset.html index 06393f6..666df24 100644 --- a/add_asset.html +++ b/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"}} diff --git a/add_infos.html b/add_infos.html index a823e2e..455c690 100644 --- a/add_infos.html +++ b/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}} diff --git a/amortization.html b/amortization.html index 0e97af0..a3bcca2 100644 --- a/amortization.html +++ b/amortization.html @@ -75,7 +75,7 @@ {{elseif $_GET.type_immo == null || $_GET.type_immo == "encours"}} {{:assign subcurrent="encours"}} {{else}} - {{:assign subcurrent="autres"}} + {{:assign subcurrent="autre"}} {{/if}} {{:include file="_nav.html" current="index" subcurrent="%s"|args:$subcurrent subsubcurrent="amortization"}} diff --git a/index.html b/index.html index 9af0454..11373b9 100644 --- a/index.html +++ b/index.html @@ -34,7 +34,7 @@ {{/select}} {{/load}} -{{if $type_immo == "autres"}} +{{if $type_immo == "autre"}} {{:include file="_immobilisations_autres.html"}} {{elseif $type_immo == "archive"}} {{:include file="_archives.html"}} diff --git a/write_exit.html b/write_exit.html index 77acbb8..023fb14 100644 --- a/write_exit.html +++ b/write_exit.html @@ -260,7 +260,7 @@ }} {{/if}} - {{:redirect to="index.html?amort=archive"}} + {{:redirect to="index.html?type_immo=archive"}} {{/form}} {{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortissement"}}