From aae9580ee0a1d2ab59be8a637bb18a053630a382 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 1 Apr 2026 11:03:11 +0200 Subject: [PATCH 01/11] =?UTF-8?q?V=C3=A9rification=20existence=20table=20m?= =?UTF-8?q?odule?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _immobilisations.html | 13 +++++++++++-- _immobilisations_autres.html | 27 ++++++++++++++++++++------- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/_immobilisations.html b/_immobilisations.html index f4843cb..d287632 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -29,6 +29,14 @@ + {{* vérifier l'existence de la table du module *}} + {{#load limit="1"}} + {{:assign table_presente=true}} + {{else}} + {{:assign table_presente=false}} + {{/load}} + + {{if $table_presente}} {{* lister les immobilisations *}} {{:assign account_condition="("}} {{#foreach from=$module.config.prefixes item="code"}} @@ -199,8 +207,8 @@ label="Paramètres" href="add_infos.html?immo_line_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo shape="settings" - target="_dialog" }} +{{* target="_dialog"*}} {{/if}} {{:linkbutton label="Amortissements" @@ -242,8 +250,9 @@ {{/if}} +{{/if}} - {{if $nb_immo == 0}} + {{if $nb_immo == 0 || ! $table_presente}}

Aucune immobilisation

{{/if}} diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 69f2603..1f08e9b 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -48,6 +48,19 @@ + {{* vérifier l'existence de la table du module *}} + {{#load limit="1"}} + {{:assign columns="$$.duration as duration, $$.status as status,"}} + {{:assign table_join="LEFT JOIN !table AS info ON $$.line = line.id"}} + {{:assign doc_condition1="($$.status == 'ignored')"}} + {{:assign doc_condition2="$$.status IS NULL"}} + {{else}} + {{:assign columns=""}} + {{:assign table_join=""}} + {{:assign doc_condition1="0"}} + {{:assign doc_condition2="1"}} + {{/load}} + {{* lister les immobilisations *}} {{:assign account_condition="("}} {{#foreach from=$module.config.prefixes item="code"}} @@ -55,7 +68,6 @@ {{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} {{/foreach}} {{:assign account_condition=$account_condition|cat:"0)"}} - {{:assign doc_condition="($$.status == 'ignored')" }} {{if $unhide == null}} {{:assign filter_condition="NOT ("}} @@ -67,9 +79,9 @@ {{else}} {{:assign filter_condition="1"}} {{/if}} - {{:assign filter_condition="($$.status IS NULL AND NOT (trans.status & 16) AND "|cat:$filter_condition|cat:")"}} + {{:assign filter_condition="("|cat:$doc_condition2|cat:" AND NOT (trans.status & 16) AND "|cat:$filter_condition|cat:")"}} - {{:assign condition=$account_condition|cat:" AND debit > 0 AND ("|cat:$filter_condition|cat:" OR "|cat:$doc_condition|cat:")"}} + {{:assign condition=$account_condition|cat:" AND debit > 0 AND ("|cat:$filter_condition|cat:" OR "|cat:$doc_condition1|cat:")"}} {{:assign nb_immo=0}} {{#select @@ -82,16 +94,17 @@ account.id as account_id, account.code as account_code, account.label as account_label, - trans.id_year as trans_id_year, - $$.duration as duration, - $$.status as status + !columns + trans.id_year as trans_id_year FROM acc_transactions AS trans INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id INNER JOIN acc_accounts AS account ON line.id_account = account.id INNER JOIN acc_years AS years ON trans.id_year = years.id - LEFT JOIN !table AS info ON $$.line = line.id + !table_join WHERE !condition ORDER BY trans.date DESC; + !columns=$columns + !table_join=$table_join !table=$module.table !condition=$condition }} From 463d5d109e66722c0ee40da80d3922d76a730cd5 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 29 Apr 2026 11:37:08 +0200 Subject: [PATCH 02/11] =?UTF-8?q?Affichage=20d=C3=A9tails=20immo=20;=20ajo?= =?UTF-8?q?ut=20montant=20au=20cr=C3=A9dit=20du=20compte=20d'une=20l'immo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- attach_immo.html | 153 ++++++++++++++++++++++++++++++++++++++++++++ details_immo.html | 159 ++++++++++++++++++++++++++++++++++++++++++++++ link_immo.html | 142 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 454 insertions(+) create mode 100644 attach_immo.html create mode 100644 details_immo.html create mode 100644 link_immo.html diff --git a/attach_immo.html b/attach_immo.html new file mode 100644 index 0000000..f2ed727 --- /dev/null +++ b/attach_immo.html @@ -0,0 +1,153 @@ +{{* -*- brindille -*- *}} +{{:admin_header title="Écritures au crédit du compte d'immobilisation" custom_css="./style.css" current="module_amortization"}} + +{{* + Enregistrer la liaison entre une ligne d'immobilisation et + une ligne d'écriture au crédit du compte de l'immobilisation + @param credit_line_id : ligne d'écriture au crédit du compte de l'immobilisation + @param immo_doc_id : numéro du doc d'immo +*}} + +{{* chercher l'écriture d'immobilisation *}} +{{#load id=$_GET.immo_doc_id|intval assign="doc_immo"}} +{{else}} + {{:error message="Immobilisation non gérée ; vous devez d'abord renseigner ses informations"}} +{{/load}} +{{#select + line.id as immo_line_id, + line.id_transaction as immo_trans_id, + line.label as line_label, + trans.label as trans_label + FROM acc_transactions_lines as line + INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id + WHERE line.id = :line_id; + :line_id = $doc_immo.line + assign="ligne_immo" +}} +{{else}} + {{:error message="Immobilisation non trouvée"}} +{{/select}} + +{{:assign label_immo=$doc_immo.label|or:$ligne_immo.trans_label}} +{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} + {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} +{{/if}} + +{{* chercher l'écriture au crédit du compte d'immobilisation *}} +{{#select + line.id_transaction as credit_trans_id, + line.credit as amount, + trans.label as trans_label, + line.label as line_label + FROM acc_transactions_lines as line + INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id + WHERE line.id = :line_id; + :line_id = $_GET.credit_line_id|intval + assign="credit_line" +}} +{{else}} + {{:error message="Impossible de trouver l'écriture au crédit du compte de l'immobilisation de la ligne « %s »"|args:$ligne_immo.trans_label}} +{{/select}} +{{:assign credit_trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$credit_line.credit_trans_id}} + +{{:assign montant_affecte=0}} +{{#load type="immo_link" assign="linked_immo." + where="$$.credit_line_id = :credit_line_id" + :credit_line_id = $_GET.credit_line_id|intval +}} + {{:assign montant_affecte="%d+%d"|math:$montant_affecte:$amount}} +{{/load}} +{{:assign reste="%d-%d"|math:$credit_line.amount:$montant_affecte}} + +{{* Traiter l'envoi du formulaire *}} +{{#form on="save"}} + {{* vérifier que le montant est inférieur au reste *}} + {{if $_POST.montant == null}} + {{:assign montant_credit=null}} + {{else}} + {{:assign montant_credit=$_POST.montant|floatval}} + {{:assign montant_credit="%f*100"|math:$montant_credit}} + {{if $montant_credit > $reste}} + {{:assign reste_nb="%f"|math:$reste|money_currency:false}} + {{:error message="Le montant de l'avoir ne peut être supérieur au reste (%s)"|args:$reste_nb}} + {{/if}} + {{/if}} + +{{* chercher les liaisons de l'écriture d'immobilisation *}} +{{#select + CASE links.id_related = :immo_trans_id + WHEN true THEN links.id_transaction + WHEN false THEN links.id_related + END as linked_id + FROM acc_transactions_links as links + WHERE id_transaction = :immo_trans_id or id_related = :immo_trans_id; + :immo_trans_id = $ligne_immo.immo_trans_id +}} + {{:assign var="linked_transactions." value=$linked_id}} +{{/select}} + +{{* ajouter la nouvelle liaison *}} +{{:assign var="linked_transactions." value=$credit_line.credit_trans_id}} + +{{* Enregistrer les liaisons *}} +{{:api + method="POST" + path="accounting/transaction/%s/transactions"|args:$ligne_immo.immo_trans_id + assign="result" + assign_code="result_code" + transactions=$linked_transactions +}} + +{{* + TODO ? vérifier le succès avant d'enregistrer le doc ? +*}} + +{{* enregistrer la liaison des lignes d'immo *}} +{{:save + key=""|uuid + type="immo_link" + immo_doc_id=$_GET.immo_doc_id|intval + credit_line_id=$_GET.credit_line_id|intval + amount=$montant_credit|intval +}} + +{{:redirect force="details_immo.html?immo_doc_id=%s&ok=1&msg=attach_immo"|args:$_GET.immo_doc_id}} +{{/form}} + +{{if ! $dialog}} + {{:include + file="_nav.html" + current="config" + subcurrent="other" + subsubcurrent="immo" + type_immo="other" +}} +{{/if}} +{{:form_errors}} + +
+
+
Immobilisation
+
{{$label_immo}}
+
Écriture au crédit du compte d'immobilisation
+
#{{$credit_line.credit_trans_id}} {{$credit_line.trans_label}}{{if $credit_line.line_label != null && $credit_line.line_label != $credit_line.trans_label}} — {{$credit_line.line_label}}{{/if}}
+
Montant de l'écriture
+
{{$credit_line.amount|money_currency_html:false|raw}}
+
Montant déjà affecté
+
{{"%f"|math:$montant_affecte|money_currency_html:false|raw}}
+
Montant restant à affecter
+
{{"%f"|math:$reste|money_currency_html:false|raw}}
+
+
+ +
+
+
+ {{:input type="money" name="montant" label="Montant" help="Montant de l'avoir ; à renseigner uniquement si différent du montant de l'écriture"}} +
+
+

+ {{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}} +

+
+ diff --git a/details_immo.html b/details_immo.html new file mode 100644 index 0000000..0954f68 --- /dev/null +++ b/details_immo.html @@ -0,0 +1,159 @@ +{{* -*- brindille -*- *}} + +{{:admin_header title="Détails de l'immobilisation" custom_css="./style.css" current="module_amortization"}} + +{{* + 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 (OBSOLÈTE ?) immo_line_id : numéro de ligne de l'écriture d'immobilisation + @param immo_doc_id : numéro du doc d'immo +*}} + +{{* + TODO : permettre la modification des param (en cas d'erreur de saisie) + TODO : permettre de corriger le montant de l'amort et/ou de supprimer l'attachement + FAIT : déduire montant au crédit de la ligne d'immo +*}} + +{{* données de l'immobilisation *}} +{{#load type="immo" id=$_GET.immo_doc_id|intval assign="info_immo"}} +{{else}} + {{:error message="Immobilisation non trouvée"}} +{{/load}} + +{{#select + trans.id as immo_trans_id, + trans.label as label, + trans.date as date_achat, + line.id as immo_line_id, + line.debit as montant, + line.label as line_label, + 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_accounts AS account ON line.id_account = account.id + WHERE line.id = :line_id; + :line_id = $info_immo.line + assign="ligne_immo" + }} +{{else}} + {{:error message="Immobilisation non trouvée"}} +{{/select}} + +{{: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.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}} +{{/if}} + +{{* + chercher des écritures liées à l'immo courante au crédit du même compte + et déduire leur montant de celui de l'immo +*}} +{{: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}} + {{#select + line.credit, + trans.id + 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}} + {{/select}} + {{:assign var="linked_immos." value=$credit_trans_id}} + {{if $amount == null}} + {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} + {{else}} + {{:assign total_credits="%d+%d"|math:$total_credits:$amount}} + {{/if}} +{{/load}} +{{:assign solde="%d-%d"|math:$info_immo.amount:$total_credits}} + +{{:assign total_amort=0}} +{{* lister les docs d'amortissement liées à la ligne d'immobilisation *}} +{{#load type="amort_link" + where="$$.immo_doc_id = :immo_doc_id" + :immo_doc_id=$_GET.immo_doc_id|intval +}} + {{if $amount != null}} + {{:assign total_amort="%d+%d"|math:$total_amort:$amount}} + {{else}} + {{#select credit FROM acc_transactions_lines WHERE id = :amort_line_id; + :amort_line_id=$amort_line_id + }} + {{:assign total_amort="%d+%d"|math:$total_amort:$credit}} + {{/select}} + {{/if}} +{{/load}} + +{{* barre de navigation *}} +{{if ! $dialog}} + {{if $total_credits == 0 && $total_amort == 0}} + {{:assign subsubcurrent="credit"}} + {{else}} + {{:assign subsubcurrent=null}} + {{/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é"}} + {{elseif $_GET.msg|match:"attach_immo"}} + {{:assign msg="Attachement avoir effectué"}} + {{elseif $_GET.msg|match:"info"}} + {{:assign msg="Données de l'immobilisation enregistrées"}} + {{/if}} +

{{$msg}}

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

{{$msg}}

+{{/if}} + +

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

+
+
+
Immobilisation
+
#{{$ligne_immo.immo_trans_id}} {{$info_immo.label}}
+
Compte d'immobilisation
+
{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}
+
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="id"}} + {{:assign url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$id}} + #{{$id}} + {{/foreach}} + {{*:debug linked_immos=$linked_immos*}} +
+
Montant à amortir
+
{{"%f"|math:$solde|money_currency_html:false|raw}}
+ {{/if}} +
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 des amortissements
+
{{$total_amort|money_currency_html:false|raw}}
+
+
diff --git a/link_immo.html b/link_immo.html new file mode 100644 index 0000000..3543ab8 --- /dev/null +++ b/link_immo.html @@ -0,0 +1,142 @@ +{{* -*- brindille -*- *}} + +{{* + Lister les écritures au crédit du compte de l'immobilisation + paramètre et proposer de les attacher à l'immo paramètre + @param immo_doc_id : document associé à l'immo + *}} + +{{#load id=$_GET.immo_doc_id|intval assign="info_immo"}} +{{else}} + {{:error message="Informations de l'immobilisation non trouvées"}} +{{/load}} + +{{* récupérer les infos de l'immobilisation *}} +{{#select + trans.id as immo_trans_id, + trans.label as label, + trans.date as date_achat, + line.id as immo_line_id, + line.label as line_label, + line.debit as montant, + account.code as account_code + FROM acc_transactions_lines AS line + 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 + assign="ligne_immo" + }} +{{else}} + {{:error message="Immobilisation « %s » non trouvée"|args:$info_immo.line}} +{{/select}} +{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.immo_trans_id}} +{{:assign label_immo=$ligne_immo.label}} +{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} + {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} +{{/if}} + +{{* + lister les écritures au crédit du compte de l'immobilisation + variante : utiliser une jointure ; pas forcément plus efficace +*}} +{{#select + line.id as credit_line_id, + line.id_transaction as credit_trans_id, + line.credit as credit_amount, + line.label as line_label, + trans.id as immo_trans_id, + trans.date as trans_date, + trans.label as trans_label, + trans.id_year as credit_year, + account.id as account_id, + account.code as account_code, + account.label as account_label + FROM acc_transactions_lines AS line + INNER JOIN acc_transactions AS trans ON trans.id = line.id_transaction + INNER JOIN acc_accounts AS account ON account.id = line.id_account + INNER JOIN acc_years AS y ON y.id = trans.id_year + WHERE account.code = :account_code AND credit > 0 + AND credit_trans_id NOT IN ( + SELECT + CASE WHEN id_transaction = credit_trans_id THEN id_transaction + ELSE id_related + END AS other_id + FROM acc_transactions_links WHERE other_id = credit_trans_id) + ORDER BY trans.date, trans.label; + :account_code = $ligne_immo.account_code + assign="other_immos." + }} +{{/select}} + +{{:admin_header title="Écritures au crédit du compte d'immobilisation" custom_css="./style.css" current="module_amortization"}} + +{{* barre de navigation *}} +{{if ! $dialog}} + {{:include + file="_nav.html" + current="config" + subcurrent="other" + subsubcurrent="immo" + type_immo="other" +}} +{{/if}} + +
+
+ + Écritures au crédit du compte d'immobilisation « {{$ligne_immo.account_code}} » + + +
+
+
Immobilisation
+
#{{$ligne_immo.immo_trans_id}} {{$label_immo}}
+
Montant
+
{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}
+
Date de l'écriture d'immobilisation
+
{{$ligne_immo.date_achat|date_short}}
+
+
+
+ + {{if $other_immos != null}} + + + + + + + + + + + + + + {{#foreach from=$other_immos item="line"}} + {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.credit_trans_id}} + {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.credit_year}} + + + + + + + + + + {{/foreach}} + +
N°DateMontantLibelléN° compteCompte
#{{$line.credit_trans_id}}{{$line.trans_date|date_short}}{{"%f"|math:$line.credit_amount|money_html:false|raw}}{{$line.trans_label}} + {{if $line.line_label != null && $line.line_label != $line.trans_label}} - {{$line.line_label}}{{/if}} + {{$line.account_code}}{{$line.account_label}} + {{:linkbutton label="Attacher" href="attach_immo.html?credit_line_id=%d&immo_doc_id=%s"|args:$line.credit_line_id:$_GET.immo_doc_id shape="plus"}} +
+

Sélectionner une écriture d'avoir ou autre réduction du montant de l'acquisition pour l'associer à l'immobilisation

+ {{else}} +

Aucune écriture au crédit du compte « {{$ligne_immo.account_code}} »

+ {{/if}} +
+{{:form_errors}} +{{:admin_footer}} From f8f4da59b6a4e8163920ca41d93faba7fc365ea4 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 29 Apr 2026 11:38:32 +0200 Subject: [PATCH 03/11] =?UTF-8?q?Prise=20en=20compte=20=C3=A9critures=20g?= =?UTF-8?q?=C3=A9r=C3=A9es=20uniquement=20(immo,=20cr=C3=A9dit,=20amort)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _immobilisations.html | 205 +++++++++++++++--------------------------- 1 file changed, 70 insertions(+), 135 deletions(-) diff --git a/_immobilisations.html b/_immobilisations.html index d287632..fa31b31 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -3,16 +3,16 @@ {{* Liste des immobilisations en cours d'amortissement ou amorties *}} {{:include file="_get_config.html" keep="module.config"}} -
-

- {{if $type_immo == "managed"}} - Cette page liste les immobilisations en cours d'amortissement - {{elseif $type_immo == "amortized"}} - Cette page liste les immobilisations dont l'amortissement est terminé - {{/if}} -

+

+ {{if $type_immo == "managed"}} + Cette page liste les immobilisations en cours d'amortissement + {{elseif $type_immo == "amortized"}} + Cette page liste les immobilisations dont l'amortissement est terminé + {{/if}} +

+{{if $module.table != null}} @@ -29,14 +29,6 @@ - {{* vérifier l'existence de la table du module *}} - {{#load limit="1"}} - {{:assign table_presente=true}} - {{else}} - {{:assign table_presente=false}} - {{/load}} - - {{if $table_presente}} {{* lister les immobilisations *}} {{:assign account_condition="("}} {{#foreach from=$module.config.prefixes item="code"}} @@ -44,17 +36,8 @@ {{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} {{/foreach}} {{:assign account_condition=$account_condition|cat:"0)"}} - {{:assign doc_condition="($$.status <> 'ignored' AND $$.status <> 'archived')"}} - - {{:assign filter_condition="NOT ("}} - {{#foreach from=$module.config.filters item="filter"}} - {{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}} - {{:assign filter_condition=$filter_condition|cat:" trans_label LIKE "|cat:$filter|cat:" OR "}} - {{/foreach}} - {{:assign filter_condition=$filter_condition|cat:"0)"}} - {{:assign filter_condition="($$.status IS NULL AND NOT (trans.status & 16) AND "|cat:$filter_condition|cat:")"}} - - {{:assign condition=$account_condition|cat:" AND debit > 0 AND ("|cat:$filter_condition|cat:" OR "|cat:$doc_condition|cat:")"}} + {{:assign status_condition="($$.status = 'managed' OR $$.status = 'amortized')"}} + {{:assign condition=$account_condition|cat:" AND line.debit > 0 AND "|cat:$status_condition}} {{:assign nb_immo=0}} {{:assign total_immo = 0}} @@ -68,152 +51,105 @@ account.id as account_id, account.code as account_code, trans.id_year as trans_id_year, + info.id as immo_doc_id, $$.duration as duration, + $$.label as doc_label, + $$.amount as doc_amount, + $$.date_achat as doc_date_achat, + $$.date as doc_date_mes, $$.status as status FROM acc_transactions AS trans INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id INNER JOIN acc_accounts AS account ON line.id_account = account.id INNER JOIN acc_years AS years ON trans.id_year = years.id - LEFT JOIN !table AS info ON $$.line = line.id + INNER JOIN !table AS info ON $$.line = line.id WHERE !condition - ORDER BY trans.date DESC; + ORDER BY COALESCE(doc_date_achat, trans_date) DESC; !table=$module.table !condition=$condition }} {{: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 duration=$duration}} - {{:assign montant_immo=$debit}} - {{if $status == null}} - {{:assign status="unknown"}} + {{:assign montant_immo=$doc_amount|or:$debit}} + {{:assign immo_date = $doc_date_achat|or:$trans_date}} + {{:assign label_immo=$doc_label|or:$trans_label}} + {{if $line_label != null && $line_label != $label_immo}} + {{:assign label_immo=$label_immo|cat:" — "|cat:$line_label}} {{/if}} - {{* chercher des écritures liées à l'immo courante au crédit du même compte + {{* + chercher des écritures liées à l'immo courante au crédit du même compte et déduire leur montant de celui de l'immo *}} - {{#select - CASE links.id_related = :immo_trans_id - WHEN true THEN links.id_transaction - WHEN false THEN links.id_related - END as other_id, - line.credit - FROM acc_transactions AS trans - INNER JOIN acc_transactions_links as links - ON (trans.id = links.id_transaction OR trans.id = links.id_related) - INNER JOIN acc_transactions_lines AS line on line.id_transaction = other_id - INNER JOIN acc_accounts AS acc ON line.id_account = acc.id - WHERE trans.id = :immo_trans_id AND line.credit > 0 AND acc.code = :account; - :immo_trans_id=$immo_trans_id - :account=$account_code - }} - {{:assign montant_immo="%d-%d"|math:$montant_immo:$credit}} - {{/select}} + {{#load + type="immo_link" + where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id = $immo_doc_id + }} + {{if $amount == null}} + {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id; + :credit_line_id=$credit_line_id + }} + {{:assign montant_immo="%d-%d"|math:$montant_immo:$credit}} + {{/select}} + {{else}} + {{:assign montant_immo="%d-%d"|math:$montant_immo:$amount}} + {{/if}} + {{/load}} {{* Immobilisation soldée ? *}} - {{* TODO marquer archivée *}} + {{* TODO ¿ marquer archivée ? *}} {{if $montant_immo == 0}} {{:continue}} {{/if}} - {{* lister les lignes des écritures d'amortissement liées à l'immobilisation *}} + {{* chercher des lignes des écritures d'amortissement liées à la ligne d'immobilisation *}} {{:assign amort_lines=null}} - {{#select - l_amort.credit as amount, - CASE links.id_related = t_immo.id - WHEN true THEN links.id_transaction - WHEN false THEN links.id_related - END as amort_trans_id, - l_amort.id AS amort_line_id - FROM acc_transactions_lines as l_immo - INNER JOIN acc_transactions as t_immo on t_immo.id = l_immo.id_transaction - INNER JOIN acc_transactions_links as links - ON (t_immo.id = links.id_transaction OR t_immo.id = links.id_related) - INNER JOIN acc_transactions_lines as l_amort on amort_trans_id = l_amort.id_transaction - INNER JOIN acc_accounts AS account ON l_amort.id_account = account.id - WHERE l_immo.id = :line_id AND l_amort.credit <> 0 AND account.code LIKE '28%'; - :line_id = $immo_line_id|intval - assign="line" - }} - {{:assign var="amort_lines.%d."|args:$amort_trans_id value=$line}} - {{/select}} - {{:assign amort_amount=0}} - {{#foreach from=$amort_lines key="amort_trans_id" item="lines"}} - {{:assign nb=$lines|count}} - {{* lister les docs de liaison de l'écriture d'amortissement *}} - {{:assign links=null}} - {{#load type="link" - where="$$.immo_line_id = :immo_line_id AND $$.amort_trans_id = :amort_trans_id" - :immo_line_id = $immo_line_id - :amort_trans_id = $amort_trans_id - assign="links." + {{#load type="amort_link" + where="$$.immo_doc_id = :immo_doc_id" + :immo_doc_id = $immo_doc_id + assign="amort_link" }} - {{/load}} - - {{#foreach from=$lines item="line"}} - {{* voir s'il existe une ligne associée à l'écriture d'amortissement *}} - {{:assign line_link_exist=false}} - {{#foreach from=$links item="link"}} - {{if $link.amort_line_id == $line.amort_line_id}} - {{:assign amort_amount="%d+%d"|math:$amort_amount:$line.amount}} - {{:assign line_link_exist=true}} - {{/if}} - {{/foreach}} - {{if ! $line_link_exist}} - {{if $nb == 1}} - {{* créer la liaison ligne immo <-> ligne amort *}} -{{*:debug lier_immo_line_id=$immo_line_id lier_amort_trans_id=$amort_trans_id avec_amort_line_id=$amort_line_id*}} - {{:save - key=""|uuid - type="link" - immo_line_id=$immo_line_id - amort_line_id=$amort_line_id - amort_trans_id=$amort_trans_id - }} - {{:assign amort_amount="%d+%d"|math:$amort_amount:$line.amount}} - {{/if}} - {{/if}} - {{/foreach}} - {{/foreach}} - - {{if $amort_amount == 0}} - {{:assign exist_amort=false}} - {{else}} - {{:assign exist_amort=true}} - {{:assign amort_amount=$amort_amount}} - {{/if}} + {{if $amount == null}} + {{#select credit FROM acc_transactions_lines WHERE id = :amort_line_id; + :amort_line_id = $amort_line_id + }} + {{:assign amort_amount="%d+%d"|math:$amort_amount:$credit}} + {{/select}} + {{else}} + {{:assign amort_amount="%d+%d"|math:$amort_amount:$amount}} + {{/if}} + {{/load}} {{* classement par onglet *}} {{if $type_immo == "managed" && $amort_amount >= $montant_immo}}{{:continue}}{{/if}} - {{if $status == "unknown" && ! $exist_amort}}{{:continue}}{{/if}} - {{if $type_immo == "amortized" && $amort_amount < $montant_immo}}{{:continue}}{{/if}} {{* ?? *}} + {{if $type_immo == "amortized" && $amort_amount < $montant_immo}}{{:continue}}{{/if}} {{:assign nb_immo="%d+1"|math:$nb_immo}} {{:assign total_immo="%d+%d"|math:$total_immo:$montant_immo}} {{:assign var="montant" from="sommes_immo.%s"|args:$account_code}} {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$montant_immo}} - - - + + + - + @@ -250,9 +186,8 @@ {{/if}} -{{/if}}
#{{$immo_trans_id}}{{$trans_date|date_short}}{{$trans_label}}{{if $line_label != null && $line_label != $trans_label}} — {{$line_label}}{{/if}}#{{$immo_trans_id}}{{$immo_date|date_short}}{{$label_immo}} {{$montant_immo|money_html:false|raw}} {{if $duration != null}}{{$duration}}{{/if}} {{$amort_amount|money_html:false|raw}} {{"%d-%d"|math:$montant_immo:$amort_amount|money_html:false|raw}}{{$account_code}}{{$account_code}} - {{if ! $exist_amort || $status == "unknown"}} + {{*if $amort_amount == 0*}} {{:linkbutton - label="Paramètres" - href="add_infos.html?immo_line_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo - shape="settings" + label="Détails" + href="details_immo.html?immo_doc_id=%s"|args:$immo_doc_id + shape="search" }} -{{* target="_dialog"*}} - {{/if}} + {{* target="_dialog"*}} + {{*/if*}} {{:linkbutton label="Amortissements" - href="amortization.html?immo_line_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo - shape="table" + href="amortization.html?immo_line_id=%s&type_immo=%s&immo_doc_id=%s"|args:$immo_line_id:$type_immo:$immo_doc_id shape="table" }}
- {{if $nb_immo == 0 || ! $table_presente}} -

Aucune immobilisation

- {{/if}} -
+{{/if}} +{{if $nb_immo == 0 || $module.table == null}} +

Aucune immobilisation

+{{/if}} From d5c62b6ef31f36c4fc7a2ffd5db29f71e10dd830 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 29 Apr 2026 11:43:17 +0200 Subject: [PATCH 04/11] =?UTF-8?q?Prise=20en=20compte=20=C3=A9critures=20BO?= =?UTF-8?q?I=20avec=20montant=20immo=20subdivis=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _immobilisations_autres.html | 346 +++++++++++++++++------------------ add_infos.html | 253 ++++++++++++------------- link.schema.json | 36 ++++ schema.json | 13 +- 4 files changed, 329 insertions(+), 319 deletions(-) create mode 100644 link.schema.json diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 1f08e9b..781940a 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -1,199 +1,187 @@ {{* -*- brindille -*- *}} -{{* Liste des immobilisations non amortissables ou non (encore) gérées *}} +{{* Liste des immobilisations non gérées ou non entièrement affectées *}} {{:include file="_get_config.html" keep="module.config"}} -
+

+ Cette page liste les immobilisations pas encore prises en charge + par le module ou les écritures de la balance d'ouverture initiale + dont le montant n'est pas encore totalement affecté +

-

- Cette page liste les écritures pas (encore) prises en charge par le module et sans écriture d'amortissement associée. -

+{{:assign saved_hides=$module.config.hides}} +{{:assign var="user_hides" from="saved_hides.%s"|args:$logged_user.id}} - {{:assign saved_hides=$module.config.hides}} - {{:assign var="user_hides" from="saved_hides.%s"|args:$logged_user.id}} - - {{if $_POST|count == 0}} - {{:assign unhide=$user_hides.unhide_other}} +{{if $_POST|count == 0}} + {{:assign unhide=$user_hides.unhide_other}} +{{else}} + {{if $_POST.unhide == null}} + {{:assign unhide=0}} {{else}} - {{if $_POST.unhide == null}} - {{:assign unhide=0}} - {{else}} - {{:assign unhide=1}} + {{:assign unhide=1}} + {{/if}} + {{:assign var="user_hides.unhide_other" value=$unhide"}} + {{:assign var="saved_hides.%s"|args:$logged_user.id value=$user_hides}} + {{:save key="config" hides=$saved_hides}} +{{/if}} +{{if $unhide}} + {{:assign checked="checked"}} +{{/if}} + +{{* vérifier l'existence de la table du module *}} +{{if $module.table != null}} + {{:assign columns="$$.status as status, SUM($$.amount) as amount,"}} + {{:assign table_join="LEFT JOIN !table AS info ON $$.line = line.id"}} + {{:assign doc_condition="($$.status IS NULL OR $$.status == 'managed' OR $$.status == 'ignored')"}} +{{else}} + {{:assign columns=""}} + {{:assign table_join=""}} + {{:assign doc_condition="1"}} +{{/if}} + +{{* + lister les immobilisations non prises en charge par le module + ou dont le montant n'a pas été totalement affecté +*}} +{{:assign account_condition="("}} +{{#foreach from=$module.config.prefixes item="code"}} + {{:assign code=$code|cat:"%"|quote_sql}} + {{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} +{{/foreach}} +{{:assign account_condition=$account_condition|cat:"0)"}} + +{{if $unhide == null}} + {{:assign filter_condition="NOT ("}} + {{#foreach from=$module.config.filters item="filter"}} + {{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}} + {{:assign filter_condition=$filter_condition|cat:" trans_label LIKE "|cat:$filter|cat:" OR "}} + {{/foreach}} + {{:assign filter_condition=$filter_condition|cat:"0)"}} +{{else}} + {{:assign filter_condition="1"}} +{{/if}} + +{{:assign condition=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16) AND "|cat:$filter_condition|cat:" AND "|cat:$doc_condition}} + +{{:assign nb_managed=0}} +{{:assign nb_ignored=0}} +{{:assign nb_null=0}} +{{:assign nb_other=0}} +{{#select + trans.id as immo_trans_id, + trans.label as trans_label, + trans.date as trans_date, + line.id as immo_line_id, + line.debit AS debit, + line.label AS line_label, + account.id as account_id, + account.code as account_code, + account.label as account_label, + !columns + trans.id_year as trans_id_year + FROM acc_transactions AS trans + INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id + INNER JOIN acc_accounts AS account ON line.id_account = account.id + INNER JOIN acc_years AS years ON trans.id_year = years.id + !table_join + WHERE !condition + GROUP BY immo_line_id + ORDER BY trans.date DESC; + !columns=$columns + !table_join=$table_join + !table=$module.table + !condition=$condition + assign="immo_line" + }} + {{* + parmi les immos gérées, ne conserver que celles dont le montant dans le doc est non nul + et inférieur au montant de l'écriture d'immo + *}} + {{if $immo_line.status == 'managed'}} + {{if $immo_line.amount == null || $immo_line.amount == 0 || $immo_line.amount == $immo_line.debit}} + {{:continue}} {{/if}} - {{:assign var="user_hides.unhide_other" value=$unhide"}} - {{:assign var="saved_hides.%s"|args:$logged_user.id value=$user_hides}} - {{:save key="config" hides=$saved_hides}} {{/if}} - {{if $unhide}} - {{:assign checked="checked"}} + {{if $status == null}} + {{:assign nb_null="%d+1"|math:$nb_null}} + {{elseif $status == 'managed'}} + {{:assign nb_managed="%d+1"|math:$nb_managed}} + {{elseif $status == 'ignored'}} + {{:assign nb_ignored="%d+1"|math:$nb_ignored}} + {{else}} + {{:assign nb_other="%d+1"|math:$nb_other}} {{/if}} -
-
- {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher toutes les écritures" }} -
-
+ {{:assign var="immo_lines." value=$immo_line}} +{{/select}} +{{*:debug lines=$immo_lines nb_lines=$immo_lines|count nb_null=$nb_null nb_managed=$nb_managed nb_ignored=$nb_ignored nb_other=$nb_other unhide=$unhide*}} - - - - - - - - - - - - - + +
+ {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher les écritures ignorées" }} +
+ - {{* vérifier l'existence de la table du module *}} - {{#load limit="1"}} - {{:assign columns="$$.duration as duration, $$.status as status,"}} - {{:assign table_join="LEFT JOIN !table AS info ON $$.line = line.id"}} - {{:assign doc_condition1="($$.status == 'ignored')"}} - {{:assign doc_condition2="$$.status IS NULL"}} - {{else}} - {{:assign columns=""}} - {{:assign table_join=""}} - {{:assign doc_condition1="0"}} - {{:assign doc_condition2="1"}} - {{/load}} +{{if $immo_lines|count > 0}} +
N°DateLibelléMontantN° compteCompte
+ + + + + + + + + + + + + + + + {{#foreach from=$immo_lines item="line"}} - {{* lister les immobilisations *}} - {{:assign account_condition="("}} - {{#foreach from=$module.config.prefixes item="code"}} - {{:assign code=$code|cat:"%"|quote_sql}} - {{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} - {{/foreach}} - {{:assign account_condition=$account_condition|cat:"0)"}} - - {{if $unhide == null}} - {{:assign filter_condition="NOT ("}} - {{#foreach from=$module.config.filters item="filter"}} - {{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}} - {{:assign filter_condition=$filter_condition|cat:" trans_label LIKE "|cat:$filter|cat:" OR "}} - {{/foreach}} - {{:assign filter_condition=$filter_condition|cat:"0)"}} - {{else}} - {{:assign filter_condition="1"}} - {{/if}} - {{:assign filter_condition="("|cat:$doc_condition2|cat:" AND NOT (trans.status & 16) AND "|cat:$filter_condition|cat:")"}} - - {{:assign condition=$account_condition|cat:" AND debit > 0 AND ("|cat:$filter_condition|cat:" OR "|cat:$doc_condition1|cat:")"}} - - {{:assign nb_immo=0}} - {{#select - trans.id as immo_trans_id, - trans.label as trans_label, - trans.date as trans_date, - line.id as immo_line_id, - line.debit AS debit, - line.label AS line_label, - account.id as account_id, - account.code as account_code, - account.label as account_label, - !columns - trans.id_year as trans_id_year - FROM acc_transactions AS trans - INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id - INNER JOIN acc_accounts AS account ON line.id_account = account.id - INNER JOIN acc_years AS years ON trans.id_year = years.id - !table_join - WHERE !condition - ORDER BY trans.date DESC; - !columns=$columns - !table_join=$table_join - !table=$module.table - !condition=$condition - }} - {{: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}} - - {{if $status == null}} - {{:assign status="unknown"}} - {{/if}} - - {{if $unhide == null}} - {{if $status != "unknown"}} - {{:continue}} - {{/if}} - {{else}} - {{if $status != "ignored" && $status != "unknown"}} - {{:continue}} - {{/if}} - {{* vérifier si le libellé aurait pu être filtré *}} - {{#foreach from=$module.config.filters item="filter"}} - {{if $filter|strpos:$trans_label !== false}} - {{:assign status="ignored"}} - {{/if}} - {{/foreach}} - {{/if}} - - {{* lister les lignes des écritures d'amortissement liées à l'immobilisation *}} - {{:assign amort_lines=null}} - {{#select - l_amort.credit as amort_amount, - CASE links.id_related = t_immo.id - WHEN true THEN links.id_transaction - WHEN false THEN links.id_related - END as amort_trans_id, - l_amort.id AS amort_line_id - FROM acc_transactions_lines as l_immo - INNER JOIN acc_transactions as t_immo on t_immo.id = l_immo.id_transaction - INNER JOIN acc_transactions_links as links - ON (t_immo.id = links.id_transaction OR t_immo.id = links.id_related) - INNER JOIN acc_transactions_lines as l_amort on amort_trans_id = l_amort.id_transaction - INNER JOIN acc_accounts AS account ON l_amort.id_account = account.id - WHERE l_immo.id = :line_id AND l_amort.credit <> 0 AND account.code LIKE '28%'; - :line_id = $immo_line_id|intval - assign="amort_lines." - }} - {{/select}} - {{:assign amort_amount=0}} - {{#foreach from=$amort_lines item="line"}} - {{* voir s'il existe un doc associé à l'écriture d'amortissement *}} - {{#load type="link" - where="$$.immo_line_id = :immo_line_id AND $$.amort_trans_id = :amort_trans_id AND $$.amort_line_id = :amort_line_id" - :immo_line_id = $immo_line_id - :amort_trans_id = $line.amort_trans_id - :amort_line_id = $line.amort_line_id - }} - {{:assign amort_amount="%d+%d"|math:$amort_amount:$line.amount}} - {{else}} - {{* TODO À VÉRIFIER (cas multi-lignes) *}} - {{:assign amort_amount="%d+%d"|math:$amort_amount:$line.amount}} - {{/load}} - {{/foreach}} - {{if $amort_amount != 0}} + {{if $unhide == null}} + {{if $status == "ignored"}} {{:continue}} {{/if}} + {{else}} + {{* vérifier si le libellé aurait pu être filtré *}} + {{#foreach from=$module.config.filters item="filter"}} + {{if $filter|strpos:$trans_label !== false}} + {{:assign status="ignored"}} + {{/if}} + {{/foreach}} + {{/if}} - {{:assign nb_immo="%d+1"|math:$nb_immo}} - - - - - - - - - - {{/select}} - -
N°LigneDateLibelléMontantAffectéResteN° compteCompte
#{{$immo_trans_id}}{{$trans_date|date_short}}{{$trans_label}}{{if $line_label != null && $line_label != $trans_label}} — {{$line_label}}{{/if}}{{"%f"|math:$debit|money_html:false|raw}}{{$account_code}}{{$account_label}} - {{:linkbutton - label="Paramètres" - href="add_infos.html?immo_line_id=%s&type_immo=other"|args:$immo_line_id - shape="settings" - target="_dialog" - }} -
- {{if $nb_immo == 0}} -

Aucune immobilisation

- {{/if}} -
+ {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.immo_trans_id}} + {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.trans_id_year}} + {{:assign reste="%d-%d"|math:$line.debit:$line.amount}} + + #{{$line.immo_trans_id}} + {{$line.immo_line_id}} + {{$trans_date|date_short}} + {{$line.trans_label}}{{if $line.line_label != null && $line.line_label != $line.trans_label}} — {{$line.line_label}}{{/if}} + {{"%f"|math:$line.debit|money_html:false|raw}} + {{"%f"|math:$line.amount|money_html:false|raw}} + {{"%f"|math:$reste|money_html:false|raw}} + {{$line.account_code}} + {{$line.account_label}} + + {{:linkbutton + label="Paramètres" + href="add_infos.html?immo_line_id=%s&type_immo=other"|args:$immo_line_id + shape="settings" + }} +{{* target="_dialog"*}} + + + {{/foreach}} + + +{{else}} +

Aucune immobilisation

+{{/if}} diff --git a/link.schema.json b/link.schema.json new file mode 100644 index 0000000..1524b55 --- /dev/null +++ b/link.schema.json @@ -0,0 +1,36 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "description": "Schéma des liens entre documents", + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": ["amort_link", "immo_link"] + }, + "immo_doc_id" : { + "description": "identifiant du document d'immobilisation associé", + "type" : "integer", + "exclusiveMinimum": 0 + }, + "amort_line_id" : { + "description": "numéro de ligne d'amortissement associée à l'immobilisation", + "type": "integer", + "exclusiveMinimum": 0 + }, + "credit_line_id": { + "description": "numéro de ligne au crédit du compte de l'immobilisation", + "type": "integer", + "exclusiveMinimum": 0 + }, + "amount": { + "description": "montant de la ligne d'amortissement ou de crédit", + "type": ["number", "null"] + } + }, + "required": ["type", "immo_doc_id"], + "if": {"properties": {"type": {"const": "amort_link"}}, "required": ["type"]}, + "then": {"required": ["amort_line_id"]}, + "else": + "if": {"properties": {"type": {"const": "immo_link"}}, "required": ["type"]}, + "then": {"required": ["credit_line_id"]}, +} diff --git a/schema.json b/schema.json index 2acebc3..23a924b 100644 --- a/schema.json +++ b/schema.json @@ -14,11 +14,20 @@ "description": "durée de l'amortissement en années", "type": "integer" }, + "label" : { + "description" : "libellé de l'immobilisation si besoin", + "type" : ["string", "null"] + }, "amount" : { "description": "montant de l'immobilisation si besoin", "type": ["integer", "null"] }, - "date" : { + "date_achat" : { + "description" : "date d'achat de l'immobilisation si besoin", + "type" : ["string", "null"], + "format" : "date" + }, + "date_mes" : { "description" : "date de mise en service de l'immobilisation", "type" : ["string", "null"], "format" : "date" @@ -28,5 +37,5 @@ "enum" : ["managed", "amortized", "archived", "ignored"] } }, - "required": ["type", "line", "duration", "date"] + "required": ["type", "line", "duration", "status"] } From 87a1f31bb36e1be0568e71cbe100a45155481d34 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 29 Apr 2026 12:01:24 +0200 Subject: [PATCH 05/11] =?UTF-8?q?liaisons=20=C3=A9critures=20remplac=C3=A9?= =?UTF-8?q?es=20par=20liaisons=20lignes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- amortization.html | 259 ++++++++++++++++----------------------- other_amortizations.html | 85 ++++++------- save_amort.html | 154 +++++++++++------------ 3 files changed, 216 insertions(+), 282 deletions(-) diff --git a/amortization.html b/amortization.html index cf162a2..710bb6d 100644 --- a/amortization.html +++ b/amortization.html @@ -3,10 +3,16 @@ {{* Lister les écritures d'amortissement associées à une immobilisation @param immo_line_id : id de la ligne d'immo + @param immo_doc_id : id du doc associé à l'immo @param type_immo : managed, amortized, archived, others *}} -{{* récupérer les infos de l'immobilisation *}} +{{* données de l'immobilisation *}} +{{#load type="immo" id=$_GET.immo_doc_id|intval assign="info_immo"}} +{{else}} + {{:error message="Immobilisation non trouvée"}} +{{/load}} + {{#select line.id as immo_line_id, line.debit as montant, @@ -14,167 +20,113 @@ trans.id as immo_trans_id, trans.label as label, trans.date, - account.code as account_code + 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_accounts AS account ON line.id_account = account.id WHERE line.id = :line_id; - :line_id = $_GET.immo_line_id|intval - assign=ligne_immo + :line_id = $info_immo.line + assign="ligne_immo" }} {{else}} - {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} + {{:error message="Immobilisation non trouvée"}} {{/select}} -{{:assign date_debut=$ligne_immo.date}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.immo_trans_id}} -{{#load type="immo" where="$$.line = :line_id" :line_id=$_GET.immo_line_id|intval}} - {{:assign duree=$duration}} - {{:assign date_debut=$date}} - {{:assign status=$status}} -{{/load}} +{{:assign date_debut=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date}} +{{:assign label_immo=$info_immo.label|or:$ligne_immo.label}} +{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} + {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} +{{/if}} +{{if $info_immo.amount != null}} + {{:assign var="ligne_immo.montant" value=$info_immo.amount}} +{{/if}} -{{if $status == 'ignored'}} +{{if $info_immo.status == 'ignored'}} {{:error message="Cette immobilisation ne doit pas être amortie"}} {{/if}} -{{* chercher des écritures liées à l'immo courante au crédit du même compte +{{* + chercher des écritures liées à l'immo courante au crédit du même compte et déduire leur montant de celui de l'immo *}} {{:assign total_credits=0}} -{{#select - CASE links.id_related = :immo_trans_id - WHEN true THEN links.id_transaction - WHEN false THEN links.id_related - END as other_id, - line.credit - FROM acc_transactions AS trans - INNER JOIN acc_transactions_links as links - ON (trans.id = links.id_transaction OR trans.id = links.id_related) - INNER JOIN acc_transactions_lines AS line on line.id_transaction = other_id - INNER JOIN acc_accounts AS acc ON line.id_account = acc.id - WHERE trans.id = :immo_trans_id AND line.credit > 0 AND acc.code = :account; - :immo_trans_id=$ligne_immo.immo_trans_id - :account=$ligne_immo.account_code - }} - {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} -{{/select}} +{{#load type="immo_link" where="$$.immo_doc_id=:immo_doc_id" :immo_doc_id=$_GET.immo_doc_id|intval}} + {{if $amount == null}} + {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id; + :credit_line_id=$credit_line_id + }} + {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} + {{/select}} + {{else}} + {{:assign total_credits="%d+%d"|math:$total_credits:$amount}} + {{/if}} +{{/load}} {{:assign var="ligne_immo.montant" value="%d-%d"|math:$ligne_immo.montant:$total_credits}} {{:assign solde=$ligne_immo.montant}} +{{*:debug info_immo=$info_immo ligne_immo=$ligne_immo total_credits=$total_credits solde=$solde*}} -{{* lister les lignes des écritures d'amortissement liées à l'immobilisation *}} -{{#select - l_amort.credit as amort_amount, - l_amort.label as amort_line_label, - l_amort.id as amort_line_id, - CASE WHEN links.id_related = t_immo.id - THEN links.id_transaction - ELSE links.id_related - END as amort_trans_id, - trans.date as amort_date, - trans.label as amort_trans_label, - trans.id_year as amort_year, - account.id as account_id, - account.code as account_code, - account.label as account_label - FROM acc_transactions_lines as l_immo - INNER JOIN acc_transactions as t_immo on t_immo.id = l_immo.id_transaction - INNER JOIN acc_transactions_links as links - ON (t_immo.id = links.id_transaction OR t_immo.id = links.id_related) - INNER JOIN acc_transactions_lines as l_amort on amort_trans_id = l_amort.id_transaction - INNER join acc_transactions as trans on l_amort.id_transaction = trans.id - INNER join acc_accounts as account on l_amort.id_account = account.id - WHERE l_immo.id = :line_id AND account.code LIKE '28%' - ORDER BY trans.date; - :line_id = $_GET.immo_line_id|intval - assign="amort_line" -}} - {{* lister les lignes d'amortissement liées à la ligne d'immobilisation *}} - {{#load type="link" - where="$$.immo_line_id = :immo_line_id AND $$.amort_trans_id = :amort_trans_id AND $$.amort_line_id = :amort_line_id" - assign="line" - :immo_line_id=$_GET.immo_line_id|intval - :amort_trans_id=$amort_line.amort_trans_id - :amort_line_id = $amort_line.amort_line_id - }} - {{:assign var="linked_amort." value=$amort_line}} - {{/load}} - {{if $date_debut == null}} - {{:assign date_debut=$amort_date}} - {{/if}} -{{/select}} - -{{if $status == "amortized"}} +{{if $info_immo.status == "amortized"}} {{:assign amort_amount=$ligne_immo.montant}} {{:assign valeur_residuelle=0}} {{else}} {{:assign valeur_residuelle=$ligne_immo.montant}} - {{#foreach from=$linked_amort}} - {{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$amort_amount}} - {{/foreach}} {{/if}} -{{* Autres amortissements non rattachés *}} -{{:include file="_get_config.html" keep="module.config"}} -{{:assign filter_condition=" NOT ("}} -{{#foreach from=$module.config.filters item="filter"}} - {{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}} - {{:assign filter_condition=$filter_condition|cat:" trans.label LIKE "|cat:$filter|cat:" OR "}} -{{/foreach}} -{{:assign filter_condition=$filter_condition|cat:"0)"}} - -{{:assign autres_amortissements=false}} -{{#select - line.id_transaction AS amort_trans_id - FROM acc_transactions_lines AS line - INNER JOIN acc_accounts AS account ON account.id = line.id_account - INNER JOIN acc_transactions AS trans ON trans.id = line.id_transaction - INNER JOIN acc_years AS y ON y.id = trans.id_year - WHERE account.code LIKE "28%" AND credit > 0 AND (NOT trans.status & 16) AND !filter_condition - ORDER BY trans.date, trans.label; - !filter_condition=$filter_condition - assign="amort" +{{* lister les lignes des écritures d'amortissement liées à l'immobilisation *}} +{{#load type="amort_link" + where="$$.immo_doc_id = :immo_doc_id" + :immo_doc_id = $_GET.immo_doc_id|intval }} - {{* voir s'il existe des écritures liées avec un numéro de compte d'immobilisation *}} {{#select - links.id_transaction, - links.id_related, - trans.id AS trans_id - FROM acc_transactions_links AS links - INNER JOIN acc_transactions AS trans ON ( - CASE - WHEN links.id_transaction = :id_amort THEN links.id_related - WHEN links.id_related = :id_amort THEN links.id_transaction - END) = trans.id - INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id - INNER JOIN acc_accounts AS acc ON line.id_account = acc.id - WHERE - links.id_transaction = :id_amort OR links.id_related = :id_amort - AND acc.code LIKE '21%' - LIMIT 1 + line.id as amort_line_id, + line.credit, + line.label as amort_line_label, + trans.id as amort_trans_id, + trans.label as amort_trans_label, + trans.date as amort_date, + trans.id_year as amort_year, + account.id as account_id, + 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_accounts AS account on line.id_account = account.id + WHERE line.id = :amort_line_id ; - :id_amort=$amort.amort_trans_id + :amort_line_id = $amort_line_id + assign="amort_line" }} - {{* voir s'il existe un doc associé à une ligne de l'amortissement *}} - {{:assign keep=true}} - {{#load type="link" - where="$$.amort_trans_id = :amort_trans_id" - :amort_trans_id = $amort.amort_trans_id - }} - {{if $amort_line_id == $amort.amort_line_id}} - {{:assign keep=false}} - {{:break}} - {{/if}} - {{else}} - {{:assign keep=false}} - {{/load}} - {{if $keep}} - {{:assign autres_amortissements=true}} - {{/if}} - {{else}} - {{:assign autres_amortissements=true}} + {{:assign var="amort_line.amort_amount" value=$amount|or:$credit}} + {{:assign var="linked_amort.%s_%d"|args:$amort_date:$id value=$amort_line}} + {{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$amort_line.amort_amount}} {{/select}} -{{/select}} +{{/load}} + +{{if $_GET.type_immo == null || $_GET.type_immo != "amortized"}} + {{* Chercher des amortissements non rattachés à une immo *}} + {{:assign autres_amortissements=false}} + {{#select + line.id as amort_line_id, + line.id_transaction AS amort_trans_id + FROM acc_transactions_lines AS line + INNER JOIN acc_accounts AS account ON account.id = line.id_account + INNER JOIN acc_transactions AS trans ON trans.id = line.id_transaction + INNER JOIN acc_years AS y ON y.id = trans.id_year + WHERE account.code LIKE "28%" AND credit > 0 AND (NOT trans.status & 16) + ORDER BY trans.date, trans.label; + }} + {{* cette ligne d'amortissement a-t-elle un doc associé ? *}} + {{#load type="amort_link" + where="$$.amort_line_id = :amort_line_id" + :amort_line_id = $amort_line_id + }} + {{else}} + {{:assign autres_amortissements=true}} + {{/load}} + {{/select}} +{{/if}} {{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortization"}} @@ -200,16 +152,16 @@ {{if $_GET.ok}} {{if $_GET.msg|match:"attach"}} - {{:assign msg="Attachement écriture %s effectué"|args:$_GET.trans_id}} + {{:assign msg="Attachement amortissement %s effectué"|args:$_GET.trans_id}} {{elseif $_GET.msg|match:"detach"}} - {{:assign msg="Détachement écriture %s affectué"|args:$_GET.trans_id}} + {{:assign msg="Détachement amortissement %s affectué"|args:$_GET.trans_id}} {{elseif $_GET.msg|match:"amortissement"}} {{:assign msg="Amortissement enregistré"}} {{/if}}

{{$msg}}

{{elseif $_GET.err}} {{if $_GET.msg|match:"attach"}} - {{:assign msg="Échec attachement"}} + {{:assign msg="Échec attachement amortissement"}} {{elseif $_GET.msg|match:"amortissement"}} {{:assign msg="Échec enregistrement amortissement"}} {{/if}} @@ -222,7 +174,7 @@

{{:linkbutton label="Sortir du bilan" - href="balance_sheet_exit.html?immo_line_id=%s&type_immo=%s"|args:$_GET.immo_line_id:$_GET.type_immo + href="balance_sheet_exit.html?immo_line_id=%s&immo_doc_id=%s&type_immo=%s"|args:$_GET.immo_line_id:$_GET.immo_doc_id:$_GET.type_immo shape="export" class="main" }} @@ -238,14 +190,22 @@

Immobilisation
-
#{{$ligne_immo.immo_trans_id}} {{$ligne_immo.label}}{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} — {{$ligne_immo.line_label}}{{/if}}
-
Montant
+
#{{$ligne_immo.immo_trans_id}} {{$label_immo}}
+
Compte d'immobilisation
+
{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}
+
Montant de l'immobilisation
{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}
+ {{if $total_credits > 0}} +
Montant des avoirs
+
{{"%f"|math:$total_credits|money_currency_html:false|raw}}
+
Montant à amortir
+
{{"%f"|math:$solde|money_currency_html:false|raw}}
+ {{/if}}
Début d'amortissement
{{$date_debut|date_short}}
- {{if $duree != null}} + {{if $info_immo.duration != null}}
Durée
-
{{$duree}} ans
+
{{$info_immo.duration}} ans
{{/if}} {{if $valeur_residuelle > 0}}
Montant des amortissements
@@ -253,9 +213,9 @@
Valeur nette comptable
{{$valeur_residuelle|money_currency_html:false|raw}}
{{/if}} - {{if $duree != null && $valeur_residuelle > 0}} + {{if $info_immo.duration != null && $valeur_residuelle > 0}}
Annuité estimée
-
{{"min(%d, %f/%d)"|math:$valeur_residuelle:$ligne_immo.montant:$duree|money_currency_html:false|raw}}
+
{{"min(%d, %f/%d)"|math:$valeur_residuelle:$ligne_immo.montant:$info_immo.duration|money_currency_html:false|raw}}
{{/if}}
@@ -277,13 +237,13 @@ - {{#foreach from=$linked_amort item="line"}} + {{#foreach from=$linked_amort|ksort item="line"}} {{* données de l'écriture *}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.amort_trans_id}} {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.amort_year}} {{:assign solde="%f-%d"|math:$solde:$line.amort_amount}} - #{{$line.amort_trans_id}} + #{{$line.amort_trans_id}} {{$line.amort_date|date_short}} {{"%f"|math:$line.amort_amount|money_html:false|raw}} {{"%f"|math:$solde|money_html:false|raw}} @@ -293,10 +253,10 @@ — {{$line.amort_line_label}} {{/if}} - {{$line.account_code}} + {{$line.account_code}} {{$line.account_label}} - {{:linkbutton label="Détacher" href="detach_amort.html?amort_line_id=%d&immo_line_id=%d"|args:$line.amort_line_id:$ligne_immo.immo_line_id shape="minus"}} + {{:linkbutton label="Détacher" href="detach_amort.html?amort_line_id=%d&immo_line_id=%d&immo_doc_id=%s"|args:$line.amort_line_id:$ligne_immo.immo_line_id:$_GET.immo_doc_id shape="minus"}} {{/foreach}} @@ -308,13 +268,10 @@ {{/if}} {{if $_GET.type_immo == null || $_GET.type_immo != "amortized"}} - - {{* Autres amortissements non rattachés *}} - {{if $autres_amortissements}}

- Il existe des écritures d'amortissement qui ne sont pas rattachées à une immobilisation !
- Utilisez le bouton « Rattacher une écriture » pour les afficher ; vous pourrez choisir d'en attacher certaines à cette immobilisation. + Il y a des écritures d'amortissement qui ne sont pas rattachées à une immobilisation !
+ Utilisez le bouton « Rattacher un amortissement » pour les afficher ; vous pourrez choisir d'en attacher certaines à cette immobilisation.

{{/if}} {{/if}} diff --git a/other_amortizations.html b/other_amortizations.html index 91b379a..ec439b7 100644 --- a/other_amortizations.html +++ b/other_amortizations.html @@ -4,6 +4,7 @@ Lister les écritures d'amortissement indépendantes et proposer des les attacher à l'immo sélectionnée @param immo_line_id = id de la ligne d'immo + @param immo_doc_id id du doc d'immo associé *}} {{* récupérer les infos de l'immobilisation *}} @@ -17,11 +18,19 @@ assign=ligne_immo }} {{else}} - {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} + {{:error message="Immobilisation non trouvée"}} {{/select}} -{{:include file="_get_config.html" keep="module.config"}} +{{#load id=$_GET.immo_doc_id|intval}} + {{:assign label_immo=$label|or:$ligne_immo.label}} +{{else}} + {{:error message="Informations de l'immobilisation %s (%s) non trouvées"|args:$_GET.immo_line_id:$ligne_immo.label}} +{{/load}} +{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} + {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} +{{/if}} +{{:include file="_get_config.html" keep="module.config"}} {{if $_POST.unhide == null}} {{:assign filter_condition=" NOT ("}} {{#foreach from=$module.config.filters item="filter"}} @@ -54,46 +63,26 @@ !filter_condition=$filter_condition assign="amort" }} - - {{* voir s'il existe des écritures liées avec un numéro de compte d'immobilisation *}} - {{#select - links.id_transaction, - links.id_related, - trans.id AS trans_id - FROM acc_transactions_links AS links - INNER JOIN acc_transactions AS trans ON ( - CASE - WHEN links.id_transaction = :id_amort THEN links.id_related - WHEN links.id_related = :id_amort THEN links.id_transaction - END) = trans.id - INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id - INNER JOIN acc_accounts AS acc ON line.id_account = acc.id - WHERE - links.id_transaction = :id_amort OR links.id_related = :id_amort - AND acc.code LIKE '21%' - LIMIT 1 - ; - :id_amort=$amort.amort_trans_id + {{* voir s'il existe des lignes d'immo liées à cette ligne d'amortissement *}} + {{:assign amort_amount=0}} + {{:assign keep_amort=true}} + {{#load type="amort_link" + where="$$.amort_line_id = :amort_line_id" + :amort_line_id=$amort.amort_line_id|intval + assign="amort_link" }} - {{* voir s'il existe un doc associé à une ligne de l'amortissement *}} - {{:assign keep=true}} - {{#load type="link" - where="$$.amort_trans_id = :amort_trans_id" - :amort_trans_id = $amort.amort_trans_id - }} - {{if $amort_line_id == $amort.amort_line_id}} - {{:assign keep=false}} - {{:break}} - {{/if}} + {{if $amort_link.amount == null || $amort_link.amount == 0}} + {{:assign amort_amount=$amort.amort_amount}} + {{:assign keep_amort=false}} {{else}} - {{:assign keep=false}} - {{/load}} - {{if $keep}} - {{:assign var="autres_amortissements." value=$amort}} + {{:assign amort_amount="%d+%d"|math:$amort_amount:$amort_link.amount}} {{/if}} {{else}} - {{:assign var="autres_amortissements." value=$amort}} - {{/select}} + {{* pas de ligne d'immo liée à cette ligne d'amort => garder cette ligne d'amortissement *}} + {{/load}} + {{if $keep_amort && $amort_amount < $amort.amort_amount}} + {{:assign var="free_amort_lines." value=$amort}} + {{/if}} {{/select}} {{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortization"}} @@ -106,7 +95,7 @@ subcurrent="other" subsubcurrent="amortization" type_immo="other" - autres_amort=$autres_amortissements + autres_amort=$free_amort_lines }} {{/if}} @@ -116,13 +105,13 @@
- {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher toutes les écritures" }} + {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher les écritures ignorées"}}
-{{if $autres_amortissements != null}} +{{if $free_amort_lines != null}}
-

Immobilisation « {{$ligne_immo.label}}{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} — {{$ligne_immo.line_label}}{{/if}} »

+

Immobilisation « {{$label_immo}} »

@@ -136,20 +125,24 @@ - {{#foreach from=$autres_amortissements item="line"}} + {{#foreach from=$free_amort_lines item="line"}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.amort_trans_id}} {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.amort_year}} - + - + {{/foreach}} diff --git a/save_amort.html b/save_amort.html index 4aa8e64..6a8459c 100644 --- a/save_amort.html +++ b/save_amort.html @@ -3,6 +3,7 @@ {{* Créer une écriture d'amortissement @param immo_line_id : id de la ligne d'immobilisation + @param immo_doc_id : id du doc associé à l'immo *}} {{* Infos de l'immobilisation *}} @@ -11,7 +12,7 @@ line.debit as montant, line.id_project as project_id, line.label as line_label, - trans.id as trans_id, + trans.id as immo_trans_id, trans.label, trans.date, account.code as account_code @@ -21,106 +22,90 @@ LEFT JOIN acc_projects AS project ON line.id_project = project.id WHERE line.id = :line_id; :line_id = $_GET.immo_line_id|intval - assign=ligne_immo + assign="ligne_immo" }} {{else}} - {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} + {{:error message="Immobilisation non trouvée"}} {{/select}} {{:assign date_debut=$ligne_immo.date}} -{{:assign var="amort_label" value="Amortissement %s"|args:$ligne_immo.label}} -{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} + +{{#load id=$_GET.immo_doc_id|intval}} + {{:assign duree=$duration}} + {{if $date_mes != null}} + {{:assign date_debut=$date_mes}} + {{/if}} + {{:assign status=$status}} + {{:assign amort_label=$label|or:$ligne_immo.label}} + {{if $amount != null}} + {{:assign var="ligne_immo.montant" value=$amount}} + {{/if}} +{{else}} + {{:error message="Informations de l'immobilisation « %s » non trouvées ; vous devez d'abord les renseigner"|args:$ligne_immo.label}} +{{/load}} +{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $amort_label}} {{:assign amort_label=$amort_label|cat:" — "|cat:$ligne_immo.line_label}} {{/if}} - -{{#load type="immo" where="$$.line = :line_id" :line_id=$_GET.immo_line_id|intval}} - {{:assign duree=$duration}} - {{:assign date_debut=$date}} - {{:assign status=$status}} -{{else}} - {{:error message="Vous devez renseigner la date de mise en service et la durée d'immobilisation"}} -{{/load}} +{{:assign var="amort_label" value="Amortissement %s"|args:$amort_label}} {{if $status == "amortized" || $status == "archived"}} {{:error message="Cette immobilisation est complètement amortie ; il est impossible d'ajouter une écriture d'amortissement"}} {{/if}} -{{* chercher des écritures liées à l'immo courante au crédit du même compte +{{* + chercher des écritures liées à l'immo courante au crédit du même compte et déduire leur montant de celui de l'immo *}} {{:assign total_credits=0}} -{{#select - CASE links.id_related = :immo_trans_id - WHEN true THEN links.id_transaction - WHEN false THEN links.id_related - END as other_id, - line.credit - FROM acc_transactions AS trans - INNER JOIN acc_transactions_links as links - ON (trans.id = links.id_transaction OR trans.id = links.id_related) - INNER JOIN acc_transactions_lines AS line on line.id_transaction = other_id - INNER JOIN acc_accounts AS acc ON line.id_account = acc.id - WHERE trans.id = :immo_trans_id AND line.credit > 0 AND acc.code = :account; - :immo_trans_id=$ligne_immo.trans_id - :account=$ligne_immo.account_code +{{#load + type="immo_link" + where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id = $_GET.immo_doc_id|intval }} - {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} -{{/select}} + {{if $amount == null}} + {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id; + :credit_line_id=$credit_line_id + }} + {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} + {{/select}} + {{else}} + {{:assign total_credits="%d+%d"|math:$total_credits:$amount}} + {{/if}} +{{/load}} {{:assign var="ligne_immo.montant" value="%d-%d"|math:$ligne_immo.montant:$total_credits}} {{:assign solde=$ligne_immo.montant}} -{{* chercher des écritures d'amortissement liées à l'immobilisation *}} -{{#select - l_amort.credit as amort_amount, - l_amort.label as amort_label, - l_amort.id as amort_line_id, - CASE WHEN links.id_related = t_immo.id - THEN links.id_transaction - ELSE links.id_related - END as amort_trans_id, - trans.date as amort_date, - trans.label as trans_label, - trans.id_year as amort_year, - account.id as account_id, - account.code as account_code, - account.label as account_label - FROM acc_transactions_lines as l_immo - INNER JOIN acc_transactions as t_immo on t_immo.id = l_immo.id_transaction - INNER JOIN acc_transactions_links as links - ON (t_immo.id = links.id_transaction OR t_immo.id = links.id_related) - INNER JOIN acc_transactions_lines as l_amort on amort_trans_id = l_amort.id_transaction - INNER join acc_transactions as trans on l_amort.id_transaction = trans.id - INNER join acc_accounts as account on l_amort.id_account = account.id - WHERE - l_immo.id = :line_id - AND account.code LIKE '28%' - ORDER BY trans.date; - :line_id = $_GET.immo_line_id|intval - assign="amort_line" -}} - {{#load type="link" - where="$$.immo_line_id = :immo_line_id AND $$.amort_trans_id = :amort_trans_id" - order="$$.date" - assign="line" - :immo_line_id=$_GET.immo_line_id|intval :amort_trans_id=$amort_line.amort_trans_id +{{* chercher des écritures d'amortissement liées à la ligne d'immobilisation *}} +{{#load + type="amort_link" + where="$$.immo_doc_id = :immo_doc_id" + order="$$.date" + :immo_doc_id=$_GET.immo_doc_id|intval }} - {{if $line.amort_line_id == $amort_line.amort_line_id}} - {{:assign var="linked_amort." value=$amort_line}} - {{/if}} - {{else}} - {{:assign var="linked_amort." value=$amort_line}} - {{/load}} -{{/select}} - + {{#select + line.credit, + trans.date as amort_date, + 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_accounts AS account on line.id_account = account.id + WHERE line.id = :amort_line_id + ; + :amort_line_id = $amort_line_id + assign="amort_line" + }} + {{:assign var="amort_line.amort_amount" value=$amount|or:$credit}} + {{:assign var="linked_amort.%s_%d"|args:$amort_date:$id value=$amort_line}} + {{/select}} +{{/load}} {{:assign total_amort=0}} {{:assign valeur_residuelle=$ligne_immo.montant}} -{{#foreach from=$linked_amort}} - {{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$amort_amount}} - {{:assign total_amort="%d+%d"|math:$total_amort:$amort_amount}} - {{:assign date_debut=$amort_date}} - {{:assign code_amort=$account_code}} - {{:assign amort_account_label=$account_label}} - {{:assign amort_label=$amort_label}} +{{#foreach from=$linked_amort|ksort item="line"}} + {{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$line.amort_amount}} + {{:assign total_amort="%d+%d"|math:$total_amort:$line.amort_amount}} + {{:assign date_debut=$line.amort_date}} + {{:assign code_amort=$line.account_code}} + {{:assign amort_account_label=$line.account_label}} {{/foreach}} {{if $valeur_residuelle == 0}} @@ -221,7 +206,7 @@ }} {{if $account_ok == null}} {{:assign compte=$credit_account|implode:""}} - {{:redirect url="add_account.html?account=%s&chart=%s&immo_line_id=%s"|args:$compte:$selected_chart:$_GET.immo_line_id}} + {{:redirect url="add_account.html?account=%s&chart=%s"|args:$compte:$selected_chart}} {{/if}} {{* vérifier que le montant ne dépasse pas le solde restant *}} @@ -256,7 +241,7 @@ date=$_POST.date_amort label=$_POST.designation lines=$lines - linked_transactions=$ligne_immo.trans_id|intval + linked_transactions=$ligne_immo.immo_trans_id|intval }} {{* enregistrer la liaison des lignes *}} @@ -275,14 +260,13 @@ {{if $amort_trans_id != null}} {{:save key=""|uuid - type="link" - immo_line_id=$_GET.immo_line_id|intval + type="amort_link" + immo_doc_id=$_GET.immo_doc_id|intval amort_line_id=$amort_line_id|intval - amort_trans_id=$result.id }} {{/if}} - {{:redirect force="amortization.html?immo_line_id=%s&ok=1&msg=amortissement"|args:$_GET.immo_line_id}} + {{:redirect force="amortization.html?immo_line_id=%s&immo_doc_id=%s&ok=1&msg=amortissement"|args:$_GET.immo_line_id:$_GET.immo_doc_id}} {{/form}} {{:admin_header title="Ajout amortissement" custom_css="./style.css" current="module_amortization"}} From faccd71ef8bbe5dcf5b380829e845e0729c4d304 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 29 Apr 2026 12:02:07 +0200 Subject: [PATCH 06/11] =?UTF-8?q?liaison=20lignes=20+=20possibilit=C3=A9?= =?UTF-8?q?=20saisir=20montant?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- attach_amort.html | 199 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 147 insertions(+), 52 deletions(-) diff --git a/attach_amort.html b/attach_amort.html index 4770afa..b320848 100644 --- a/attach_amort.html +++ b/attach_amort.html @@ -1,74 +1,169 @@ {{* -*- brindille -*- *}} {{* - Enregistrer la liaison entre une écriture d'amortissement et - l'écriture d'immobilisation correspondante + Enregistrer la liaison entre une ligne d'écriture d'amortissement + et une ligne d'écriture d'immobilisation + @param immo_line_id : numéro de ligne de l'écriture d'immobilisation + @param amort_line_id : numéro de ligne de l'écriture d'amortissement + @param immo_doc_id : numéro du doc d'immo *}} {{* chercher l'écriture d'immobilisation *}} {{#select - id_transaction - FROM acc_transactions_lines - WHERE id = :line_id; + line.id_transaction as immo_trans_id, + trans.label as trans_label, + line.label as line_label + FROM acc_transactions_lines as line + INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id + WHERE line.id = :line_id; :line_id = $_GET.immo_line_id|intval + assign="ligne_immo" }} - {{:assign immo_trans_id=$id_transaction}} {{else}} - {{:error message="Impossible de trouver l'écriture d'immobilisation de la ligne « %s »"|args:$_GET.immo_line_id}} + {{:error message="Immobilisation non trouvée"}} {{/select}} +{{* chercher le doc associé à l'immo *}} +{{#load id=$_GET.immo_doc_id|intval}} + {{:assign label_immo=$label|or:$ligne_immo.trans_label}} +{{else}} + {{:error message="Immobilisation non trouvée"}} +{{/load}} + +{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} + {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} +{{/if}} + {{* chercher l'écriture d'amortissement *}} {{#select - id_transaction - FROM acc_transactions_lines - WHERE id = :line_id; + line.credit as amount, + line.label as line_label, + trans.date as amort_date, + trans.label as trans_label, + trans.id as trans_id, + acc.code as account_code, + acc.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_accounts as acc on line.id_account = acc.id + WHERE line.id = :line_id; :line_id = $_GET.amort_line_id|intval + assign="amort_line" }} - {{:assign amort_trans_id=$id_transaction}} {{else}} - {{:error message="Impossible de trouver l'écriture d'amortissement de la ligne « %s »"|args:$_GET.amort_line_id}} + {{:error message="Amortissement non trouvé"}} {{/select}} +{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$amort_line.trans_id}} -{{* chercher les liaisons de l'écriture d'immobilisation *}} -{{#select - CASE links.id_related = :immo_trans_id - WHEN true THEN links.id_transaction - WHEN false THEN links.id_related - END as linked_id - FROM acc_transactions_links as links - WHERE id_transaction = :immo_trans_id or id_related = :immo_trans_id; - :immo_trans_id = $immo_trans_id -}} - {{:assign var="linked_transactions." value=$linked_id}} -{{/select}} - -{{* ajouter la nouvelle liaison *}} -{{:assign var="linked_transactions." value=$amort_trans_id}} -{{:api - method="POST" - path="accounting/transaction/%s/transactions"|args:$immo_trans_id - assign="result" - assign_code="result_code" - transactions=$linked_transactions -}} - -{{* vérifier si cette liaison est déjà présente dans les documents pour éviter les doublons *}} -{{#load type="link" - where="$$.immo_line_id = :immo_line_id AND - $$.amort_trans_id = :amort_trans_id AND - $$.amort_line_id = :amort_line_id" - :immo_line_id=$_GET.immo_line_id|intval - :amort_trans_id = $amort_trans_id +{{* montant de l'écriture d'amortissement déjà affecté *}} +{{:assign montant_affecte=0}} +{{#load type="amort_link" assign="linked_amort." + where="$$.amort_line_id = :amort_line_id" :amort_line_id = $_GET.amort_line_id|intval - limit=1 }} -{{else}} - {{:save - key=""|uuid - type="link" - immo_line_id=$_GET.immo_line_id|intval - amort_line_id=$_GET.amort_line_id|intval - amort_trans_id=$amort_trans_id - }} + {{:assign montant_affecte="%d+%d"|math:$montant_affecte:$amount}} {{/load}} -{{:redirect force="amortization.html?immo_line_id=%s&ok=1&msg=attach&trans_id=%s"|args:$_GET.immo_line_id:$amort_trans_id}} +{{:assign reste="%d-%d"|math:$amort_line.amount:$montant_affecte}} + +{{* Traiter l'envoi du formulaire *}} +{{#form on="save"}} + + {{* vérifier que le montant saisi est inférieur au reste *}} + {{if $_POST.montant == null}} + {{if $montant_affecte == 0}} + {{:assign saved_amount=null}} + {{else}} + {{:assign saved_amount=$reste}} + {{/if}} + {{else}} + {{:assign montant_amort=$_POST.montant|floatval}} + {{:assign montant_amort="%f*100"|math:$montant_amort}} + {{if $montant_amort > $reste}} + {{:assign reste_nb="%f"|math:$reste|money_currency:false}} + {{:error message="Le montant de l'amortissement ne peut être supérieur au reste (%s)"|args:$reste_nb}} + {{/if}} + {{if $montant_amort == $amort_line.amount}} + {{:assign saved_amount=null}} + {{else}} + {{:assign saved_amount=$montant_amort|intval}} + {{/if}} + {{/if}} + + {{* chercher les liaisons de l'écriture d'immobilisation *}} + {{#select + CASE links.id_related = :immo_trans_id + WHEN true THEN links.id_transaction + WHEN false THEN links.id_related + END as linked_id + FROM acc_transactions_links as links + WHERE id_transaction = :immo_trans_id or id_related = :immo_trans_id; + :immo_trans_id = $ligne_immo.immo_trans_id + }} + {{:assign var="linked_transactions." value=$linked_id}} + {{/select}} + + {{* ajouter la nouvelle liaison *}} + {{:assign var="linked_transactions." value=$amort_line.trans_id}} + {{:api + method="POST" + path="accounting/transaction/%s/transactions"|args:$ligne_immo.immo_trans_id + assign="result" + assign_code="result_code" + transactions=$linked_transactions + }} + + {{* vérifier si cette liaison est déjà présente dans les documents pour éviter les doublons *}} + {{* TODO voir si nécessaire ? *}} + {{#load type="amort_link" + where="$$.immo_doc_id = :immo_doc_id AND $$.amort_line_id = :amort_line_id" + :immo_doc_id=$_GET.immo_doc_id|intval + :amort_line_id = $_GET.amort_line_id|intval + limit=1 + }} + {{else}} + {{:save + key=""|uuid + type="amort_link" + immo_doc_id=$_GET.immo_doc_id|intval + amort_line_id=$_GET.amort_line_id|intval + amount=$saved_amount + }} + {{/load}} + + {{:redirect force="amortization.html?immo_line_id=%s&immo_doc_id=%s&ok=1&msg=attach_amort"|args:$_GET.immo_line_id:$_GET.immo_doc_id}} +{{/form}} + +{{:admin_header title="Amortir l'immobilisation" custom_css="./style.css" current="module_amortization"}} + +{{* barre de navigation *}} +{{if ! $dialog}} + {{:include file="_nav.html" current="config" subcurrent="init" subsubcurrent="parameter"}} +{{/if}} +{{:form_errors}} + +
+
+
Immobilisation
+
{{$label_immo}}
+
Amortissement
+
#{{$amort_line.trans_id}} {{$label_immo}}
+
Montant de l'écriture d'amortissement
+
{{$amort_line.amount|money_currency_html:false|raw}}
+
Montant déjà affecté
+
{{"%f"|math:$montant_affecte|money_currency_html:false|raw}}
+
Montant restant à affecter
+
{{"%f"|math:$reste|money_currency_html:false|raw}}
+
+
+ +
+
+
+ {{:input type="money" name="montant" label="Montant" default=$reste help="Montant de l'amortissement"}} +
+
+

+ {{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}} +

+ + From e31286f440462b66f69366eb7271a908c235d708 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 29 Apr 2026 12:03:03 +0200 Subject: [PATCH 07/11] =?UTF-8?q?Adaptation=20nouveau=20sch=C3=A9ma=20doc?= =?UTF-8?q?=20immo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- add_asset.html | 7 ++++--- detach_amort.html | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/add_asset.html b/add_asset.html index 5cbe061..2ee28bd 100644 --- a/add_asset.html +++ b/add_asset.html @@ -141,7 +141,7 @@ type="immo" line=$immo_line_id duration=$duration - date=$date_debut + date_mes=$date_debut status=$status }} {{/if}} @@ -243,8 +243,9 @@ function changeYear(evt, f_accounts = ['credit_account', 'debit_account'], f_yea setSelectorYear(f_accounts, f_years_select); } -function changeVisibility(evt, idcheck = 'f_amortir_1', fields = ['div_amort']) { - toggleVisibility(idcheck, fields); +function changeVisibility(evt, idcheck = 'f_amortir_1', iddiv = 'div_amort') +{ + toggleVisibility(idcheck, document.querySelectorAll('#' + iddiv)); } (function () { diff --git a/detach_amort.html b/detach_amort.html index c078c3f..caae1a0 100644 --- a/detach_amort.html +++ b/detach_amort.html @@ -3,6 +3,9 @@ {{* Supprimer l'association entre une écriture d'amortissement et une écriture d'immobilisation + @param immo_line_id : id de la ligne d'immo + @param amort_line_id : id de la ligne d'amortissement + @param immo_doc_id : id du doc associé à l'immo *}} {{* chercher l'écriture d'immobilisation *}} @@ -14,7 +17,7 @@ }} {{:assign immo_trans_id=$id_transaction}} {{else}} - {{:error message="Impossible de trouver l'écriture d'immobilisation de la ligne « %s »"|args:$_GET.immo_line_id}} + {{:error message="Immobilisation non trouvée"}} {{/select}} {{* chercher l'écriture d'amortissement *}} @@ -26,7 +29,7 @@ }} {{:assign amort_id=$id_transaction}} {{else}} - {{:error message="Impossible de trouver l'écriture d'amortissement de la ligne « %s »"|args:$_GET.amort_line_id}} + {{:error message="Amortissement non trouvé"}} {{/select}} {{* @@ -57,15 +60,13 @@ }} {{* supprimer le doc de liaison entre les lignes *}} -{{#load type="link" - where="$$.immo_line_id = :immo_line_id AND - $$.amort_trans_id = :amort_trans_id AND - $$.amort_line_id = :amort_line_id" - :immo_line_id=$_GET.immo_line_id|intval - :amort_trans_id = $amort_id|intval +{{#load type="amort_link" + where="$$.immo_doc_id = :immo_doc_id AND $$.amort_line_id = :amort_line_id" + :immo_doc_id=$_GET.immo_doc_id|intval :amort_line_id = $_GET.amort_line_id|intval }} {{:delete id=$id}} {{/load}} -{{:redirect to="amortization.html?immo_line_id=%s&ok=1&msg=detach&trans_id=%s"|args:$_GET.immo_line_id:$amort_id}} +{{:redirect + to="amortization.html?immo_line_id=%s&ok=1&msg=detach&immo_doc_id=%s"|args:$_GET.immo_line_id:$_GET.immo_doc_id}} From d6fd5b404702e6a8b9b6ea4ab3386b416a8acda3 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 29 Apr 2026 12:03:51 +0200 Subject: [PATCH 08/11] =?UTF-8?q?Petites=20am=C3=A9liorations=20et=20corre?= =?UTF-8?q?ctions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _unfinished.html | 4 ++-- ignore.html | 2 +- scripts.js | 9 ++++----- style.css | 20 +++++++++++++++++--- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/_unfinished.html b/_unfinished.html index a222475..37ab4c9 100644 --- a/_unfinished.html +++ b/_unfinished.html @@ -154,11 +154,11 @@ - + - +
#{{$line.amort_trans_id}}#{{$line.amort_trans_id}} {{$line.trans_date|date_short}} {{"%f"|math:$line.amort_amount|money_html:false|raw}} {{$line.trans_label}} {{if $line.line_label != null && $line.line_label != $line.trans_label}} - {{$line.line_label}}{{/if}} {{$line.account_code}}{{$line.account_code}} {{$line.account_label}} - {{:linkbutton label="Attacher" href="attach_amort.html?amort_line_id=%d&immo_line_id=%d"|args:$line.amort_line_id:$_GET.immo_line_id shape="plus"}} + {{if $_GET.init == null}} + {{:linkbutton label="Attacher" href="attach_amort.html?amort_line_id=%d&immo_line_id=%d&immo_doc_id=%s"|args:$line.amort_line_id:$_GET.immo_line_id:$_GET.immo_doc_id shape="plus"}} + {{elseif $_GET.init}} + {{:linkbutton label="Attacher" href="attach_amort_init.html?amort_line_id=%d&immo_line_id=%d&immo_doc_id=%s"|args:$line.amort_line_id:$_GET.immo_line_id:$_GET.immo_doc_id shape="plus"}} + {{/if}}
{{:input type="checkbox" name="selected[]" value=$trans_id}}#{{$trans_id}}#{{$trans_id}} {{$trans_date|date_short}} {{$trans_label}} {{"%f"|math:$debit|money_html:false|raw}} {{$account_label}} {{:linkbutton diff --git a/ignore.html b/ignore.html index e396a77..96254fd 100644 --- a/ignore.html +++ b/ignore.html @@ -62,7 +62,7 @@
Écriture
-
#{{$ligne_immo.trans_id}} {{$ligne_immo.label}}
+
#{{$ligne_immo.trans_id}} {{$ligne_immo.label}}
Montant
{{"%f"|math:$ligne_immo.amount|money_currency_html:false|raw}}
diff --git a/scripts.js b/scripts.js index 7496328..babf511 100644 --- a/scripts.js +++ b/scripts.js @@ -14,14 +14,13 @@ function toggleInputs(idcb, idfields) { function toggleVisibility(idcheck, fields) { const elem = document.getElementById(idcheck); - for (let id of fields) { - const field = document.getElementById(id); + fields.forEach(function (field) { if (elem.checked) { - field.setAttribute('class', ''); + field.classList.remove('hidden'); } else { - field.setAttribute('class', 'hidden'); + field.classList.add('hidden'); } - } + }); } // fixer l'exercice des sélecteurs de compte diff --git a/style.css b/style.css index 6836da9..8998179 100644 --- a/style.css +++ b/style.css @@ -35,17 +35,15 @@ h2[class="aide"], h3[class="aide"] { } .informations dl.describe { - grid-template-columns : 20rem 1fr; + grid-template-columns : 25rem 1fr; } .informations dl.describe > dt { - flex: 0 0 15rem; margin-right: 0; white-space: nowrap; } .informations dl.describe > dd { - flex: 0 0 calc(100% - 20rem); margin-right: 0; } @@ -76,7 +74,23 @@ table.list tbody tr.ignored:nth-child(even) { font-style: italic; background: rgba(255, 255, 200, 0.5); } +html.dark table.list tbody tr.ignored:nth-child(odd) { + font-style: italic; + background: rgba(100, 100, 0, 0.4); +} +html.dark table.list tbody tr.ignored:nth-child(even) { + font-style: italic; + background: rgba(100, 100, 0, 0.4); +} html.dialog.dark { filter: none !important; } + +html.dialog.dark main { + background-color : #ddd; +} + +html.dark .block.alert { + background-color : rgba(87, 206, 235, 0.5); +} From b74ef8ae9c2222df8366ed79f176e82bc8862973 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 29 Apr 2026 14:23:46 +0200 Subject: [PATCH 09/11] Correction erreur conversion montant saisi --- add_infos.html | 5 ++--- attach_amort.html | 5 ++--- attach_immo.html | 21 +++++++++++++++------ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/add_infos.html b/add_infos.html index 9b638b1..1739c81 100644 --- a/add_infos.html +++ b/add_infos.html @@ -77,15 +77,14 @@ {{:assign libelle=$_POST.libelle}} {{/if}} - {{if $_POST.montant == null || $_POST.montant|intval == 0 }} + {{if $_POST.montant == null || $_POST.montant|money_int == 0 }} {{if $montant_affecte > 0}} {{:assign montant=$reste}} {{else}} {{:assign montant=null}} {{/if}} {{else}} - {{:assign montant=$_POST.montant|intval}} - {{:assign montant="%d*100"|math:$montant}} + {{:assign montant=$_POST.montant|money_int}} {{if $montant == $reste}} {{:assign montant=null}} {{/if}} diff --git a/attach_amort.html b/attach_amort.html index b320848..afffa20 100644 --- a/attach_amort.html +++ b/attach_amort.html @@ -76,8 +76,7 @@ {{:assign saved_amount=$reste}} {{/if}} {{else}} - {{:assign montant_amort=$_POST.montant|floatval}} - {{:assign montant_amort="%f*100"|math:$montant_amort}} + {{:assign montant_amort=$_POST.montant|money_int}} {{if $montant_amort > $reste}} {{:assign reste_nb="%f"|math:$reste|money_currency:false}} {{:error message="Le montant de l'amortissement ne peut être supérieur au reste (%s)"|args:$reste_nb}} @@ -85,7 +84,7 @@ {{if $montant_amort == $amort_line.amount}} {{:assign saved_amount=null}} {{else}} - {{:assign saved_amount=$montant_amort|intval}} + {{:assign saved_amount=$montant_amort}} {{/if}} {{/if}} diff --git a/attach_immo.html b/attach_immo.html index f2ed727..3fa8001 100644 --- a/attach_immo.html +++ b/attach_immo.html @@ -50,6 +50,7 @@ {{/select}} {{:assign credit_trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$credit_line.credit_trans_id}} +{{* montant de l'écriture de crédit déjà affecté *}} {{:assign montant_affecte=0}} {{#load type="immo_link" assign="linked_immo." where="$$.credit_line_id = :credit_line_id" @@ -61,16 +62,24 @@ {{* Traiter l'envoi du formulaire *}} {{#form on="save"}} - {{* vérifier que le montant est inférieur au reste *}} + {{* vérifier que le montant saisi est inférieur au reste *}} {{if $_POST.montant == null}} - {{:assign montant_credit=null}} + {{if $montant_affecte == 0}} + {{:assign saved_credit=null}} + {{else}} + {{:assign saved_credit=$reste}} + {{/if}} {{else}} - {{:assign montant_credit=$_POST.montant|floatval}} - {{:assign montant_credit="%f*100"|math:$montant_credit}} + {{:assign montant_credit=$_POST.montant|money_int}} {{if $montant_credit > $reste}} {{:assign reste_nb="%f"|math:$reste|money_currency:false}} {{:error message="Le montant de l'avoir ne peut être supérieur au reste (%s)"|args:$reste_nb}} {{/if}} + {{if $montant_credit == $credit_line.amount}} + {{:assign saved_credit=null}} + {{else}} + {{:assign saved_credit=$montant_credit}} + {{/if}} {{/if}} {{* chercher les liaisons de l'écriture d'immobilisation *}} @@ -108,7 +117,7 @@ type="immo_link" immo_doc_id=$_GET.immo_doc_id|intval credit_line_id=$_GET.credit_line_id|intval - amount=$montant_credit|intval + amount=$saved_credit }} {{:redirect force="details_immo.html?immo_doc_id=%s&ok=1&msg=attach_immo"|args:$_GET.immo_doc_id}} @@ -143,7 +152,7 @@
- {{:input type="money" name="montant" label="Montant" help="Montant de l'avoir ; à renseigner uniquement si différent du montant de l'écriture"}} + {{:input type="money" name="montant" label="Montant" default=$reste help="Montant de l'avoir"}}

From 401aac686b78043f3cd30c0e404e8e44ea0f68dd Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Thu, 30 Apr 2026 11:54:30 +0200 Subject: [PATCH 10/11] Correction erreur saisie montant --- add_infos.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/add_infos.html b/add_infos.html index 1739c81..a8beee0 100644 --- a/add_infos.html +++ b/add_infos.html @@ -85,7 +85,7 @@ {{/if}} {{else}} {{:assign montant=$_POST.montant|money_int}} - {{if $montant == $reste}} + {{if $montant == $ligne_immo.montant}} {{:assign montant=null}} {{/if}} {{/if}} @@ -186,7 +186,7 @@ {{:input type="date" name="date_achat" label="Date d'acquisition" help="à renseigner uniquement si différente de la date de l'écriture d'immobilisation"}} {{:input type="date" name="date_mes" label="Date de mise en service" help="à renseigner uniquement si différente de la date d'acquisition"}} {{:input type="text" name="libelle" label="Libellé" help="à renseigner uniquement si différent du libellé de l'écriture d'immobilisation"}} - {{:input type="money" name="montant" label="Montant de l'immobilisation" default=$reste}} + {{:input type="money" name="montant" label="Montant de l'immobilisation" required=true default=$reste}} From 62692ef550f7c49cb5f41d166f1b38c0e7cfcc58 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Thu, 30 Apr 2026 11:55:12 +0200 Subject: [PATCH 11/11] =?UTF-8?q?Am=C3=A9lioration=20pr=C3=A9sentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- amortization.html | 16 +++++++--------- attach_amort.html | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/amortization.html b/amortization.html index 710bb6d..926eb52 100644 --- a/amortization.html +++ b/amortization.html @@ -104,9 +104,9 @@ {{/select}} {{/load}} -{{if $_GET.type_immo == null || $_GET.type_immo != "amortized"}} +{{:assign autres_amortissements=false}} +{{if $valeur_residuelle > 0}} {{* Chercher des amortissements non rattachés à une immo *}} - {{:assign autres_amortissements=false}} {{#select line.id as amort_line_id, line.id_transaction AS amort_trans_id @@ -267,13 +267,11 @@

Aucun amortissement enregistré pour cette immobilisation

{{/if}} -{{if $_GET.type_immo == null || $_GET.type_immo != "amortized"}} - {{if $autres_amortissements}} -

- Il y a des écritures d'amortissement qui ne sont pas rattachées à une immobilisation !
- Utilisez le bouton « Rattacher un amortissement » pour les afficher ; vous pourrez choisir d'en attacher certaines à cette immobilisation. -

- {{/if}} +{{if $autres_amortissements}} +

+ Il y a des écritures d'amortissement qui ne sont pas rattachées à une immobilisation !
+ Utilisez le bouton « Rattacher un amortissement » pour les afficher ; vous pourrez choisir d'en attacher certaines à cette immobilisation. +

{{/if}} {{:form_errors}} {{:admin_footer}} diff --git a/attach_amort.html b/attach_amort.html index afffa20..f643f9a 100644 --- a/attach_amort.html +++ b/attach_amort.html @@ -158,7 +158,7 @@
- {{:input type="money" name="montant" label="Montant" default=$reste help="Montant de l'amortissement"}} + {{:input type="money" name="montant" label="Montant" default=$reste required=true help="Montant de l'amortissement"}}