From 77fa5f353ab5924ae8767228c2d25cfcde05a092 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 17 Jun 2026 11:25:42 +0200 Subject: [PATCH 1/5] Ajout suppression doc orphelins (attach_amort, save_amort) --- attach_amort.html | 8 +++++++- save_amort.html | 27 +++++++++------------------ 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/attach_amort.html b/attach_amort.html index 738a3c0..61a5a1a 100644 --- a/attach_amort.html +++ b/attach_amort.html @@ -93,6 +93,12 @@ {{:error message="Le montant de l'amortissement (%s) dépasse la valeur résiduelle de l'immobilisation (%s)"|args:$ma:$vnc}} {{/if}} + {{* + supprimer les documents qui pointent sur une ligne d'amortissement absente + cas de la suppression manuelle d'un amortissement + *}} + {{:include file="_remove_orphan_docs.tpl"}} + {{* Lier l'écriture d'amortissement à l'écriture d'immobilisation *}} {{:include file="_common_attach.html" immo_doc_id=$_GET.immo_doc_id trans_id=$amort_line.trans_id}} @@ -114,7 +120,7 @@ }} {{/load}} - {{* À VÉRIFIER immo soldée ? *}} + {{* immo soldée ? *}} {{if $total_amort == $montant_immo}} {{:assign status="amortized"}} {{:save diff --git a/save_amort.html b/save_amort.html index 224d52e..9705bf9 100644 --- a/save_amort.html +++ b/save_amort.html @@ -148,6 +148,12 @@ {{:error message="Le montant indiqué « %s » dépasse le solde à amortir « %s »"|args:$montant:$solde}} {{/if}} + {{* + supprimer les documents qui pointent sur une ligne d'amortissement absente + cas de la suppression manuelle d'un amortissement + *}} + {{:include file="_remove_orphan_docs.tpl"}} + {{* enregistrer l'écriture *}} {{:assign var="lines." @@ -161,7 +167,6 @@ account=$credit_account|keys|value:0 id_project=$ligne_immo.id_project }} - {{:api method="POST" path="accounting/transaction" @@ -178,20 +183,6 @@ {{* enregistrer la liaison des lignes *}} {{#foreach from=$result.lines item="line"}} {{if $line.account_code == $credit_account|keys|value:0}} - {{* TODO VOIR SI CORRECT ET UTILE *}} - {{* - vérifier la présence d'un doc avec cette ligne d'amortissement - (cas de la suppression manuelle d'un amortissement) - *}} - - {{#load type="amort_link" where="$$.amort_line_id = :amort_line_id" :amort_line_id=$line.id debug=true assign="info_amort"}} - {{:debug info_amort=$info_amort}} - {{:assign uuid=$key}} - {{:break}} - {{else}} - {{:assign uuid=""|uuid}} - {{/load}} -{{:debug uuid=$uuid}} {{:save key=""|uuid type="amort_link" @@ -205,14 +196,14 @@ {{* immo soldée ? *}} {{if $_POST.montant|trim|money_int == $solde}} - {{:assign var="info_immo.status" value="amortized"}} + {{:assign status="amortized"}} {{:save key=$info_immo.key - status=$info_immo.status + status=$status }} {{/if}} - {{:redirect force="amortization.html?immo_doc_id=%s&type_immo=%s&ok=1&msg=amortissement"|args:$_GET.immo_doc_id:$info_immo.status}} + {{:redirect force="amortization.html?immo_doc_id=%s&type_immo=%s&ok=1&msg=amortissement"|args:$_GET.immo_doc_id:$status}} {{/form}} {{:admin_header title="Ajout amortissement" custom_css="./style.css" current="module_amortization"}} From 74707a38c225c07807ce4582a4ef743f1577cafa Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 17 Jun 2026 13:40:09 +0200 Subject: [PATCH 2/5] =?UTF-8?q?S=C3=A9curisation=20contre=20fausse=20manip?= =?UTF-8?q?e=20lors=20du=20classement=20immo=20sortie=20du=20bilan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- add_infos.html | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/add_infos.html b/add_infos.html index 8b16f09..3d2182f 100644 --- a/add_infos.html +++ b/add_infos.html @@ -53,14 +53,22 @@ {{:assign date_mes=null}} {{:assign status="ignored"}} {{elseif $_POST.classify == "archived"}} + {{* voir s'il y a déjà un doc associé à cette immo *}} + {{#load type="immo" where="$$.line = :immo_line_id" :immo_line_id=$_GET.immo_line_id|intval}} + {{:assign uuid=$key}} + {{:assign immo_doc_id=$id}} + {{else}} + {{:assign uuid=""|uuid}} + {{/load}} + {{* immobilisation sortie du bilan *}} {{:save - key=""|uuid + key=$uuid validate_schema="asset.schema.json" type="immo" line=$_GET.immo_line_id|intval duration=0 - status="managed" + status=null assign_new_id="immo_doc_id" }} {{:redirect force="exit_step1.html?immo_doc_id=%s"|args:$immo_doc_id}} From 024d003696e8b956fd6b4906fd6014a8bbe5b080 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 17 Jun 2026 13:41:55 +0200 Subject: [PATCH 3/5] =?UTF-8?q?Am=C3=A9lioration=20navigation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- add_infos.html | 2 +- exit_step1.html | 9 +++++++-- exit_step2.html | 11 ++++++++--- exit_step3.html | 13 +++++++++---- exit_step4.html | 9 +++++++-- 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/add_infos.html b/add_infos.html index 3d2182f..7487634 100644 --- a/add_infos.html +++ b/add_infos.html @@ -71,7 +71,7 @@ status=null assign_new_id="immo_doc_id" }} - {{:redirect force="exit_step1.html?immo_doc_id=%s"|args:$immo_doc_id}} + {{:redirect force="exit_step1.html?immo_doc_id=%s&from=exit"|args:$immo_doc_id}} {{else}} {{* immobilisation amortissable *}} {{if $_POST.date_achat|parse_date > $ligne_immo.date_achat}} diff --git a/exit_step1.html b/exit_step1.html index 0b85eb9..1154fcb 100644 --- a/exit_step1.html +++ b/exit_step1.html @@ -123,7 +123,12 @@ {{/select}} {{:admin_header title="Immobilisation sortie du bilan" custom_css="./style.css" current="module_amortization"}} -{{:include file="_nav.html" current="archived" subcurrent="exit"}} +{{if $_GET.from == "exit"}} + {{:assign current="other"}} +{{else}} + {{:assign current="archived"}} +{{/if}} +{{:include file="_nav.html" current=$current subcurrent="exit"}} {{if $_GET.ok}} {{if $_GET.msg|match:"attach_avoir"}} @@ -233,7 +238,7 @@ {{/if}} -
+

{{:button type="submit" name="proceed" label="Poursuivre" shape="right" class="main"}}

diff --git a/exit_step2.html b/exit_step2.html index ee740ff..8235a02 100644 --- a/exit_step2.html +++ b/exit_step2.html @@ -13,11 +13,11 @@ {{/if}} {{#form on="backward"}} - {{:redirect to="exit_step1.html?immo_doc_id=%s"|args:$_GET.immo_doc_id}} + {{:redirect to="exit_step1.html?immo_doc_id=%s&from=%s"|args:$_GET.immo_doc_id:$_GET.from}} {{/form}} {{#form on="forward"}} - {{:redirect to="exit_step3.html?immo_doc_id=%s"|args:$_GET.immo_doc_id}} + {{:redirect to="exit_step3.html?immo_doc_id=%s&from=%s"|args:$_GET.immo_doc_id:$_GET.from}} {{/form}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} @@ -90,7 +90,12 @@ {{/select}} {{:admin_header title="Immobilisation sortie du bilan" custom_css="./style.css" current="module_amortization"}} -{{:include file="_nav.html" current="archived" subcurrent="exit"}} +{{if $_GET.from == "exit"}} + {{:assign current="other"}} +{{else}} + {{:assign current="archived"}} +{{/if}} +{{:include file="_nav.html" current=$current subcurrent="exit"}} {{if $_GET.ok}} {{if $_GET.msg|match:"attach_amort"}} diff --git a/exit_step3.html b/exit_step3.html index 458357c..fca3fec 100644 --- a/exit_step3.html +++ b/exit_step3.html @@ -13,11 +13,11 @@ {{/if}} {{#form on="backward"}} - {{:redirect to="exit_step2.html?immo_doc_id=%s"|args:$_GET.immo_doc_id}} + {{:redirect to="exit_step2.html?immo_doc_id=%s&from=%s"|args:$_GET.immo_doc_id:$_GET.from}} {{/form}} {{#form on="forward"}} - {{:redirect to="exit_step4.html?immo_doc_id=%s"|args:$_GET.immo_doc_id}} + {{:redirect to="exit_step4.html?immo_doc_id=%s&from=%s"|args:$_GET.immo_doc_id:$_GET.from}} {{/form}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} @@ -58,7 +58,7 @@ assign="line" }} {{* voir si l'écriture de cession est déjà liée à une immo *}} - {{* TODO VOIR SI TUTILE + {{* TODO VOIR SI UTILE {{#load type="cession_link" where="$$.cession_line_id = :cession_line_id" :cession_line_id = $line.line_id @@ -95,7 +95,12 @@ {{*:debug linked_cessions=$linked_cessions free_cessions=$free_cessions total_cession=$total_cession*}} {{:admin_header title="Immobilisation sortie du bilan" custom_css="./style.css" current="module_amortization"}} -{{:include file="_nav.html" current="archived" subcurrent="exit"}} +{{if $_GET.from == "exit"}} + {{:assign current="other"}} +{{else}} + {{:assign current="archived"}} +{{/if}} +{{:include file="_nav.html" current=$current subcurrent="exit"}} {{if $_GET.ok}} {{if $_GET.msg|match:"attach_cession"}} diff --git a/exit_step4.html b/exit_step4.html index 8a2b51e..f377496 100644 --- a/exit_step4.html +++ b/exit_step4.html @@ -13,7 +13,7 @@ {{/if}} {{#form on="backward"}} - {{:redirect to="exit_step3.html?immo_doc_id=%s"|args:$_GET.immo_doc_id}} + {{:redirect to="exit_step3.html?immo_doc_id=%s&from=%s"|args:$_GET.immo_doc_id:$_GET.from}} {{/form}} {{#form on="validate"}} @@ -164,7 +164,12 @@ {{/select}} {{:admin_header title="Immobilisation sortie du bilan" custom_css="./style.css" current="module_amortization"}} -{{:include file="_nav.html" current="archived" subcurrent="exit"}} +{{if $_GET.from == "exit"}} + {{:assign current="other"}} +{{else}} + {{:assign current="archived"}} +{{/if}} +{{:include file="_nav.html" current=$current subcurrent="exit"}} {{if $_GET.ok}} {{if $_GET.msg|match:"attach_exit"}} From 6ebfbe244ecd9078bb94430d95bf26fb3ef7f98a Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 17 Jun 2026 13:42:22 +0200 Subject: [PATCH 4/5] Correction erreur marquage immo amortie --- attach_amort.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attach_amort.html b/attach_amort.html index 61a5a1a..a6d05bb 100644 --- a/attach_amort.html +++ b/attach_amort.html @@ -121,7 +121,7 @@ {{/load}} {{* immo soldée ? *}} - {{if $total_amort == $montant_immo}} + {{if $total_amort == $montant_immo && $_GET.from != "exit"}} {{:assign status="amortized"}} {{:save key=$info_immo.key From 32cb9e3b6b6aaeb24fe9c2552829db7589905b9d Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 17 Jun 2026 13:44:41 +0200 Subject: [PATCH 5/5] =?UTF-8?q?Inversion=20ordre=20tri=20immos=20=C3=A0=20?= =?UTF-8?q?classer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _immobilisations_autres.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 0401feb..7a4b04c 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -86,7 +86,7 @@ !table_join WHERE !condition GROUP BY immo_line_id - ORDER BY trans.date DESC; + ORDER BY trans.date; !columns=$columns !table_join=$table_join !table=$module.table