Amélioration affichage libellé et correction oubli
This commit is contained in:
parent
a66aeb69ba
commit
8295cfa09d
6 changed files with 21 additions and 14 deletions
|
|
@ -1,6 +1,6 @@
|
|||
{{* -*- brindille -*- *}}
|
||||
|
||||
{{* Liste des immobilisations en cours ou amorties *}}
|
||||
{{* Liste des immobilisations en cours d'amortissement ou amorties *}}
|
||||
|
||||
<section class="immobilisation">
|
||||
|
||||
|
|
@ -100,6 +100,7 @@
|
|||
}}
|
||||
{{:assign montant_immo="%d-%d"|math:$montant_immo:$credit}}
|
||||
{{/select}}
|
||||
{{* Immobilisation soldée ? *}}
|
||||
{{if $montant_immo == 0}}
|
||||
{{:continue}}
|
||||
{{/if}}
|
||||
|
|
@ -107,7 +108,7 @@
|
|||
{{* voir s'il existe des écritures d'amortissement associées *}}
|
||||
{{:assign amort_lines=null}}
|
||||
{{#select
|
||||
(l_amort.credit) as amount,
|
||||
l_amort.credit as amount,
|
||||
CASE links.id_related = t_immo.id
|
||||
WHEN true THEN links.id_transaction
|
||||
WHEN false THEN links.id_related
|
||||
|
|
@ -124,6 +125,7 @@
|
|||
assign="amort_lines."
|
||||
}}
|
||||
{{/select}}
|
||||
|
||||
{{:assign amort_amount=0}}
|
||||
{{#foreach from=$amort_lines item="elem"}}
|
||||
{{* voir s'il existe un doc associé à l'écriture d'amortissement *}}
|
||||
|
|
@ -160,7 +162,7 @@
|
|||
<tr>
|
||||
<td class="num"><a href={{$trans_url}}>#{{$immo_trans_id}}</a></td>
|
||||
<td>{{$trans_date|date_short}}</td>
|
||||
<td>{{$trans_label}}{{if $line_label != null}} — {{$line_label}}{{/if}}</td>
|
||||
<td>{{$trans_label}}{{if $line_label != null && $line_label != $trans_label}} — {{$line_label}}{{/if}}</td>
|
||||
<td class="money">{{$montant_immo|money_html:false|raw}}</td>
|
||||
<td class="money">{{if $duration != null}}{{$duration}}{{/if}}</td>
|
||||
<td class="money">{{$amort_amount|money_html:false|raw}}</td>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue