diff --git a/_archives.html b/_archives.html index 0eed040..4385dff 100644 --- a/_archives.html +++ b/_archives.html @@ -107,66 +107,32 @@ {{/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 d27239d..ee13934 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -187,36 +187,22 @@ {{/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 979bbb4..9c56bfb 100644 --- a/_nav.html +++ b/_nav.html @@ -37,6 +37,7 @@ {{if $current == "config"}} {{/if}} diff --git a/_unfinished.html b/_unfinished.html index 3e41d55..7e8ae46 100644 --- a/_unfinished.html +++ b/_unfinished.html @@ -146,35 +146,23 @@ {{/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 55f8cdd..3f65a59 100644 --- a/style.css +++ b/style.css @@ -55,3 +55,27 @@ 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; +} + diff --git a/write_exit.html b/write_exit.html index 168a776..340d5fa 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="652"}} -{{:assign cession_code="757"}} +{{:assign vnc_code="675"}} +{{:assign cession_code="775"}} {{:assign var="liste_codes.6811" name="comp_account"}} {{:assign var="liste_codes.687" name="except_account"}}