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

Amélioration et correction libellés

Browse source
This commit is contained in:
Jean-Christophe Engel 2026-05-22 09:46:28 +02:00
parent 6319275d67
commit 91795c69a8
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
attach_amort.html
View file

@ -9,7 +9,6 @@
{{* données de l'immobilisation *}} {{* données de l'immobilisation *}}
{{#load id=$_GET.immo_doc_id|intval assign="info_immo"}} {{#load id=$_GET.immo_doc_id|intval assign="info_immo"}}
{{:assign label_immo=$label|or:$ligne_immo.trans_label}}
{{else}} {{else}}
{{:error message="Immobilisation non trouvée"}} {{:error message="Immobilisation non trouvée"}}
{{/load}} {{/load}}
@ -29,11 +28,11 @@
{{:error message="Immobilisation non trouvée"}} {{:error message="Immobilisation non trouvée"}}
{{/select}} {{/select}}
{{:assign montant_immo=$info_immo.amount|or:$ligne_immo.montant}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} {{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
{{: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.montant}}
{{* chercher l'écriture d'amortissement *}} {{* chercher l'écriture d'amortissement *}}
{{#select {{#select
@ -54,6 +53,10 @@
{{else}} {{else}}
{{:error message="Amortissement non trouvé"}} {{:error message="Amortissement non trouvé"}}
{{/select}} {{/select}}
{{:assign amort_label=$amort_line.trans_label}}
{{if $amort_line.line_label != null && $amort_line.line_label != $amort_label}}
{{:assign amort_label=$amort_label|cat:"— "|cat:$amort_line.line_label}}
{{/if}}
{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$amort_line.trans_id}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$amort_line.trans_id}}
{{* montant de l'écriture d'amortissement déjà affecté *}} {{* montant de l'écriture d'amortissement déjà affecté *}}
@ -206,7 +209,7 @@
<dt>Immobilisation</dt> <dt>Immobilisation</dt>
<dd>{{$label_immo}}</dd> <dd>{{$label_immo}}</dd>
<dt>Amortissement</dt> <dt>Amortissement</dt>
<dd><span class="num"><a href="{{$trans_url}}">#{{$amort_line.trans_id}}</a></span> {{$label_immo}}</dd> <dd><span class="num"><a href="{{$trans_url}}">#{{$amort_line.trans_id}}</a></span> {{$amort_label}}</dd>
<dt>Montant de l'écriture d'amortissement</dt> <dt>Montant de l'écriture d'amortissement</dt>
<dd>{{$amort_line.amount|money_currency_html:false|raw}}</dd> <dd>{{$amort_line.amount|money_currency_html:false|raw}}</dd>
{{if $montant_affecte > 0}} {{if $montant_affecte > 0}}

2
details_immo.html
View file

@ -107,7 +107,7 @@
<nav class="tabs"> <nav class="tabs">
<aside> <aside>
{{*if $total_credits == 0*}} {{*if $total_credits == 0*}}
{{:linkbutton label="Rattacher une écriture d'immobilisation" href="link_immo.html?immo_doc_id=%s"|args:$_GET.immo_doc_id shape="link" target="_dialog"}} {{:linkbutton label="Rattacher une écriture d'avoir" href="link_immo.html?immo_doc_id=%s"|args:$_GET.immo_doc_id shape="link" target="_dialog"}}
{{*/if*}} {{*/if*}}
</aside> </aside>
<nav style="margin-bottom: 1em;"> <nav style="margin-bottom: 1em;">

2
index.html
View file

@ -14,7 +14,7 @@
{{elseif $type_immo == "archived"}} {{elseif $type_immo == "archived"}}
{{:admin_header title="Immobilisations archivées" custom_css="./style.css" current="module_amortization"}} {{:admin_header title="Immobilisations archivées" custom_css="./style.css" current="module_amortization"}}
{{elseif $type_immo == "other"}} {{elseif $type_immo == "other"}}
{{:admin_header title="Autres immobilisations" custom_css="./style.css" current="module_amortization"}} {{:admin_header title="Immobilisations à classer" custom_css="./style.css" current="module_amortization"}}
{{elseif $type_immo == "unfinished"}} {{elseif $type_immo == "unfinished"}}
{{:admin_header title="Immobilisations en cours de constitution" custom_css="./style.css" current="module_amortization" subcurrent="unfinished"}} {{:admin_header title="Immobilisations en cours de constitution" custom_css="./style.css" current="module_amortization" subcurrent="unfinished"}}
{{/if}} {{/if}}

2
other_amortizations.html
View file

@ -8,7 +8,6 @@
{{* données de l'immobilisation *}} {{* données de l'immobilisation *}}
{{#load id=$_GET.immo_doc_id|intval assign="info_immo"}} {{#load id=$_GET.immo_doc_id|intval assign="info_immo"}}
{{:assign label_immo=$label|or:$ligne_immo.label}}
{{else}} {{else}}
{{:error message="Immobilisation non trouvée"}} {{:error message="Immobilisation non trouvée"}}
{{/load}} {{/load}}
@ -26,6 +25,7 @@
{{:error message="Immobilisation non trouvée"}} {{:error message="Immobilisation non trouvée"}}
{{/select}} {{/select}}
{{:assign label_immo=$info_immo.label|or:$ligne_immo.label}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} {{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
{{/if}} {{/if}}