From 486fc545699067d2394325dcc38e626c6fdea893 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Tue, 12 Mar 2024 17:09:40 +0100 Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20navigation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _nav.html | 2 +- add_asset.html | 2 +- amortization.html | 1 + index.html | 1 + save_amort.html | 4 ++-- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/_nav.html b/_nav.html index 91fd4ef..95c3ed0 100644 --- a/_nav.html +++ b/_nav.html @@ -1,6 +1,6 @@ diff --git a/add_asset.html b/add_asset.html index baa3071..8dcb03a 100644 --- a/add_asset.html +++ b/add_asset.html @@ -40,7 +40,7 @@ duration=$_POST.duree|intval }} - {{:redirect to="index.html?ok=1&msg=immobilisation"}} + {{:redirect force="index.html?ok=1&msg=immobilisation"}} {{/form}} {{* Préparer les infos pour le formulaire *}} diff --git a/amortization.html b/amortization.html index 3ba2021..ddca66e 100644 --- a/amortization.html +++ b/amortization.html @@ -268,6 +268,7 @@ label="Enregistrer" href="save_amort.html?amount=%d&account=%s&year=%s&trans_id=%d&line_id=%s&project_id=%d&label=%s"|args:$annuite_courante:$ligne_immo.account_id:$current_year:$ligne_immo.trans_id:$_GET.line_id:$project_id:$libelle shape="right" + target="_dialog" }} {{else}} {{:linkbutton label="Enregistrer" href="" shape="lock" class="disabled"}} diff --git a/index.html b/index.html index 7248e98..66daf94 100644 --- a/index.html +++ b/index.html @@ -103,6 +103,7 @@ label="Ajouter une immobilisation" shape="plus" href="add_asset.html" + target="_dialog" }}

diff --git a/save_amort.html b/save_amort.html index 99839fb..d0794c9 100644 --- a/save_amort.html +++ b/save_amort.html @@ -40,7 +40,7 @@ linked_transactions=$_GET.trans_id|intval }} - {{:redirect to="amortization.html?line_id=%s&ok=1&msg=amortissement"|args:$_GET.line_id}} + {{:redirect force="amortization.html?line_id=%s&ok=1&msg=amortissement"|args:$_GET.line_id}} {{/form}} {{* Préparer les infos pour le formulaire *}} @@ -49,7 +49,7 @@ {{* déterminer le compte d'amortissement en fonction du compte d'immobilisation => ajouter un 8 après le 2 de tête - *}} +*}} {{#select code, label from acc_accounts where id = :id; :id=$_GET.account assign=amort_account}}{{/select}} {{:assign c1=$amort_account.code|substr:0:1}} {{:assign reste=$amort_account.code|substr:1}}