Amélioration navigation

This commit is contained in:
Jean-Christophe Engel 2026-06-17 13:41:55 +02:00
parent 74707a38c2
commit 024d003696
5 changed files with 32 additions and 12 deletions

View file

@ -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}}

View file

@ -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 @@
</table>
{{/if}}
<form method="post" action="exit_step2.html?immo_doc_id={{$_GET.immo_doc_id}}">
<form method="post" action="exit_step2.html?immo_doc_id={{$_GET.immo_doc_id}}&from={{$_GET.from}}">
<p class="submit">
{{:button type="submit" name="proceed" label="Poursuivre" shape="right" class="main"}}
</p>

View file

@ -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"}}

View file

@ -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"}}

View file

@ -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"}}