From a9fdb1a1950dd1def69dc82a4ba442b30e26d1ec Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Tue, 2 Dec 2025 14:43:10 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Modification=20pr=C3=A9sentation=20totaux?= =?UTF-8?q?=20(fin=20tableau)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _archives.html | 82 ++++++++++++++++++++++++++++++------------- _immobilisations.html | 42 ++++++++++++++-------- _nav.html | 1 - _unfinished.html | 40 +++++++++++++-------- style.css | 24 ------------- 5 files changed, 112 insertions(+), 77 deletions(-) diff --git a/_archives.html b/_archives.html index 4385dff..0eed040 100644 --- a/_archives.html +++ b/_archives.html @@ -107,32 +107,66 @@ {{/select}} {{/foreach}} + + + {{if $total_immo != 0}} + {{#foreach from=$sommes_immo|ksort key="code" item="value"}} + + + + + Total du compte {{$code}} + {{$value|money}} + + + + + + {{/foreach}} + + + + + Total des immobilisations + {{$total_immo|money}} + + + + + + {{/if}} + {{if $total_cessions != 0}} + + + + {{#foreach from=$montant_cessions|ksort key="code" item="value"}} + + + + + Cessions du compte {{$code}} + {{$value|money}} + + + + + + {{/foreach}} + + + + + Total des cessions + {{$total_cessions|money}} + + + + + + {{/if}} + {{if $nb_immo == 0}}

Aucune immobilisation

- {{else}} - {{/if}} diff --git a/_immobilisations.html b/_immobilisations.html index ee13934..d27239d 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -187,22 +187,36 @@ {{/select}} + + {{if $total_immo != 0}} + {{#foreach from=$sommes_immo|ksort key="code" item="value"}} + + + + Total du compte {{$code}} + {{$value|money}} + + + + + + + {{/foreach}} + + + + Total des immobilisations + {{$total_immo|money}} + + + + + + + {{/if}} + {{if $nb_immo == 0}}

Aucune immobilisation

- {{else}} - {{/if}} diff --git a/_nav.html b/_nav.html index 9c56bfb..979bbb4 100644 --- a/_nav.html +++ b/_nav.html @@ -37,7 +37,6 @@ {{if $current == "config"}} {{/if}} diff --git a/_unfinished.html b/_unfinished.html index 7e8ae46..3e41d55 100644 --- a/_unfinished.html +++ b/_unfinished.html @@ -146,23 +146,35 @@ {{/select}} + + {{if $total_immo != 0}} + {{#foreach from=$sommes_immo|ksort key="code" item="value"}} + + + + + Total du compte {{$code}} + {{$value|money}} + + + + + {{/foreach}} + + + + + Total des immobilisations + {{$total_immo|money}} + + + + + {{/if}} + {{if $nb_immo == 0}}

Aucune immobilisation

- {{else}} - {{/if}} diff --git a/style.css b/style.css index 3f65a59..55f8cdd 100644 --- a/style.css +++ b/style.css @@ -55,27 +55,3 @@ fieldset.shortFormLeft div.informations { span.strong { font-weight: bold; } - -aside.totals { - float : left; - width : 30em; -} - -aside.totals dl.describe { - display: flex; -} - -aside.totals dl.describe dt { - text-align : right; - flex : 0 0 20rem; -} - -aside.totals dl.describe dt::after { - content: ' : '; -} - -aside.totals dl.describe dd { - flex : 0 0 calc(100% - 25rem); - text-align : right; -} - From c6e344fb80770b51e98b20e669c847832eda1e2b Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Tue, 2 Dec 2025 14:44:12 +0100 Subject: [PATCH 2/2] Sortie du bilan : utilisation comptes PC 2025 --- write_exit.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/write_exit.html b/write_exit.html index 340d5fa..168a776 100644 --- a/write_exit.html +++ b/write_exit.html @@ -270,8 +270,8 @@ Utilisation des « anciens » numéros de comptes because conflit avec les nouveaux numéros ; voir info.org *}} -{{:assign vnc_code="675"}} -{{:assign cession_code="775"}} +{{:assign vnc_code="652"}} +{{:assign cession_code="757"}} {{:assign var="liste_codes.6811" name="comp_account"}} {{:assign var="liste_codes.687" name="except_account"}}