Petites améliorations de présentation

This commit is contained in:
Jean-Christophe Engel 2026-03-13 18:21:20 +01:00
parent b937056a62
commit 367dae5cef
5 changed files with 9 additions and 5 deletions

View file

@ -51,6 +51,7 @@
trans.date as trans_date, trans.date as trans_date,
trans.id_year as trans_id_year, trans.id_year as trans_id_year,
line.id as immo_id, line.id as immo_id,
line.label as line_label,
line.debit AS debit, line.debit AS debit,
account.id as account_id, account.id as account_id,
account.code as account_code, account.code as account_code,
@ -149,7 +150,7 @@
<td class="num"><a href={{$trans_url}}>#{{$trans_id}}</a></td> <td class="num"><a href={{$trans_url}}>#{{$trans_id}}</a></td>
<td>{{$trans_date|date_short}}</td> <td>{{$trans_date|date_short}}</td>
<td>{{$exit_date|date_short}}</td> <td>{{$exit_date|date_short}}</td>
<td>{{$trans_label}}</td> <td>{{$trans_label}}{{if $line_label != null}} — {{$line_label}}{{/if}}</td>
<td class="money">{{"%f"|math:$montant_immo|money_html:false|raw}}</td> <td class="money">{{"%f"|math:$montant_immo|money_html:false|raw}}</td>
<td><a href={{$compte_url}}>{{$account_code}}</a></td> <td><a href={{$compte_url}}>{{$account_code}}</a></td>
<td>{{$account_label}}</td> <td>{{$account_label}}</td>

View file

@ -54,6 +54,7 @@
trans.date as trans_date, trans.date as trans_date,
line.id as immo_line_id, line.id as immo_line_id,
line.debit AS debit, line.debit AS debit,
line.label AS line_label,
account.id as account_id, account.id as account_id,
account.code as account_code, account.code as account_code,
trans.id_year as trans_id_year trans.id_year as trans_id_year
@ -167,7 +168,7 @@
<tr> <tr>
<td class="num"><a href={{$trans_url}}>#{{$immo_trans_id}}</a></td> <td class="num"><a href={{$trans_url}}>#{{$immo_trans_id}}</a></td>
<td>{{$trans_date|date_short}}</td> <td>{{$trans_date|date_short}}</td>
<td>{{$trans_label}}</td> <td>{{$trans_label}}{{if $line_label != null}} — {{$line_label}}{{/if}}</td>
<td class="money">{{$montant_immo|money_html:false|raw}}</td> <td class="money">{{$montant_immo|money_html:false|raw}}</td>
<td class="money">{{if $duration != null}}{{$duration}}{{/if}}</td> <td class="money">{{if $duration != null}}{{$duration}}{{/if}}</td>
<td class="money">{{$amort_amount|money_html:false|raw}}</td> <td class="money">{{$amort_amount|money_html:false|raw}}</td>

View file

@ -75,6 +75,7 @@
trans.label as trans_label, trans.label as trans_label,
trans.date as trans_date, trans.date as trans_date,
line.id as immo_id, line.id as immo_id,
line.label as line_label,
account.id as account_id, account.id as account_id,
account.code as account_code, account.code as account_code,
account.label as account_label, account.label as account_label,
@ -154,7 +155,7 @@
<tr {{if $status == "ignored"}}class="ignored"{{/if}}> <tr {{if $status == "ignored"}}class="ignored"{{/if}}>
<td class="num"><a href={{$trans_url}}>#{{$trans_id}}</a></td> <td class="num"><a href={{$trans_url}}>#{{$trans_id}}</a></td>
<td>{{$trans_date|date_short}}</td> <td>{{$trans_date|date_short}}</td>
<td>{{$trans_label}}</td> <td>{{$trans_label}}{{if $line_label != null}} — {{$line_label}}{{/if}}</td>
<td class="money">{{"%f"|math:$debit|money_html:false|raw}}</td> <td class="money">{{"%f"|math:$debit|money_html:false|raw}}</td>
<td><a href={{$compte_url}}>{{$account_code}}</a></td> <td><a href={{$compte_url}}>{{$account_code}}</a></td>
<td>{{$account_label}}</td> <td>{{$account_label}}</td>

View file

@ -32,7 +32,7 @@
<fieldset class="shortFormLeft"> <fieldset class="shortFormLeft">
<legend>Transférer une ou plusieurs lignes vers une immobilisation amortissable</legend> <legend>Transférer une ou plusieurs lignes vers une immobilisation amortissable</legend>
<p class="help"> <p class="help">
Cocher les lignes concernées ; les montants seront additionnés par numéro de compte Cocher les lignes concernées
</p> </p>
<div class="shortFormRight informations" id="total_amount"> <div class="shortFormRight informations" id="total_amount">
<legend>Montants sélectionnés</legend> <legend>Montants sélectionnés</legend>

View file

@ -10,6 +10,7 @@
{{#select {{#select
line.id as immo_id, line.id as immo_id,
line.debit as montant, line.debit as montant,
line.label as line_label,
trans.id as trans_id, trans.id as trans_id,
trans.label as label, trans.label as label,
trans.date, trans.date,
@ -241,7 +242,7 @@
<div class="informations"> <div class="informations">
<dl class="describe"> <dl class="describe">
<dt>Immobilisation</dt> <dt>Immobilisation</dt>
<dd><span class="num"><a href={{$trans_url}}>#{{$ligne_immo.trans_id}}</a></span> {{$ligne_immo.label}}</dd> <dd><span class="num"><a href={{$trans_url}}>#{{$ligne_immo.trans_id}}</a></span> {{$ligne_immo.label}}{{if $ligne_immo.line_label != null}} — {{$ligne_immo.line_label}}{{/if}}</dd>
<dt>Montant</dt> <dt>Montant</dt>
<dd class="money strong">{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}</dd> <dd class="money strong">{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}</dd>
<dt>Début d'amortissement</dt> <dt>Début d'amortissement</dt>