From ec54c9044065ad096d53b71132d9c8e3b27f24ef Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Mon, 15 Dec 2025 15:59:18 +0100 Subject: [PATCH] Changement filtre brindille : key => value --- _check_account.html | 2 +- _get_codes.html | 6 +++++- add_asset.html | 4 ++-- save_amort.html | 4 ++-- transfer.html | 4 ++-- write_exit.html | 14 +++++++------- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/_check_account.html b/_check_account.html index 06e1108..ce6816e 100644 --- a/_check_account.html +++ b/_check_account.html @@ -19,7 +19,7 @@ {{/foreach}} {{:assign condition=$condition|cat:"0)"}} -{{:assign account_code=$account|keys|key:0}} +{{:assign account_code=$account|keys|value:0}} {{#sql select="code" tables="acc_accounts" diff --git a/_get_codes.html b/_get_codes.html index a780b40..0373085 100644 --- a/_get_codes.html +++ b/_get_codes.html @@ -2,9 +2,13 @@ {{* déterminer le numéro du compte passé en paramètre dans un tableau + la clé est parfois l'identifiant du compte, parfois son code... + d'où l'obligation d'extraire le code de la valeur qui a toujours + la forme : code — libellé *}} -{{:assign label=$account|values|key:0}} +{{:assign values=$account|values}} +{{:assign label=$values.0}} {{:assign pos=$label|strpos:" "}} {{:assign account_code=$label|substr:0:$pos}} {{:assign var="account_code.%s"|args:$account_code value=$label}} diff --git a/add_asset.html b/add_asset.html index 898042d..39c8b00 100644 --- a/add_asset.html +++ b/add_asset.html @@ -93,8 +93,8 @@ date=$_POST.date_achat label=$_POST.designation amount=$_POST.montant - debit=$debit_account|keys|key:0 - credit=$credit_account|keys|key:0 + debit=$debit_account|keys|value:0 + credit=$credit_account|keys|value:0 id_project=$_POST.id_project }} diff --git a/save_amort.html b/save_amort.html index 8fc110d..2872348 100644 --- a/save_amort.html +++ b/save_amort.html @@ -181,14 +181,14 @@ {{:assign var="lines." debit=$_POST.montant - account=$debit_account|keys|key:0 + account=$debit_account|keys|value:0 id_project=$_GET.project_id label=$_POST.designation }} {{:assign var="lines." credit=$_POST.montant - account=$credit_account|keys|key:0 + account=$credit_account|keys|value:0 id_project=$_GET.project_id label=$_POST.designation }} diff --git a/transfer.html b/transfer.html index c7f5dfc..6756386 100644 --- a/transfer.html +++ b/transfer.html @@ -54,7 +54,7 @@ account=$elem keep="account_code" }} - {{:assign debit_account=$account_code|keys|key:0}} + {{:assign debit_account=$account_code|keys|value:0}} {{:assign var="amount" from="_POST.credit_lines.%s"|args:$rang}} {{:assign var="label" from="_POST.line_labels.%s"|args:$rang}} {{:assign @@ -71,7 +71,7 @@ account=$_POST.debit_account keep="account_code" }} - {{:assign credit_account=$account_code|keys|key:0}} + {{:assign credit_account=$account_code|keys|value:0}} {{:assign var="amount" from="_POST.debit_lines.%s"|args:0}} {{:assign count=$_POST.line_labels|count}} {{:assign count="%d-1"|math:$count}} diff --git a/write_exit.html b/write_exit.html index 168a776..1e5d067 100644 --- a/write_exit.html +++ b/write_exit.html @@ -73,7 +73,7 @@ account=$account keep="account_code" }} - {{:assign amort_account_code=$account_code|keys|key:0}} + {{:assign amort_account_code=$account_code|keys|value:0}} {{if $valeur_nette > 0}} {{* immo non totalement amortie *}} @@ -84,7 +84,7 @@ account=$_POST.comp_account keep="account_code" }} - {{:assign comp_account_code=$account_code|keys|key:0}} + {{:assign comp_account_code=$account_code|keys|value:0}} {{:assign libelle="Amortissement complémentaire "|cat:$ligne_immo.label}} {{:assign @@ -110,7 +110,7 @@ account=$_POST.except_account keep="account_code" }} - {{:assign except_account_code=$account_code|keys|key:0}} + {{:assign except_account_code=$account_code|keys|value:0}} {{:assign libelle="Amortissement exceptionnel "|cat:$ligne_immo.label}} {{:assign var="lines." @@ -150,7 +150,7 @@ account=$_POST.immo_account keep="account_code" }} - {{:assign immo_account_code=$account_code|keys|key:0}} + {{:assign immo_account_code=$account_code|keys|value:0}} {{:assign libelle="Sortie du bilan de "|cat:$ligne_immo.label}} {{:assign var="lines." @@ -172,7 +172,7 @@ account=$_POST.vnc_account keep="account_code" }} - {{:assign vnc_account_code=$account_code|keys|key:0}} + {{:assign vnc_account_code=$account_code|keys|value:0}} {{:assign var="lines." account=$vnc_account_code @@ -203,13 +203,13 @@ account=$_POST.creance_account keep="account_code" }} - {{:assign creance_account=$account_code|keys|key:0}} + {{:assign creance_account=$account_code|keys|value:0}} {{:include file="_get_codes.html" account=$_POST.cession_account keep="account_code" }} - {{:assign cession_account=$account_code|keys|key:0}} + {{:assign cession_account=$account_code|keys|value:0}} {{:api method="POST" path="accounting/transaction"