From ab9b2a37ff6b4fadec91293f1b957f221fef6144 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 4 Jun 2025 14:30:21 +0200 Subject: [PATCH 01/16] =?UTF-8?q?Modification=20interaction=20amortissemen?= =?UTF-8?q?ts=20=C3=A0=20rattacher?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _immobilisations_autres.html | 4 +- _nav.html | 23 +++----- amortization.html | 20 ++++++- other_amortizations.html | 104 +++++++++++++++++++++++++++++++++++ style.css | 4 ++ 5 files changed, 137 insertions(+), 18 deletions(-) create mode 100644 other_amortizations.html diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index a24f4b7..f06ce9f 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -109,14 +109,14 @@ {{if $status == "nsp"}} {{:linkbutton - label="Paramètres" + label="Amortir" href="add_infos.html?immo_id=%s&amort=0&op=new&type_immo=autres"|args:$immo_id shape="settings" target="_dialog" }} {{else}} {{:linkbutton - label="Paramètres" + label="Amortir" href="add_infos.html?immo_id=%s&amort=0&op=modif&type_immo=autres"|args:$immo_id shape="settings" target="_dialog" diff --git a/_nav.html b/_nav.html index f847605..913e5bc 100644 --- a/_nav.html +++ b/_nav.html @@ -5,21 +5,19 @@ + {{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "encours"}} + {{/if}} -{{* - -*}} - {{if $current == 'index' && $subsubcurrent != 'balance_exit'}} -{{* {{elseif $subsubcurrent == 'balance_exit'}} -{{* - -*}} {{/if}} diff --git a/amortization.html b/amortization.html index 0e97af0..cd9255a 100644 --- a/amortization.html +++ b/amortization.html @@ -77,7 +77,7 @@ {{else}} {{:assign subcurrent="autres"}} {{/if}} -{{:include file="_nav.html" current="index" subcurrent="%s"|args:$subcurrent subsubcurrent="amortization"}} +{{:include file="_nav.html" current="index" subcurrent="%s"|args:$subcurrent subsubcurrent="amortization" type_immo=$_GET.type_immo}} {{if $_GET.ok}} {{if $_GET.msg|match:"attach"}} @@ -97,6 +97,7 @@

{{$msg}}

{{/if}} +{{* {{if $valeur_residuelle > 0}} {{/if}} +*}}
@@ -135,6 +137,16 @@
Durée
{{$duree}} ans
{{/if}} + {{if $valeur_residuelle > 0}} +
Montant déjà amorti
+
{{"%d-%d"|math:$ligne_immo.montant:$valeur_residuelle|money_currency:false}}
+
Valeur résiduelle
+
{{$valeur_residuelle|money_currency}}
+ {{/if}} + {{if $duree != null && $valeur_residuelle > 0}} +
Annuité estimée
+
{{"%f/%d"|math:$ligne_immo.montant:$duree|money_currency}}
+ {{/if}}

Amortissements enregistrés

@@ -220,6 +232,11 @@ {{/select}} {{if $autres_amortissements != null}} +

+ Il existe des écritures d'amortissement qui ne sont pas rattachés à une immobilisation !
+ Utilisez le bouton « Attacher un amortissement » pour les afficher ; vous pourrez choisir d'en attacher certaines à cette immobilisation. +

+{{*

Amortissements non rattachés

@@ -258,6 +275,7 @@
+ *}} {{/if}} {{/if}} {{:form_errors}} diff --git a/other_amortizations.html b/other_amortizations.html new file mode 100644 index 0000000..e817e5f --- /dev/null +++ b/other_amortizations.html @@ -0,0 +1,104 @@ +{{* -*- brindille -*- *}} + +{{* + Lister les écritures d'amortissement indépendantes + et proposer des les attacher à l'immo sélectionnée + @param immo_id = id de la ligne d'immo + *}} + +{{* récupérer les infos de l'immobilisation *}} +{{#select + line.id as immo_id, + line.debit as montant, + trans.id as trans_id, + trans.label as label, + trans.date + FROM acc_transactions_lines AS line + INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id + WHERE line.id = :line_id; + :line_id = $_GET.immo_id|intval + assign=ligne_immo + }} +{{else}} + {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_id}} +{{/select}} + +{{#select + line.id as l_id, + line.id_transaction as t_id, + line.credit as amort_amount, + line.label as l_label, + trans.date as t_date, + trans.label as t_label, + trans.id_year as amort_year, + account.id as account_id, + account.code as account_code, + account.label as account_label + FROM acc_transactions_lines AS line + INNER JOIN acc_accounts AS account ON account.id = line.id_account + INNER JOIN acc_transactions AS trans ON trans.id = line.id_transaction + INNER JOIN acc_years AS y ON y.id = trans.id_year + WHERE account.code LIKE "28%" AND credit > 0 AND (NOT trans.status & 16) + ORDER BY trans.date, trans.label; + assign=autre_amort +}} + {{#select + id_transaction, + id_related + FROM acc_transactions_links + WHERE id_transaction = :id_amort OR id_related = :id_amort; + :id_amort=$t_id + }} + {{else}} + {{:assign var="autres_amortissements." value=$autre_amort}} + {{/select}} +{{/select}} + +{{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortissement"}} +{{* barre de navigation *}} +{{if ! $dialog}} + {{:include file="_nav.html" current="index" subcurrent="autres" subsubcurrent="amortization"}} +{{/if}} + +{{if $autres_amortissements != null}} +
+

Immobilisation « {{$ligne_immo.label}} »

+ + + + + + + + + + + + + + {{#foreach from=$autres_amortissements item="line"}} + {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.t_id}} + {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.amort_year}} + + + + + + + + + + {{/foreach}} + +
N°DateMontantLibelléN° compteCompte
#{{$line.t_id}}{{$line.t_date|date_short}}{{"%f"|math:$line.amort_amount|money}}{{if $line.l_label == null}} + {{$line.t_label}} + {{else}} + {{$line.l_label}} + {{/if}} + {{$line.account_code}}{{$line.account_label}} + {{:linkbutton label="Attacher" href="attach_amort.html?amort_id=%d&immo_id=%d"|args:$line.l_id:$_GET.immo_id shape="plus"}} +
+
+{{/if}} +{{:form_errors}} +{{:admin_footer}} diff --git a/style.css b/style.css index c9c23f9..fd1cbfb 100644 --- a/style.css +++ b/style.css @@ -41,3 +41,7 @@ h2[class="aide"], h3[class="aide"] { nav.amort aside { margin-top : 0; } + +.describe dt::after { + content: ' :'; +} From e0cf555851d9737c7469fdbdb2810db46802fc99 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 4 Jun 2025 18:54:19 +0200 Subject: [PATCH 02/16] =?UTF-8?q?Harmonisation=20et=20am=C3=A9lioration=20?= =?UTF-8?q?navigation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _immobilisations.html | 4 +- _nav.html | 15 +++-- add_infos.html | 2 +- amortization.html | 141 +++++++++++++++------------------------ attach_amort.html | 2 +- balance_sheet_exit.html | 3 +- index.html | 4 +- other_amortizations.html | 10 ++- write_exit.html | 2 +- 9 files changed, 82 insertions(+), 101 deletions(-) diff --git a/_immobilisations.html b/_immobilisations.html index 2d8281d..6e93d2d 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -5,7 +5,7 @@
{{if $type_immo == "encours"}}

Immobilisations en cours

- {{elseif $type_immo == "fini"}} + {{elseif $type_immo == "amortie"}}

Immobilisations amorties

{{/if}} {{:assign nb_immo=0}} @@ -134,7 +134,7 @@ {{* classement par onglet *}} {{if $type_immo == "encours" && $amort_amount >= $debit || - $type_immo == "fini" && $amort_amount < $debit || + $type_immo == "amortie" && $amort_amount < $debit || $amortissable == "nsp" && ! $exist_amort }} {{:continue}} diff --git a/_nav.html b/_nav.html index 913e5bc..4ce4216 100644 --- a/_nav.html +++ b/_nav.html @@ -5,19 +5,21 @@ - {{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "encours"}} + {{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "encours" || $type_immo == "autres"}} {{/if}} - {{if $current == 'index' && $subsubcurrent != 'balance_exit'}} + {{if $current == 'index'}} {{* && $subsubcurrent != 'balance_exit' *}} {{/if}} @@ -27,5 +29,8 @@
  • Amortissements
    • {{elseif $subsubcurrent == 'balance_exit'}} +
      +
    • Sortie de bilan
      • +
    {{/if}} diff --git a/add_infos.html b/add_infos.html index a823e2e..4a5ae85 100644 --- a/add_infos.html +++ b/add_infos.html @@ -4,7 +4,7 @@ @param immo_id @param amort = 1 si immo amortissable, 0 si non @param op = new ou modif - @param type_immo : encours, archive, fini, autre + @param type_immo : encours, sortie, amortie, autre *}} {{if $_GET.op == "modif"}} diff --git a/amortization.html b/amortization.html index cd9255a..29fdad6 100644 --- a/amortization.html +++ b/amortization.html @@ -1,5 +1,11 @@ {{* -*- brindille -*- *}} +{{* + Lister les écritures d'amortissement associées à une immobilisation + @param immo_id : id de la ligne d'immo + @param type_immo : encours, amortie, sortie, autres +*}} + {{* récupérer les infos de l'immobilisation *}} {{#select line.id as immo_id, @@ -65,19 +71,60 @@ {{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$amort_amount}} {{/foreach}} +{{* Autres amortissements non rattachés *}} +{{#select + line.id as l_id, + line.id_transaction as t_id, + line.credit as amort_amount, + line.label as l_label, + trans.date as t_date, + trans.label as t_label, + trans.id_year as amort_year, + account.id as account_id, + account.code as account_code, + account.label as account_label + FROM acc_transactions_lines AS line + INNER JOIN acc_accounts AS account ON account.id = line.id_account + INNER JOIN acc_transactions AS trans ON trans.id = line.id_transaction + INNER JOIN acc_years AS y ON y.id = trans.id_year + WHERE account.code LIKE "28%" AND credit > 0 AND (NOT trans.status & 16) + ORDER BY trans.date, trans.label; + assign=autre_amort +}} + {{#select + id_transaction, + id_related + FROM acc_transactions_links + WHERE id_transaction = :id_amort OR id_related = :id_amort; + :id_amort=$t_id + }} + {{else}} + {{:assign var="autres_amortissements." value=$autre_amort}} + {{/select}} +{{/select}} + + {{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortissement"}} {{* barre de navigation *}} -{{if $_GET.type_immo == "fini" || $valeur_residuelle== 0 }} - {{:assign subcurrent="fini"}} -{{elseif $_GET.type_immo == "archive"}} - {{:assign subcurrent="archive"}} +{{if $_GET.type_immo == "amortie" || $valeur_residuelle== 0 }} + {{:assign subcurrent="amortie"}} +{{elseif $_GET.type_immo == "sortie"}} + {{:assign subcurrent="sortie"}} {{elseif $_GET.type_immo == null || $_GET.type_immo == "encours"}} {{:assign subcurrent="encours"}} {{else}} {{:assign subcurrent="autres"}} {{/if}} -{{:include file="_nav.html" current="index" subcurrent="%s"|args:$subcurrent subsubcurrent="amortization" type_immo=$_GET.type_immo}} + +{{:include + file="_nav.html" + current="index" + subcurrent="%s"|args:$subcurrent + subsubcurrent="amortization" + type_immo=$_GET.type_immo + autres_amort=$autres_amortissements +}} {{if $_GET.ok}} {{if $_GET.msg|match:"attach"}} @@ -97,23 +144,13 @@

    {{$msg}}

    {{/if}} -{{* -{{if $valeur_residuelle > 0}} - -{{/if}} -*}} -
    Sortir l'immobilisation du bilan ?

    {{:linkbutton label="Sortir du bilan" - href="balance_sheet_exit.html?immo_id=%s"|args:$_GET.immo_id + href="balance_sheet_exit.html?immo_id=%s&type_immo=%s"|args:$_GET.immo_id:$_GET.type_immo shape="export" class="main" }} @@ -197,85 +234,15 @@

    Aucun amortissement enregistré pour cette immobilisation

    {{/if}} -{{if $_GET.type_immo == null || $_GET.type_immo != "fini"}} +{{if $_GET.type_immo == null || $_GET.type_immo != "amortie"}} {{* Autres amortissements non rattachés *}} - {{#select - line.id as l_id, - line.id_transaction as t_id, - line.credit as amort_amount, - line.label as l_label, - trans.date as t_date, - trans.label as t_label, - trans.id_year as amort_year, - account.id as account_id, - account.code as account_code, - account.label as account_label - FROM acc_transactions_lines AS line - INNER JOIN acc_accounts AS account ON account.id = line.id_account - INNER JOIN acc_transactions AS trans ON trans.id = line.id_transaction - INNER JOIN acc_years AS y ON y.id = trans.id_year - WHERE account.code LIKE "28%" AND credit > 0 AND (NOT trans.status & 16) - ORDER BY trans.date, trans.label; - assign=autre_amort - }} - {{#select - id_transaction, - id_related - FROM acc_transactions_links - WHERE id_transaction = :id_amort OR id_related = :id_amort; - :id_amort=$t_id - }} - {{else}} - {{:assign var="autres_amortissements." value=$autre_amort}} - {{/select}} - {{/select}} {{if $autres_amortissements != null}}

    Il existe des écritures d'amortissement qui ne sont pas rattachés à une immobilisation !
    Utilisez le bouton « Attacher un amortissement » pour les afficher ; vous pourrez choisir d'en attacher certaines à cette immobilisation.

    -{{* -
    -

    Amortissements non rattachés

    - - - - - - - - - - - - - - {{#foreach from=$autres_amortissements item="line"}} - {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.t_id}} - {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.amort_year}} - - - - - - - - - - {{/foreach}} - -
    N°DateMontantLibelléN° compteCompte
    #{{$line.t_id}}{{$line.t_date|date_short}}{{"%f"|math:$line.amort_amount|money}}{{if $line.l_label == null}} - {{$line.t_label}} - {{else}} - {{$line.l_label}} - {{/if}} - {{$line.account_code}}{{$line.account_label}} - {{:linkbutton label="Attacher" href="attach_amort.html?amort_id=%d&immo_id=%d"|args:$line.l_id:$ligne_immo.immo_id shape="plus"}} -
    -
    - *}} {{/if}} {{/if}} {{:form_errors}} diff --git a/attach_amort.html b/attach_amort.html index d2863df..8680894 100644 --- a/attach_amort.html +++ b/attach_amort.html @@ -53,4 +53,4 @@ assign_code="result_code" transactions=$linked_transactions }} -{{:redirect to="amortization.html?immo_id=%s&ok=1&msg=attach&trans_id=%s"|args:$_GET.immo_id:$amort_id}} +{{:redirect force="amortization.html?immo_id=%s&ok=1&msg=attach&trans_id=%s"|args:$_GET.immo_id:$amort_id}} diff --git a/balance_sheet_exit.html b/balance_sheet_exit.html index e4aadca..ad1a00a 100644 --- a/balance_sheet_exit.html +++ b/balance_sheet_exit.html @@ -158,9 +158,10 @@ {{/form}} {{:admin_header title="Sortie de bilan" custom_css="./style.css" current="module_amortissement"}} + {{* barre de navigation *}} {{if ! $dialog}} - {{:include file="_nav.html" current="index" subcurrent="balance_exit"}} + {{:include file="_nav.html" current="index" subcurrent="%s"|args:$_GET.type_immo subsubcurrent="balance_exit"}} {{/if}} {{:form_errors}} diff --git a/index.html b/index.html index 9af0454..f949c49 100644 --- a/index.html +++ b/index.html @@ -36,9 +36,9 @@ {{if $type_immo == "autres"}} {{:include file="_immobilisations_autres.html"}} -{{elseif $type_immo == "archive"}} +{{elseif $type_immo == "sortie"}} {{:include file="_archives.html"}} -{{elseif $type_immo == "encours" || $type_immo == "fini"}} +{{elseif $type_immo == "encours" || $type_immo == "amortie"}} {{:include file="_immobilisations.html"}} {{/if}} diff --git a/other_amortizations.html b/other_amortizations.html index e817e5f..bc7d4c3 100644 --- a/other_amortizations.html +++ b/other_amortizations.html @@ -55,9 +55,17 @@ {{/select}} {{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortissement"}} + {{* barre de navigation *}} {{if ! $dialog}} - {{:include file="_nav.html" current="index" subcurrent="autres" subsubcurrent="amortization"}} + {{:include + file="_nav.html" + current="index" + subcurrent="autres" + subsubcurrent="amortization" + type_immo="autres" + autres_amort=$autres_amortissements +}} {{/if}} {{if $autres_amortissements != null}} diff --git a/write_exit.html b/write_exit.html index 77acbb8..b3772df 100644 --- a/write_exit.html +++ b/write_exit.html @@ -260,7 +260,7 @@ }} {{/if}} - {{:redirect to="index.html?amort=archive"}} + {{:redirect to="index.html?amort=sortie"}} {{/form}} {{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortissement"}} From dc823c90e2a0b699bf28fdeaf5e406804b61b1ae Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Tue, 17 Jun 2025 13:39:27 +0200 Subject: [PATCH 03/16] =?UTF-8?q?Am=C3=A9lioration=20cosm=C3=A9tique?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- amortization.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/amortization.html b/amortization.html index 29fdad6..ee68bd0 100644 --- a/amortization.html +++ b/amortization.html @@ -24,6 +24,7 @@ {{/select}} {{:assign date_debut=$ligne_immo.date}} {{:assign solde=$ligne_immo.montant}} +{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}} {{#load type="immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}} {{:assign duree=$duration}} @@ -164,8 +165,8 @@
    -
    Libellé
    -
    {{$ligne_immo.label}}
    +
    Immobilisation
    +
    #{{$ligne_immo.trans_id}} {{$ligne_immo.label}}
    Montant
    {{"%f"|math:$ligne_immo.montant|money_currency}}
    Début d'amortissement
    From 0688ad0fecd203a2329dee8ed3669a57347cf1e9 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Tue, 17 Jun 2025 13:40:29 +0200 Subject: [PATCH 04/16] =?UTF-8?q?Ajout=20cas=20amortissements=20=C2=AB=20o?= =?UTF-8?q?ubli=C3=A9s=20=C2=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- balance_sheet_exit.html | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/balance_sheet_exit.html b/balance_sheet_exit.html index ad1a00a..b557a8e 100644 --- a/balance_sheet_exit.html +++ b/balance_sheet_exit.html @@ -67,19 +67,22 @@ {{:assign valeur_nette="%f-%f"|math:$ligne_immo.montant:$amort_amount}} {{* - lister les exercices qui englobent la date de début du prochain amortissement +lister les exercices ouverts : + - dont la date de fin est postérieure à la date du dernier amortissment + - dont la date de début est antérieure ou égale à la date du jour *}} {{:assign default_exit_date=""}} -{{#years closed=false order="start_date" where="start_date <= :debut AND :debut <= end_date" - :debut=$date_debut assign=years.}} +{{#years closed=false order="start_date" where=":debut <= end_date" :debut=$date_debut}} {{if $start_date|strtotime <= $now && $now <= $end_date|strtotime}} {{:assign default_exit_date=$now|date_short}} {{/if}} - {{:assign ts_fin=$end_date|strtotime}} + {{if $start_date|strtotime > $now}} + {{:break}} + {{/if}} + {{:assign var="years." id=$id label=$label start_date=$start_date end_date=$end_date}} {{:assign debut=$start_date|date_short}} {{:assign fin=$end_date|date_short}} {{:assign var="open_years.%d"|args:$id value=$label|cat:" (du "|cat:$debut|cat:" au "|cat:$fin|cat:")"}} - {{:assign var="years_data.%d"|args:$id value=$ts_debut|cat:" "|cat:$ts_fin}} {{else}} {{:error message="Aucun exercice ouvert pour enregistrer un amortissement"}} {{/years}} @@ -141,6 +144,7 @@ {{* vérifier que la date de sortie est située dans un exercice ouvert *}} {{:assign ts_exit = $_POST.date_sortie|parse_date|strtotime}} {{:assign ok=false}} + {{:assign msg_amort=""}} {{#foreach from=$years}} {{if $id == $_POST.id_year}} {{:assign selected_year=$id}} @@ -149,16 +153,24 @@ {{:break}} {{/if}} {{/if}} + {{* voir si des amortissements ont été oubliés *}} + {{if $start_date|strtotime > $amort_line.last_amort_date|strtotime && $end_date|strtotime < $now}} + {{:assign debut=$start_date|date_short}} + {{:assign fin=$end_date|date_short}} + {{:assign msg_amort=$msg_amort|cat:"\n"|cat:" - "|cat:$label|cat:" : du "|cat:$debut|cat:" au "|cat:$fin}} + {{/if}} {{/foreach}} {{if ! $ok}} {{:error message="La date choisie n'est pas dans l'exercice sélectionné !"}} {{/if}} + {{if $msg_amort != ""}} + {{:error message="Vous devez d'abord enregistrer les amortissements des exercices suivants : %s"|args:$msg_amort}} + {{/if}} {{:redirect to="compute_exit_data.html?immo_id=%s&amort_amount=%s&year=%s&date_mes=%s&date_debut=%s&exit_date=%s&duree_amort=%s"|args:$_GET.immo_id:$amort_amount:$selected_year:$ts_mes:$ts_debut:$ts_exit:$duree_amort}} {{/form}} {{:admin_header title="Sortie de bilan" custom_css="./style.css" current="module_amortissement"}} - {{* barre de navigation *}} {{if ! $dialog}} {{:include file="_nav.html" current="index" subcurrent="%s"|args:$_GET.type_immo subsubcurrent="balance_exit"}} From 19e2fed24801b0bad313bba50cc3b22f746a9e6c Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Thu, 26 Jun 2025 09:57:48 +0200 Subject: [PATCH 05/16] =?UTF-8?q?Harmonisation=20libell=C3=A9s=20pour=20cl?= =?UTF-8?q?assification?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _immobilisations.html | 2 +- _nav.html | 2 +- add_asset.html | 6 +++--- add_infos.html | 2 +- amortization.html | 2 +- index.html | 2 +- write_exit.html | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) 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/_nav.html b/_nav.html index f847605..50db683 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"}} From 79e536a0b312306aaab3db6914c2ebc49026b505 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Thu, 26 Jun 2025 10:17:08 +0200 Subject: [PATCH 06/16] =?UTF-8?q?Harmonisation=20libell=C3=A9s=20pour=20cl?= =?UTF-8?q?assification=20(suite)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _immobilisations_autres.html | 6 +++--- _nav.html | 4 ++-- other_amortizations.html | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index f06ce9f..9924fed 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -110,21 +110,21 @@ {{if $status == "nsp"}} {{:linkbutton label="Amortir" - 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="Amortir" - 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 1383687..f5c6b94 100644 --- a/_nav.html +++ b/_nav.html @@ -5,7 +5,7 @@ - {{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "encours" || $type_immo == "autres"}} + {{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "encours" || $type_immo == "autre"}}