lesanges/amortization
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Amélioration affichage libellé

Browse source
This commit is contained in:
Jean-Christophe Engel 2026-07-11 11:28:17 +02:00
parent 1439f0333d
commit 18e97956fe
13 changed files with 40 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
_immobilisations.html
View file

@ -76,7 +76,7 @@
{{:assign montant_immo=$doc_amount|or:$debit}} {{:assign montant_immo=$doc_amount|or:$debit}}
{{:assign immo_date = $doc_date_achat|or:$trans_date}} {{:assign immo_date = $doc_date_achat|or:$trans_date}}
{{:assign label_immo=$doc_label|or:$trans_label}} {{:assign label_immo=$doc_label|or:$trans_label}}
{{if $line_label != null && $line_label != $label_immo}} {{if $label_immo|strpos:$line_label === false}}
{{:assign label_immo=$label_immo|cat:" — "|cat:$line_label}} {{:assign label_immo=$label_immo|cat:" — "|cat:$line_label}}
{{/if}} {{/if}}

2
amortization.html
View file

@ -15,7 +15,7 @@
{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}}
{{:assign date_debut=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date_achat}} {{:assign date_debut=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date_achat}}
{{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} {{if $label_immo|strpos:$ligne_immo.line_label === false}}
{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
{{/if}} {{/if}}
{{if $info_immo.amount != null}} {{if $info_immo.amount != null}}

2
attach_amort.html
View file

@ -14,7 +14,7 @@
{{/if}} {{/if}}
{{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} {{if $label_immo|strpos:$ligne_immo.line_label === false}}
{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
{{/if}} {{/if}}
{{:assign montant_immo=$info_immo.amount|or:$ligne_immo.amount}} {{:assign montant_immo=$info_immo.amount|or:$ligne_immo.amount}}

2
attach_credit.html
View file

@ -14,7 +14,7 @@
{{/if}} {{/if}}
{{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} {{if $label_immo|strpos:$ligne_immo.line_label === false }}
{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
{{/if}} {{/if}}

2
balance_sheet_exit.html
View file

@ -18,7 +18,7 @@
*}} *}}
{{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} {{if $label_immo|strpos:$ligne_immo.line_label === false}}
{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
{{/if}} {{/if}}

2
compute_exit_data.html
View file

@ -19,7 +19,7 @@
{{/if}} {{/if}}
{{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} {{if $label_immo|strpos:$ligne_immo.line_label === false}}
{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
{{/if}} {{/if}}

9
exit_step1.html
View file

@ -13,7 +13,7 @@
{{/if}} {{/if}}
{{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} {{if $label_immo|strpos:$ligne_immo.line_label === false}}
{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
{{/if}} {{/if}}
{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}}
@ -123,12 +123,13 @@
{{/select}} {{/select}}
{{:admin_header title="Immobilisation sortie du bilan" custom_css="./style.css" current="module_amortization"}} {{:admin_header title="Immobilisation sortie du bilan" custom_css="./style.css" current="module_amortization"}}
{{if $_GET.from == "exit"}} {{if $_GET.from == "exit"}}
{{:assign current="other"}} {{:assign current="other"}}
{{else}} {{else}}
{{:assign current="archived"}} {{:assign current="archived"}}
{{/if}} {{/if}}
{{:include file="_nav.html" current=$current subcurrent="exit"}} {{*:include file="_nav.html" current=$current subcurrent="exit"*}}
{{if $_GET.ok}} {{if $_GET.ok}}
{{if $_GET.msg|match:"attach_avoir"}} {{if $_GET.msg|match:"attach_avoir"}}
@ -146,7 +147,7 @@
<dt>Compte d'immobilisation</dt> <dt>Compte d'immobilisation</dt>
<dd>{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}</dd> <dd>{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}</dd>
<dt>Montant de l'immobilisation</dt> <dt>Montant de l'immobilisation</dt>
<dd><span class="money">{{$ligne_immo.amount|money_html|raw}}</dd> <dd><span class="money">{{$montant_immo|money_currency_html:false|raw}}</dd>
{{if $total_credits > 0}} {{if $total_credits > 0}}
<dt>Montant des avoirs</dt> <dt>Montant des avoirs</dt>
<dd class="money">{{"%f"|math:$total_credits|money_currency_html:false|raw}}</dd> <dd class="money">{{"%f"|math:$total_credits|money_currency_html:false|raw}}</dd>
@ -210,7 +211,7 @@
<td class="num">N°</td> <td class="num">N°</td>
<td>Date</td> <td>Date</td>
<td>Libellé</td> <td>Libellé</td>
<td>Montant</td> <td class="nombre">Montant</td>
<td>N° compte</td> <td>N° compte</td>
<td>Compte</td> <td>Compte</td>
<td class="actions"></td> <td class="actions"></td>

6
exit_step2.html
View file

@ -21,7 +21,7 @@
{{/form}} {{/form}}
{{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} {{if $label_immo|strpos:$ligne_immo.line_label === false}}
{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
{{/if}} {{/if}}
{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}}
@ -95,7 +95,7 @@
{{else}} {{else}}
{{:assign current="archived"}} {{:assign current="archived"}}
{{/if}} {{/if}}
{{:include file="_nav.html" current=$current subcurrent="exit"}} {{*:include file="_nav.html" current=$current subcurrent="exit"*}}
{{if $_GET.ok}} {{if $_GET.ok}}
{{if $_GET.msg|match:"attach_amort"}} {{if $_GET.msg|match:"attach_amort"}}
@ -113,7 +113,7 @@
<dt>Compte d'immobilisation</dt> <dt>Compte d'immobilisation</dt>
<dd>{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}</dd> <dd>{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}</dd>
<dt>Montant de l'immobilisation</dt> <dt>Montant de l'immobilisation</dt>
<dd><span class="money">{{$ligne_immo.amount|money_html|raw}}</dd> <dd><span class="money">{{$montant_immo|money_currency_html:false|raw}}</dd>
{{if $total_credits > 0}} {{if $total_credits > 0}}
<dt>Montant des avoirs</dt> <dt>Montant des avoirs</dt>
<dd class="money">{{"%f"|math:$total_credits|money_currency_html:false|raw}}</dd> <dd class="money">{{"%f"|math:$total_credits|money_currency_html:false|raw}}</dd>

6
exit_step3.html
View file

@ -21,7 +21,7 @@
{{/form}} {{/form}}
{{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} {{if $label_immo|strpos:$ligne_immo.line_label === false}}
{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
{{/if}} {{/if}}
{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}}
@ -100,7 +100,7 @@
{{else}} {{else}}
{{:assign current="archived"}} {{:assign current="archived"}}
{{/if}} {{/if}}
{{:include file="_nav.html" current=$current subcurrent="exit"}} {{*:include file="_nav.html" current=$current subcurrent="exit"*}}
{{if $_GET.ok}} {{if $_GET.ok}}
{{if $_GET.msg|match:"attach_cession"}} {{if $_GET.msg|match:"attach_cession"}}
@ -118,7 +118,7 @@
<dt>Compte d'immobilisation</dt> <dt>Compte d'immobilisation</dt>
<dd>{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}</dd> <dd>{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}</dd>
<dt>Montant de l'immobilisation</dt> <dt>Montant de l'immobilisation</dt>
<dd><span class="money">{{$ligne_immo.amount|money_html|raw}}</dd> <dd><span class="money">{{$montant_immo|money_currency_html:false|raw}}</dd>
{{if $total_credits > 0}} {{if $total_credits > 0}}
<dt>Montant des avoirs</dt> <dt>Montant des avoirs</dt>
<dd class="money">{{"%f"|math:$total_credits|money_currency_html:false|raw}}</dd> <dd class="money">{{"%f"|math:$total_credits|money_currency_html:false|raw}}</dd>

26
exit_step4.html
View file

@ -26,11 +26,11 @@
{{/form}} {{/form}}
{{#form on="finish"}} {{#form on="finish"}}
{{:redirect to="index.html?type_immo=managed"}} {{:redirect to="index.html?type_immo=other"}}
{{/form}} {{/form}}
{{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} {{if $label_immo|strpos:$ligne_immo.line_label === false}}
{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
{{/if}} {{/if}}
{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}}
@ -187,7 +187,7 @@
{{else}} {{else}}
{{:assign current="archived"}} {{:assign current="archived"}}
{{/if}} {{/if}}
{{:include file="_nav.html" current=$current subcurrent="exit"}} {{*:include file="_nav.html" current=$current subcurrent="exit"*}}
{{if $_GET.ok}} {{if $_GET.ok}}
{{if $_GET.msg|match:"attach_exit"}} {{if $_GET.msg|match:"attach_exit"}}
@ -205,7 +205,7 @@
<dt>Compte d'immobilisation</dt> <dt>Compte d'immobilisation</dt>
<dd>{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}</dd> <dd>{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}</dd>
<dt>Montant de l'immobilisation</dt> <dt>Montant de l'immobilisation</dt>
<dd><span class="money">{{$ligne_immo.amount|money_html|raw}}</dd> <dd><span class="money">{{$montant_immo|money_currency_html:false|raw}}</dd>
{{if $total_credits > 0}} {{if $total_credits > 0}}
<dt>Montant des avoirs</dt> <dt>Montant des avoirs</dt>
<dd class="money">{{"%f"|math:$total_credits|money_currency_html:false|raw}}</dd> <dd class="money">{{"%f"|math:$total_credits|money_currency_html:false|raw}}</dd>
@ -227,6 +227,7 @@
<h3 class="ruler">Écriture de sortie du bilan attachée à l'immobilisation</h3> <h3 class="ruler">Écriture de sortie du bilan attachée à l'immobilisation</h3>
{{if $exit_line != null}} {{if $exit_line != null}}
{{:assign exit_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$exit_line.trans_id}}
<table class="list"> <table class="list">
<thead> <thead>
<tr> <tr>
@ -241,7 +242,7 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td class="num"><a href="{{$trans_url}}">#{{$exit_line.trans_id}}</a></td> <td class="num"><a href="{{$exit_url}}">#{{$exit_line.trans_id}}</a></td>
<td>{{$exit_line.date|date_short}}</td> <td>{{$exit_line.date|date_short}}</td>
<td> <td>
{{if $exit_line.line_label != null}} {{if $exit_line.line_label != null}}
@ -301,7 +302,20 @@
</tbody> </tbody>
</table> </table>
{{elseif $exit_line == null}} {{elseif $exit_line == null}}
<p class="block alert">Aucune écriture de sortie du bilan. Vérifiez l'attachement d'écriture d'avoir.</p> <p class="block alert">Aucune écriture de sortie du bilan avec un
montant de {{$solde|money_currency_html:false|raw}} au crédit du
compte {{$ligne_immo.account_code}} — {{$ligne_immo.account_label}} ;
<br />
Vérifiez si vous avez correctement attaché les éventuelles écritures d'avoir.
<br />
Si vous avez supprimé l'écriture de sortie de bilan, il faut
la recréer avant de pouvoir classer cette immobilisation
« Sortie du bilan » !
</p>
{{:save
key=$info_immo.key
status=null
}}
{{/if}} {{/if}}
<form method="post" action=""> <form method="post" action="">

2
link_immo.html
View file

@ -14,7 +14,7 @@
{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}}
{{:assign date_debut=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date_achat}} {{:assign date_debut=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date_achat}}
{{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} {{if $label_immo|strpos:$ligne_immo.line_label ===false }}
{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
{{/if}} {{/if}}
{{if $info_immo.amount != null}} {{if $info_immo.amount != null}}

2
other_amortizations.html
View file

@ -13,7 +13,7 @@
{{:assign montant_immo=$info_immo.amount|or:$ligne_immo.amount}} {{:assign montant_immo=$info_immo.amount|or:$ligne_immo.amount}}
{{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} {{if $label_immo|strpos:$ligne_immo.line_label === false}}
{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
{{/if}} {{/if}}
{{:assign date_mes=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date_achat}} {{:assign date_mes=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date_achat}}

2
write_exit.html
View file

@ -18,7 +18,7 @@
{{/if}} {{/if}}
{{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} {{if $label_immo|strpos:$ligne_immo.line_label === false}}
{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
{{/if}} {{/if}}