From 024d003696e8b956fd6b4906fd6014a8bbe5b080 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 17 Jun 2026 13:41:55 +0200 Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20navigation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- add_infos.html | 2 +- exit_step1.html | 9 +++++++-- exit_step2.html | 11 ++++++++--- exit_step3.html | 13 +++++++++---- exit_step4.html | 9 +++++++-- 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/add_infos.html b/add_infos.html index 3d2182f..7487634 100644 --- a/add_infos.html +++ b/add_infos.html @@ -71,7 +71,7 @@ status=null assign_new_id="immo_doc_id" }} - {{:redirect force="exit_step1.html?immo_doc_id=%s"|args:$immo_doc_id}} + {{:redirect force="exit_step1.html?immo_doc_id=%s&from=exit"|args:$immo_doc_id}} {{else}} {{* immobilisation amortissable *}} {{if $_POST.date_achat|parse_date > $ligne_immo.date_achat}} diff --git a/exit_step1.html b/exit_step1.html index 0b85eb9..1154fcb 100644 --- a/exit_step1.html +++ b/exit_step1.html @@ -123,7 +123,12 @@ {{/select}} {{:admin_header title="Immobilisation sortie du bilan" custom_css="./style.css" current="module_amortization"}} -{{:include file="_nav.html" current="archived" subcurrent="exit"}} +{{if $_GET.from == "exit"}} + {{:assign current="other"}} +{{else}} + {{:assign current="archived"}} +{{/if}} +{{:include file="_nav.html" current=$current subcurrent="exit"}} {{if $_GET.ok}} {{if $_GET.msg|match:"attach_avoir"}} @@ -233,7 +238,7 @@ {{/if}} -
+

{{:button type="submit" name="proceed" label="Poursuivre" shape="right" class="main"}}

diff --git a/exit_step2.html b/exit_step2.html index ee740ff..8235a02 100644 --- a/exit_step2.html +++ b/exit_step2.html @@ -13,11 +13,11 @@ {{/if}} {{#form on="backward"}} - {{:redirect to="exit_step1.html?immo_doc_id=%s"|args:$_GET.immo_doc_id}} + {{:redirect to="exit_step1.html?immo_doc_id=%s&from=%s"|args:$_GET.immo_doc_id:$_GET.from}} {{/form}} {{#form on="forward"}} - {{:redirect to="exit_step3.html?immo_doc_id=%s"|args:$_GET.immo_doc_id}} + {{:redirect to="exit_step3.html?immo_doc_id=%s&from=%s"|args:$_GET.immo_doc_id:$_GET.from}} {{/form}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} @@ -90,7 +90,12 @@ {{/select}} {{:admin_header title="Immobilisation sortie du bilan" custom_css="./style.css" current="module_amortization"}} -{{:include file="_nav.html" current="archived" subcurrent="exit"}} +{{if $_GET.from == "exit"}} + {{:assign current="other"}} +{{else}} + {{:assign current="archived"}} +{{/if}} +{{:include file="_nav.html" current=$current subcurrent="exit"}} {{if $_GET.ok}} {{if $_GET.msg|match:"attach_amort"}} diff --git a/exit_step3.html b/exit_step3.html index 458357c..fca3fec 100644 --- a/exit_step3.html +++ b/exit_step3.html @@ -13,11 +13,11 @@ {{/if}} {{#form on="backward"}} - {{:redirect to="exit_step2.html?immo_doc_id=%s"|args:$_GET.immo_doc_id}} + {{:redirect to="exit_step2.html?immo_doc_id=%s&from=%s"|args:$_GET.immo_doc_id:$_GET.from}} {{/form}} {{#form on="forward"}} - {{:redirect to="exit_step4.html?immo_doc_id=%s"|args:$_GET.immo_doc_id}} + {{:redirect to="exit_step4.html?immo_doc_id=%s&from=%s"|args:$_GET.immo_doc_id:$_GET.from}} {{/form}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} @@ -58,7 +58,7 @@ assign="line" }} {{* voir si l'écriture de cession est déjà liée à une immo *}} - {{* TODO VOIR SI TUTILE + {{* TODO VOIR SI UTILE {{#load type="cession_link" where="$$.cession_line_id = :cession_line_id" :cession_line_id = $line.line_id @@ -95,7 +95,12 @@ {{*:debug linked_cessions=$linked_cessions free_cessions=$free_cessions total_cession=$total_cession*}} {{:admin_header title="Immobilisation sortie du bilan" custom_css="./style.css" current="module_amortization"}} -{{:include file="_nav.html" current="archived" subcurrent="exit"}} +{{if $_GET.from == "exit"}} + {{:assign current="other"}} +{{else}} + {{:assign current="archived"}} +{{/if}} +{{:include file="_nav.html" current=$current subcurrent="exit"}} {{if $_GET.ok}} {{if $_GET.msg|match:"attach_cession"}} diff --git a/exit_step4.html b/exit_step4.html index 8a2b51e..f377496 100644 --- a/exit_step4.html +++ b/exit_step4.html @@ -13,7 +13,7 @@ {{/if}} {{#form on="backward"}} - {{:redirect to="exit_step3.html?immo_doc_id=%s"|args:$_GET.immo_doc_id}} + {{:redirect to="exit_step3.html?immo_doc_id=%s&from=%s"|args:$_GET.immo_doc_id:$_GET.from}} {{/form}} {{#form on="validate"}} @@ -164,7 +164,12 @@ {{/select}} {{:admin_header title="Immobilisation sortie du bilan" custom_css="./style.css" current="module_amortization"}} -{{:include file="_nav.html" current="archived" subcurrent="exit"}} +{{if $_GET.from == "exit"}} + {{:assign current="other"}} +{{else}} + {{:assign current="archived"}} +{{/if}} +{{:include file="_nav.html" current=$current subcurrent="exit"}} {{if $_GET.ok}} {{if $_GET.msg|match:"attach_exit"}}