diff --git a/_archives.html b/_archives.html index 22ce879..4385dff 100644 --- a/_archives.html +++ b/_archives.html @@ -31,7 +31,6 @@ FROM acc_transactions AS trans INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id INNER JOIN acc_accounts AS account ON line.id_account = account.id - INNER JOIN acc_years AS years ON trans.id_year = years.id INNER JOIN acc_transactions_lines AS line2 ON line.debit = line2.credit INNER JOIN acc_transactions AS trans2 ON trans2.id = line2.id_transaction INNER JOIN acc_accounts AS acc2 ON acc2.id = line2.id_account @@ -61,10 +60,15 @@
{{:assign nb_immo=0}} + {{:assign total_immo = 0}} + {{:assign total_cessions = 0}} {{#foreach from=$immo_archivees}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$trans_id}} {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}} {{:assign nb_immo="%d+1"|math:$nb_immo}} + {{:assign total_immo="%d+%d"|math:$total_immo:$debit}} + {{:assign var="montant" from="sommes_immo.%s"|args:$account_code}} + {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$debit}}Aucune immobilisation
+ {{else}} + {{/if}} diff --git a/_immobilisations.html b/_immobilisations.html index 337fc0b..d823bc6 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -47,6 +47,7 @@ {{:assign condition=$condition|cat:" AND "|cat:$filter_condition}} {{:assign nb_immo=0}} + {{:assign total_immo = 0}} {{#select trans.id as trans_id, trans.label as trans_label, @@ -148,11 +149,14 @@ {{if $type_immo == "amortized" && $amort_amount < $debit && $status != "amortized"}}{{:continue}}{{/if}} {{:assign nb_immo="%d+1"|math:$nb_immo}} + {{:assign total_immo="%d+%d"|math:$total_immo:$debit}} + {{:assign var="montant" from="sommes_immo.%s"|args:$account_code}} + {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$debit}}Aucune immobilisation
+ {{else}} + {{/if}} diff --git a/_unfinished.html b/_unfinished.html index ab7e1e0..68feff2 100644 --- a/_unfinished.html +++ b/_unfinished.html @@ -72,6 +72,7 @@ {{*:debug condition=$condition*}} {{:assign nb_immo=0}} + {{:assign total_immo = 0}} {{#select trans.id as trans_id, trans.label as trans_label, @@ -122,6 +123,9 @@ {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$trans_id}} {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}} {{:assign nb_immo="%d+1"|math:$nb_immo}} + {{:assign total_immo="%d+%d"|math:$total_immo:$debit}} + {{:assign var="montant" from="sommes_immo.%s"|args:$account_code}} + {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$debit}}Aucune immobilisation
+ {{else}} + {{/if}} diff --git a/style.css b/style.css index 5c0e9c6..3f65a59 100644 --- a/style.css +++ b/style.css @@ -31,7 +31,7 @@ h2[class="aide"], h3[class="aide"] { } .informations dt::after { - content: ' :'; + content: ' : '; } .informations dl.describe > dt { @@ -39,7 +39,6 @@ h2[class="aide"], h3[class="aide"] { } .informations dl.describe > dd { - margin-left: 0; margin-right: 0; } @@ -52,3 +51,31 @@ fieldset.shortFormLeft div.informations { background: rgba(var(--gSecondColor), 0.2); border-radius: .5em; } + +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; +} +