From 6495737428b44d6892e22bb7f34ee3e5457fa246 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 10 Jun 2026 20:36:37 +0200 Subject: [PATCH] =?UTF-8?q?R=C3=A9organisation=20pr=C3=A9sentation=20page?= =?UTF-8?q?=20amortissements?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _common_attach.html | 2 - _immobilisations.html | 18 ++---- amortization.html | 105 ++++++++++++++++++------------ attach_credit.html | 2 +- detach_credit.html | 9 +-- details_immo.html | 145 ------------------------------------------ 6 files changed, 72 insertions(+), 209 deletions(-) delete mode 100644 details_immo.html diff --git a/_common_attach.html b/_common_attach.html index f89b81f..728ee1f 100644 --- a/_common_attach.html +++ b/_common_attach.html @@ -23,11 +23,9 @@ }} {{:assign var="linked_transactions." value=$linked_id}} {{/select}} -{{:debug immo_doc_id=$immo_doc_id trans_id=$trans_id linked_transactions=$linked_transactions}} {{* ajouter la nouvelle liaison *}} {{:assign var="linked_transactions." value=$trans_id}} -{{:debug ligne_immo=$ligne_immo linked_transactions=$linked_transactions}} {{* Enregistrer les liaisons *}} {{:api method="POST" diff --git a/_immobilisations.html b/_immobilisations.html index e78fbfd..8e56aef 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -68,6 +68,9 @@ !table=$module.table !condition=$condition }} + {{if $status != "managed" && $status != "amortized"}} + {{:continue}} + {{/if}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$immo_trans_id}} {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}} {{:assign montant_immo=$doc_amount|or:$debit}} @@ -93,9 +96,8 @@ {{/if}} {{/load}} - {{* Immobilisation soldée ? *}} - {{* TODO ¿ marquer archivée ? *}} {{if $montant_immo == 0}} + {{* Immobilisation soldée *}} {{:continue}} {{/if}} @@ -121,17 +123,9 @@ {{"%d-%d"|math:$montant_immo:$amort_amount|money_html:false|raw}} {{$account_code}} - {{*if $amort_amount == 0*}} - {{:linkbutton - label="Détails" - href="details_immo.html?immo_doc_id=%s"|args:$immo_doc_id - shape="eye" - }} - {{* target="_dialog"*}} - {{*/if*}} {{:linkbutton - label="Amortissements" - href="amortization.html?immo_doc_id=%s&type_immo=%s"|args:$immo_doc_id:$type_immo shape="table" + label="Voir" + href="amortization.html?immo_doc_id=%s&type_immo=%s"|args:$immo_doc_id:$type_immo shape="eye" }} diff --git a/amortization.html b/amortization.html index f80b761..f7c9d43 100644 --- a/amortization.html +++ b/amortization.html @@ -81,6 +81,8 @@ {{:assign msg="Détachement avoir affectué"}} {{elseif $_GET.msg|match:"amortissement"}} {{:assign msg="Amortissement enregistré"}} + {{elseif $_GET.msg|match:"modif"}} + {{:assign msg="Modifications enregistrées"}} {{/if}}

{{$msg}}

{{elseif $_GET.err}} @@ -110,48 +112,16 @@ - +

-{{if $linked_immos != null}} - -{{/if}}
@@ -186,7 +156,24 @@
-

Amortissements enregistrés

+

Amortissements

+

+ {{if $free_amort_lines && ! $created_amort}} + {{:linkbutton + label="Attacher un amortissement" + title="Attacher un amortissement existant" + href="other_amortizations.html?immo_doc_id=%s&filter=true"|args:$_GET.immo_doc_id + shape="link" + target="_dialog"}} + {{/if}} + {{:linkbutton + label="Enregistrer un amortissement" + title="Enregistrer un nouvel amortissement" + href="save_amort.html?immo_doc_id=%s"|args:$_GET.immo_doc_id target="_dialog" + shape="plus" + }} +

+ {{if $linked_amort != null}}
@@ -243,5 +230,41 @@ {{if $linked_amort == null}}

Aucun amortissement enregistré pour cette immobilisation ; utilisez le bouton « Enregistrer un amortissement » pour enregistrer un nouvel amortissement

{{/if}} + +

Avoirs

+

+ {{if $total_amort == 0}} + {{:linkbutton label="Attacher une écriture d'avoir" href="link_immo.html?immo_doc_id=%s"|args:$_GET.immo_doc_id shape="link" target="_dialog"}} + {{/if}} +

+ +{{if $linked_immos != null}} +
+ + + + + + + + + {{#foreach from=$linked_immos item="line"}} + {{:assign url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.trans_id}} + + + + + + + + {{/foreach}} + +
N°DateLibelléMontant
#{{$line.trans_id}}{{$line.date|date_short}}{{$line.label}}{{"%f"|math:$line.amount|money_currency_html:false|raw}} + {{if $total_amort == 0}} + {{:linkbutton label="Détacher" href="detach_credit.html?immo_doc_id=%s&credit_line_id=%s"|args:$_GET.immo_doc_id:$line.credit_line_id shape="minus"}} + {{/if}} +
+{{/if}} + {{:form_errors}} {{:admin_footer}} diff --git a/attach_credit.html b/attach_credit.html index 1249328..721278d 100644 --- a/attach_credit.html +++ b/attach_credit.html @@ -107,7 +107,7 @@ {{if $_GET.from == "exit"}} {{:redirect force="exit_step1.html?immo_doc_id=%s&ok=1&msg=attach_avoir"|args:$_GET.immo_doc_id}} {{else}} - {{:redirect force="details_immo.html?immo_doc_id=%s&ok=1&msg=attach_credit"|args:$_GET.immo_doc_id}} + {{:redirect force="amortization.html?immo_doc_id=%s&ok=1&msg=attach_credit"|args:$_GET.immo_doc_id}} {{/if}} {{/form}} diff --git a/detach_credit.html b/detach_credit.html index 1abc8d9..9665e85 100644 --- a/detach_credit.html +++ b/detach_credit.html @@ -18,15 +18,8 @@ {{:delete id=$id}} {{/load}} -{{* TODO : À VÉRIFIER *}} -{{:save - id=$_GET.immo_doc_id|intval - status="managed" -}} - {{if $_GET.from == "exit"}} {{:redirect force="exit_step1.html?immo_doc_id=%s&ok=1&msg=detach_avoir"|args:$_GET.immo_doc_id}} {{else}} - {{:redirect force="details_immo.html?immo_doc_id=%s&ok=1&msg=detach&"|args:$_GET.immo_doc_id}} - {{*:redirect force="amortization.html?immo_doc_id=%s&ok=1&msg=detach_avoir"|args:$_GET.immo_doc_id*}} + {{:redirect force="amortization.html?immo_doc_id=%s&ok=1&msg=detach_avoir"|args:$_GET.immo_doc_id}} {{/if}} diff --git a/details_immo.html b/details_immo.html deleted file mode 100644 index ca3d93b..0000000 --- a/details_immo.html +++ /dev/null @@ -1,145 +0,0 @@ -{{* -*- brindille -*- *}} - - -{{* - Afficher les détails d'une immmo - - permettre l'association d'une immo au crédit du compte de l'immo - - permettre de modifier les paramètres de l'immo - @param immo_doc_id : numéro du doc d'immo -*}} - -{{* données de l'immobilisation *}} -{{:include file="_get_immo_data.html" immo_doc_id=$_GET.immo_doc_id|intval keep="info_immo, ligne_immo, message"}} -{{if $message != null}} - {{:error message=$message}} -{{/if}} - -{{:assign var="info_immo.amount" value=$info_immo.amount|or:$ligne_immo.amount}} -{{: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:$info_immo.date_achat|or:$ligne_immo.date_achat}} -{{:assign var="info_immo.label" value=$info_immo.label|or:$ligne_immo.trans_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}} -{{/if}} - -{{* déduire le montant des écritures liées à l'immo courante au crédit du même compte *}} -{{:include file="_get_credit_lines.html" immo_doc_id=$_GET.immo_doc_id keep="linked_immos, total_credits"}} -{{:assign solde="%d-%d"|math:$info_immo.amount:$total_credits}} - -{{* lister les amortissements liés à l'immobilisation *}} -{{:include file="./_get_amort_lines.html" immo_doc_id=$_GET.immo_doc_id keep="total_amort"}} - -{{:admin_header title="Détails de l'immobilisation" custom_css="./style.css" current="module_amortization"}} - -{{if ! $dialog}} - {{:assign subsubcurrent=null}} - {{if $total_amort == 0}} - {{:assign subsubcurrent="credit"}} - {{/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.trans_id}} - -{{* - -*}} - -{{if $_GET.ok}} - {{if $_GET.msg|match:"attach_amort"}} - {{:assign msg="Écriture d'amortissement attachée"}} - {{elseif $_GET.msg|match:"attach_credit"}} - {{:assign msg="Écriture au crédit attachée"}} - {{elseif $_GET.msg|match:"info"}} - {{:assign msg="Données de l'immobilisation enregistrées"}} - {{elseif $_GET.msg|match:"detach"}} - {{:assign msg="Écriture au crédit détachée"}} - {{else}} - {{:assign msg="Opération effectuée avec succès"}} - {{/if}} -

{{$msg}}

-{{elseif $_GET.err}} - {{:assign msg="L'opération a échoué"}} -

{{$msg}}

-{{/if}} - -

- Immobilisation - #{{$ligne_immo.trans_id}} - {{$info_immo.label}} -

-{{if $linked_immos != null}} - -{{/if}} - -
-
-{{* -
Immobilisation
-
#{{$ligne_immo.trans_id}} {{$info_immo.label}}
-*}} -
Compte d'immobilisation
-
{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}
-
Date d'acquisition
-
{{$info_immo.date_achat|date_short}}
- {{if $info_immo.date_mes != null && $info_immo.date_mes != $info_immo.date_achat}} -
Date de mise en service
-
{{$info_immo.date_mes|date_short}}
- {{/if}} -
Durée d'amortissement
-
{{$info_immo.duration}} ans
-
Montant de l'immobilisation
-
{{"%f"|math:$info_immo.amount|money_currency_html:false|raw}}
- {{if $total_credits > 0}} -
Montant des avoirs
-
{{"%f"|math:$total_credits|money_currency_html:false|raw}}
-{{* -
Écritures d'avoir
-
- {{#foreach from=$linked_immos item="line"}} - {{:assign url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.id}} - #{{$line.id}} - {{/foreach}} -
-*}} -
Montant à amortir
-
{{"%f"|math:$solde|money_currency_html:false|raw}}
- {{/if}} - {{if $total_amort > 0}} -
Montant des amortissements
-
{{$total_amort|money_currency_html:false|raw}}
-
Valeur nette résiduelle
-
{{"%d-%d-%d"|math:$info_immo.amount:$total_credits:$total_amort|money_currency_html:false|raw}}
- {{/if}} -
-