From 18ce7b0edd13002a6b9cd402a9352296576fed6c Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Tue, 12 May 2026 09:56:08 +0200 Subject: [PATCH] =?UTF-8?q?Modification=20pr=C3=A9sentation=20=C3=A9critur?= =?UTF-8?q?es=20avoir=20li=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- details_immo.html | 71 +++++++++++++++++++++++++++++++++++++---------- style.css | 9 ++++++ 2 files changed, 65 insertions(+), 15 deletions(-) diff --git a/details_immo.html b/details_immo.html index 0954f68..70fc845 100644 --- a/details_immo.html +++ b/details_immo.html @@ -1,6 +1,5 @@ {{* -*- brindille -*- *}} -{{:admin_header title="Détails de l'immobilisation" custom_css="./style.css" current="module_amortization"}} {{* Afficher les détails d'une immmo @@ -32,7 +31,7 @@ account.code as account_code, account.label as account_label FROM acc_transactions_lines AS line - INNER join acc_transactions AS trans ON line.id_transaction = trans.id + INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id INNER JOIN acc_accounts AS account ON line.id_account = account.id WHERE line.id = :line_id; :line_id = $info_immo.line @@ -44,7 +43,7 @@ {{:assign var="info_immo.amount" value=$info_immo.amount|or:$ligne_immo.montant}} {{:assign var="info_immo.date_achat" value=$info_immo.date_achat|or:$ligne_immo.date_achat}} -{{:assign var="info_immo.date_mes" value=$info_immo.date_mes|or:$ligne_immo.date_achat}} +{{:assign var="info_immo.date_mes" value=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date_achat}} {{:assign var="info_immo.label" value=$info_immo.label|or:$ligne_immo.label}} {{if $ligne_immo.line_label != null && $ligne_immo.line_label != $info_immo.label}} {{:assign var="info_immo.label" value=$info_immo.label|cat:" — "|cat:$ligne_immo.line_label}} @@ -56,19 +55,20 @@ *}} {{:assign linked_immos=null}} {{:assign total_credits=0}} -{{#load type="immo_link" where="$$.immo_doc_id=:immo_doc_id" :immo_doc_id=$_GET.immo_doc_id|intval}} +{{#load type="credit_link" where="$$.immo_doc_id=:immo_doc_id" :immo_doc_id=$_GET.immo_doc_id|intval}} {{#select line.credit, - trans.id + trans.id, + trans.label, + trans.date FROM acc_transactions_lines AS line INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id WHERE line.id = :credit_line_id; :credit_line_id=$credit_line_id }} {{:assign credit=$credit}} - {{:assign credit_trans_id=$id}} + {{:assign var="linked_immos." id=$id label=$label amount=$credit date=$date}} {{/select}} - {{:assign var="linked_immos." value=$credit_trans_id}} {{if $amount == null}} {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} {{else}} @@ -94,17 +94,37 @@ {{/if}} {{/load}} -{{* barre de navigation *}} +{{:admin_header title="Détails de l'immobilisation" custom_css="./style.css" current="module_amortization"}} + +{{* {{if ! $dialog}} + {{:assign subsubcurrent=null}} {{if $total_credits == 0 && $total_amort == 0}} {{:assign subsubcurrent="credit"}} - {{else}} - {{:assign subsubcurrent=null}} + {{/if}} + {{if $total_amort == 0}} + {{:assign subsubcurrent=$subsubcurrent|cat:"-modif"}} {{/if}} {{:include file="_nav.html" current="index" subcurrent="details" subsubcurrent=$subsubcurrent}} {{/if}} +*}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.immo_trans_id}} + + {{if $_GET.ok}} {{if $_GET.msg|match:"attach_amort"}} {{:assign msg="Attachement amortissement effectué"}} @@ -119,14 +139,34 @@

{{$msg}}

{{/if}} +{{*

Paramètres de l'immobilisation #{{$ligne_immo.immo_trans_id}}

+*}} +{{if $linked_immos != null}} + +{{/if}}
Immobilisation
-
#{{$ligne_immo.immo_trans_id}} {{$info_immo.label}}
+
#{{$ligne_immo.immo_trans_id}} {{$info_immo.label}}
Compte d'immobilisation
{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}
Montant de l'immobilisation
@@ -134,14 +174,15 @@ {{if $total_credits > 0}}
Montant des avoirs
{{"%f"|math:$total_credits|money_currency_html:false|raw}}
+{{*
Écritures d'avoir
- {{#foreach from=$linked_immos item="id"}} - {{:assign url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$id}} - #{{$id}} + {{#foreach from=$linked_immos item="elem"}} + {{:assign url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$elem.id}} + #{{$elem.id}} {{/foreach}} - {{*:debug linked_immos=$linked_immos*}}
+*}}
Montant à amortir
{{"%f"|math:$solde|money_currency_html:false|raw}}
{{/if}} diff --git a/style.css b/style.css index 1a8ed6d..e7ed568 100644 --- a/style.css +++ b/style.css @@ -98,3 +98,12 @@ html.dark .block.alert { span.input-list.avoirs label { padding : 0.4rem 0.6rem; } + +aside.right { + float: right; +} + +span.label { + font-size : 120%; + font-weight : bold; +}