Amélioration présentation et correction erreur libellé nouvel amortissement
This commit is contained in:
parent
82d42352e6
commit
243441f4fa
2 changed files with 9 additions and 10 deletions
|
|
@ -239,20 +239,20 @@
|
||||||
<dl class="describe">
|
<dl class="describe">
|
||||||
<dt>Immobilisation</dt>
|
<dt>Immobilisation</dt>
|
||||||
<dd><span class="num"><a href="{{$trans_url}}">#{{$ligne_immo.immo_trans_id}}</a></span> {{$ligne_immo.label}}{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} — {{$ligne_immo.line_label}}{{/if}}</dd>
|
<dd><span class="num"><a href="{{$trans_url}}">#{{$ligne_immo.immo_trans_id}}</a></span> {{$ligne_immo.label}}{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} — {{$ligne_immo.line_label}}{{/if}}</dd>
|
||||||
<dt>Montant de l'immobilisation</dt>
|
|
||||||
<dd class="money strong">{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}</dd>
|
|
||||||
{{if $total_credits > 0}}
|
|
||||||
<dt>Montant des avoirs</dt>
|
|
||||||
<dd class="money">{{"%f"|math:$total_credits|money_currency_html:false|raw}}</dd>
|
|
||||||
<dt>Montant à amortir</dt>
|
|
||||||
<dd class="money strong">{{"%f"|math:$montant_amortissable|money_currency_html:false|raw}}</dd>
|
|
||||||
{{/if}}
|
|
||||||
<dt>Début d'amortissement</dt>
|
<dt>Début d'amortissement</dt>
|
||||||
<dd>{{$date_debut|date_short}}</dd>
|
<dd>{{$date_debut|date_short}}</dd>
|
||||||
{{if $duree != null}}
|
{{if $duree != null}}
|
||||||
<dt>Durée</dt>
|
<dt>Durée</dt>
|
||||||
<dd>{{$duree}} ans</dd>
|
<dd>{{$duree}} ans</dd>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
<dt>Montant de l'immobilisation</dt>
|
||||||
|
<dd class="money">{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}</dd>
|
||||||
|
{{if $total_credits > 0}}
|
||||||
|
<dt>Montant des avoirs</dt>
|
||||||
|
<dd class="money">{{"%f"|math:$total_credits|money_currency_html:false|raw}}</dd>
|
||||||
|
<dt>Montant à amortir</dt>
|
||||||
|
<dd class="money">{{"%f"|math:$montant_amortissable|money_currency_html:false|raw}}</dd>
|
||||||
|
{{/if}}
|
||||||
{{if $valeur_residuelle > 0}}
|
{{if $valeur_residuelle > 0}}
|
||||||
<dt>Montant des amortissements</dt>
|
<dt>Montant des amortissements</dt>
|
||||||
<dd>{{"%d-%d"|math:$montant_amortissable:$valeur_residuelle|money_currency_html:false|raw}}</dd>
|
<dd>{{"%d-%d"|math:$montant_amortissable:$valeur_residuelle|money_currency_html:false|raw}}</dd>
|
||||||
|
|
|
||||||
|
|
@ -111,7 +111,6 @@
|
||||||
{{/load}}
|
{{/load}}
|
||||||
{{/select}}
|
{{/select}}
|
||||||
|
|
||||||
|
|
||||||
{{:assign total_amort=0}}
|
{{:assign total_amort=0}}
|
||||||
{{:assign valeur_residuelle=$ligne_immo.montant}}
|
{{:assign valeur_residuelle=$ligne_immo.montant}}
|
||||||
{{#foreach from=$linked_amort}}
|
{{#foreach from=$linked_amort}}
|
||||||
|
|
@ -120,7 +119,7 @@
|
||||||
{{:assign date_debut=$amort_date}}
|
{{:assign date_debut=$amort_date}}
|
||||||
{{:assign code_amort=$account_code}}
|
{{:assign code_amort=$account_code}}
|
||||||
{{:assign amort_account_label=$account_label}}
|
{{:assign amort_account_label=$account_label}}
|
||||||
{{:assign amort_label=$amort_label}}
|
{{:assign amort_label=$trans_label}}
|
||||||
{{/foreach}}
|
{{/foreach}}
|
||||||
|
|
||||||
{{if $valeur_residuelle == 0}}
|
{{if $valeur_residuelle == 0}}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue