Compare commits

..

2 commits

Author SHA1 Message Date
Jean-Christophe Engel
c6e344fb80 Sortie du bilan : utilisation comptes PC 2025 2025-12-02 14:44:12 +01:00
Jean-Christophe Engel
a9fdb1a195 Modification présentation totaux (fin tableau) 2025-12-02 14:43:10 +01:00
6 changed files with 114 additions and 79 deletions

View file

@ -107,32 +107,66 @@
{{/select}} {{/select}}
{{/foreach}} {{/foreach}}
</tbody> </tbody>
</tbody>
<tfoot>
{{if $total_immo != 0}}
{{#foreach from=$sommes_immo|ksort key="code" item="value"}}
<tr>
<td></td>
<td></td>
<td></td>
<td>Total du compte {{$code}}</td>
<td class="money">{{$value|money}}</td>
<td></td>
<td></td>
<td></td>
<td class="actions"></td>
</tr>
{{/foreach}}
<tr>
<td></td>
<td></td>
<td></td>
<td>Total des immobilisations</td>
<td class="money"><span class="strong">{{$total_immo|money}}</span></td>
<td></td>
<td></td>
<td></td>
<td class="actions"></td>
</tr>
{{/if}}
{{if $total_cessions != 0}}
<tr>
<td colspan="9">
</tr>
{{#foreach from=$montant_cessions|ksort key="code" item="value"}}
<tr>
<td></td>
<td></td>
<td></td>
<td>Cessions du compte {{$code}}</td>
<td class="money">{{$value|money}}</td>
<td></td>
<td></td>
<td></td>
<td class="actions"></td>
</tr>
{{/foreach}}
<tr>
<td></td>
<td></td>
<td></td>
<td>Total des cessions</td>
<td class="money"><span class="strong">{{$total_cessions|money}}</span></td>
<td></td>
<td></td>
<td></td>
<td class="actions"></td>
</tr>
{{/if}}
</tfoot>
</table> </table>
{{if $nb_immo == 0}} {{if $nb_immo == 0}}
<p class="block alert">Aucune immobilisation</p> <p class="block alert">Aucune immobilisation</p>
{{else}}
<aside class="describe totals">
<h3 class="ruler">Totaux</h3>
{{if $total_immo != 0}}
<dl class="describe">
{{#foreach from=$sommes_immo|ksort key="code" item="value"}}
<dt>Total du compte {{$code}}</dt>
<dd>{{$value|money}}
{{/foreach}}
<dt>Montant total des immobilisations</dt>
<dd><span class="strong">{{$total_immo|money}}</span></dd>
</dl>
{{/if}}
{{if $total_cessions != 0}}
<dl class="describe">
{{#foreach from=$montant_cessions|ksort key="code" item="value"}}
<dt>Cessions du compte {{$code}}</dt>
<dd>{{$value|money}}
{{/foreach}}
<dt>Montant total des cessions</dt>
<dd><span class="strong">{{$total_cessions|money}}</span></dd>
</dl>
{{/if}}
</aside>
{{/if}} {{/if}}
</section> </section>

View file

@ -187,22 +187,36 @@
</tr> </tr>
{{/select}} {{/select}}
</tbody> </tbody>
<tfoot>
{{if $total_immo != 0}}
{{#foreach from=$sommes_immo|ksort key="code" item="value"}}
<tr>
<td></td>
<td></td>
<td>Total du compte {{$code}}</td>
<td class="money">{{$value|money}}</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td class="actions"></td>
</tr>
{{/foreach}}
<tr>
<td></td>
<td></td>
<td>Total des immobilisations</td>
<td class="money"><span class="strong">{{$total_immo|money}}</span></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td class="actions"></td>
</tr>
{{/if}}
</tfoot>
</table> </table>
{{if $nb_immo == 0}} {{if $nb_immo == 0}}
<p class="block alert">Aucune immobilisation</p> <p class="block alert">Aucune immobilisation</p>
{{else}}
<aside class="describe totals">
<h3 class="ruler">Totaux</h3>
{{if $total_immo != 0}}
<dl class="describe">
{{#foreach from=$sommes_immo|ksort key="code" item="value"}}
<dt>Total du compte {{$code}}</dt>
<dd>{{$value|money}}
{{/foreach}}
<dt>Montant total des immobilisations</dt>
<dd><span class="strong">{{$total_immo|money}}</span></dd>
</dl>
{{/if}}
</aside>
{{/if}} {{/if}}
</section> </section>

View file

@ -37,7 +37,6 @@
{{if $current == "config"}} {{if $current == "config"}}
<ul class="sub"> <ul class="sub">
<li {{if $subcurrent == null}} class="current"{{/if}}><a href="config.html">Comptes d'immobilisation</a></li> <li {{if $subcurrent == null}} class="current"{{/if}}><a href="config.html">Comptes d'immobilisation</a></li>
<li {{if $subcurrent == "create_accounts"}} class="current"{{/if}}><a href="create_accounts.html">Comptes de sortie du bilan</a></li>
<li {{if $subcurrent == "filters"}} class="current"{{/if}}><a href="filters.html">Filtres de libellés</a></li> <li {{if $subcurrent == "filters"}} class="current"{{/if}}><a href="filters.html">Filtres de libellés</a></li>
</ul> </ul>
{{/if}} {{/if}}

View file

@ -146,23 +146,35 @@
</tr> </tr>
{{/select}} {{/select}}
</tbody> </tbody>
<tfoot>
{{if $total_immo != 0}}
{{#foreach from=$sommes_immo|ksort key="code" item="value"}}
<tr>
<td></td>
<td></td>
<td></td>
<td>Total du compte {{$code}}</td>
<td class="money">{{$value|money}}</td>
<td></td>
<td></td>
<td class="actions"></td>
</tr>
{{/foreach}}
<tr>
<td></td>
<td></td>
<td></td>
<td>Total des immobilisations</td>
<td class="money"><span class="strong">{{$total_immo|money}}</span></td>
<td></td>
<td></td>
<td class="actions"></td>
</tr>
{{/if}}
</tfoot>
</table> </table>
{{if $nb_immo == 0}} {{if $nb_immo == 0}}
<p class="block alert">Aucune immobilisation</p> <p class="block alert">Aucune immobilisation</p>
{{else}}
<aside class="describe totals">
<h3 class="ruler">Totaux</h3>
{{if $total_immo != 0}}
<dl class="describe">
{{#foreach from=$sommes_immo|ksort key="code" item="value"}}
<dt>Total du compte {{$code}}</dt>
<dd>{{$value|money}}
{{/foreach}}
<dt>Montant total des immobilisations</dt>
<dd><span class="strong">{{$total_immo|money}}</span></dd>
</dl>
{{/if}}
</aside>
{{/if}} {{/if}}
</section> </section>

View file

@ -55,27 +55,3 @@ fieldset.shortFormLeft div.informations {
span.strong { span.strong {
font-weight: bold; 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;
}

View file

@ -270,8 +270,8 @@
Utilisation des « anciens » numéros de comptes because conflit Utilisation des « anciens » numéros de comptes because conflit
avec les nouveaux numéros ; voir info.org avec les nouveaux numéros ; voir info.org
*}} *}}
{{:assign vnc_code="675"}} {{:assign vnc_code="652"}}
{{:assign cession_code="775"}} {{:assign cession_code="757"}}
{{:assign var="liste_codes.6811" name="comp_account"}} {{:assign var="liste_codes.6811" name="comp_account"}}
{{:assign var="liste_codes.687" name="except_account"}} {{:assign var="liste_codes.687" name="except_account"}}