From 579ae55434e08db5f80b744c42cbf9558946242f Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Tue, 20 Oct 2026 12:17:15 +0200 Subject: [PATCH 1/4] =?UTF-8?q?Suppression=20#=20devant=20num=C3=A9ro=20?= =?UTF-8?q?=C3=A9criture?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _archives.html | 2 +- _immobilisations.html | 2 +- _immobilisations_autres.html | 8 ++++---- _unfinished.html | 4 ++-- add_infos.html | 2 +- amortization.html | 6 +++--- attach_amort.html | 2 +- attach_credit.html | 2 +- exit_step1.html | 4 ++-- exit_step2.html | 4 ++-- exit_step3.html | 4 ++-- exit_step4.html | 4 ++-- ignore.html | 2 +- link_immo.html | 4 ++-- list_cessions.html | 4 ++-- list_exit.html | 4 ++-- modify_infos.html | 2 +- module.ini | 2 +- other_amortizations.html | 4 ++-- scripts.js | 2 +- 20 files changed, 34 insertions(+), 34 deletions(-) diff --git a/_archives.html b/_archives.html index b53260c..88984ad 100644 --- a/_archives.html +++ b/_archives.html @@ -148,7 +148,7 @@ {{:assign label_immo=$label_immo|cat:" — "|cat:$line_label}} {{/if}} - #{{$trans_id}} + {{$trans_id}} {{$date_mes|date_short}} {{$exit_date|date_short}} {{$label_immo}} diff --git a/_immobilisations.html b/_immobilisations.html index cc0fc76..e6f1575 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -122,7 +122,7 @@ {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$montant_immo}} - #{{$immo_trans_id}} + {{$immo_trans_id}} {{$immo_date|date_short}} {{$label_immo}} {{$montant_immo|money_html:false|raw}} diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index d80acee..7e43c0c 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -21,7 +21,7 @@ {{else}} {{:assign unhide=1}} {{/if}} - {{:assign var="user_hides.unhide_other" value=$unhide"}} + {{: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}} @@ -29,7 +29,7 @@ {{:assign checked="checked"}} {{/if}} -{{* vérifier l'existence de la table du module *}} +{{* 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"}} @@ -42,7 +42,7 @@ {{* lister les immobilisations non prises en charge par le module - ou dont le montant n'a pas été totalement affecté + ou dont le montant n'a pas été totalement affecté' *}} {{:assign account_condition="("}} {{#foreach from=$module.config.prefixes item="code"}} @@ -137,7 +137,7 @@ {{: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_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}} diff --git a/_unfinished.html b/_unfinished.html index 4c12d4d..3c9a1c4 100644 --- a/_unfinished.html +++ b/_unfinished.html @@ -21,7 +21,7 @@ {{else}} {{:assign unhide=1}} {{/if}} - {{:assign var="user_hides.unhide_unfinished" value=$unhide"}} + {{:assign var="user_hides.unhide_unfinished" value=$unhide}} {{:assign var="saved_hides.%s"|args:$logged_user.id value=$user_hides}} {{:save key="config" hides=$saved_hides}} {{/if}} @@ -177,7 +177,7 @@ {{: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}} diff --git a/add_infos.html b/add_infos.html index 9a45878..d2a4874 100644 --- a/add_infos.html +++ b/add_infos.html @@ -178,7 +178,7 @@
Immobilisation
- #{{$ligne_immo.immo_trans_id}} {{$immo_label}} + {{$ligne_immo.immo_trans_id}} {{$immo_label}}
Montant
{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}
diff --git a/amortization.html b/amortization.html index 35af614..3d6011a 100644 --- a/amortization.html +++ b/amortization.html @@ -140,7 +140,7 @@
Immobilisation
-
#{{$ligne_immo.trans_id}} {{$label_immo}}
+
{{$ligne_immo.trans_id}} {{$label_immo}}
Compte d'immobilisation
{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}
Début d'amortissement
@@ -200,7 +200,7 @@ {{#foreach from=$linked_immos item="line"}} {{:assign url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.trans_id}} - #{{$line.trans_id}} + {{$line.trans_id}} {{$line.date|date_short}} {{$line.label}} {{"%f"|math:$line.amount|money_currency_html:false|raw}} @@ -260,7 +260,7 @@ {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.year}} {{:assign solde="%f-%d"|math:$solde:$line.amount}} - #{{$line.trans_id}} + {{$line.trans_id}} {{$line.date|date_short}} {{$line.trans_label}} diff --git a/attach_amort.html b/attach_amort.html index c03821b..09cc06c 100644 --- a/attach_amort.html +++ b/attach_amort.html @@ -149,7 +149,7 @@
Immobilisation
{{$label_immo}}
Amortissement
-
#{{$amort_line.trans_id}} {{$amort_label}}
+
{{$amort_line.trans_id}} {{$amort_label}}
Montant de l'écriture d'amortissement
{{$amort_line.amount|money_currency_html:false|raw}}
{{if $montant_affecte > 0}} diff --git a/attach_credit.html b/attach_credit.html index 59cc802..1a5e3a4 100644 --- a/attach_credit.html +++ b/attach_credit.html @@ -125,7 +125,7 @@
Immobilisation
{{$label_immo}}
Écriture au crédit du compte d'immobilisation
-
#{{$credit_line.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}}
+
{{$credit_line.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é
diff --git a/exit_step1.html b/exit_step1.html index f47333e..fc517e0 100644 --- a/exit_step1.html +++ b/exit_step1.html @@ -152,7 +152,7 @@
Immobilisation
-
#{{$ligne_immo.trans_id}} {{$label_immo}}
+
{{$ligne_immo.trans_id}} {{$label_immo}}
Compte d'immobilisation
{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}
Montant de l'immobilisation
@@ -199,7 +199,7 @@ {{:assign url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.trans_id}} {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.year}} - #{{$line.trans_id}} + {{$line.trans_id}} {{$line.date|date_short}} {{$line.label}} {{"%f"|math:$line.amount|money_currency_html:false|raw}} diff --git a/exit_step2.html b/exit_step2.html index 8eab21f..59cd9ff 100644 --- a/exit_step2.html +++ b/exit_step2.html @@ -117,7 +117,7 @@
Immobilisation
-
#{{$ligne_immo.trans_id}} {{$label_immo}}
+
{{$ligne_immo.trans_id}} {{$label_immo}}
Compte d'immobilisation
{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}
Montant de l'immobilisation
@@ -167,7 +167,7 @@ {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.trans_id}} {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.year}} - #{{$line.trans_id}} + {{$line.trans_id}} {{$line.date|date_short}} {{if $line.line_label != null}} diff --git a/exit_step3.html b/exit_step3.html index e77a5f7..55cba28 100644 --- a/exit_step3.html +++ b/exit_step3.html @@ -124,7 +124,7 @@
Immobilisation
-
#{{$ligne_immo.trans_id}} {{$label_immo}}
+
{{$ligne_immo.trans_id}} {{$label_immo}}
Compte d'immobilisation
{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}
Montant de l'immobilisation
@@ -178,7 +178,7 @@ {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.trans_id}} {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.year}} - #{{$line.trans_id}} + {{$line.trans_id}} {{$line.date|date_short}} {{if $line.line_label != null}} diff --git a/exit_step4.html b/exit_step4.html index 26c5f71..8910f10 100644 --- a/exit_step4.html +++ b/exit_step4.html @@ -247,7 +247,7 @@
Immobilisation
-
#{{$ligne_immo.trans_id}} {{$label_immo}}
+
{{$ligne_immo.trans_id}} {{$label_immo}}
Compte d'immobilisation
{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}
Montant de l'immobilisation
@@ -332,7 +332,7 @@ - #{{$exit_line.trans_id}} + {{$exit_line.trans_id}} {{$exit_line.date|date_short}} {{if $exit_line.line_label != null}} diff --git a/ignore.html b/ignore.html index a721759..9dc3577 100644 --- a/ignore.html +++ b/ignore.html @@ -63,7 +63,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/link_immo.html b/link_immo.html index 8f43243..cb8d6cc 100644 --- a/link_immo.html +++ b/link_immo.html @@ -122,7 +122,7 @@
Immobilisation
-
#{{$ligne_immo.trans_id}} {{$label_immo}}
+
{{$ligne_immo.trans_id}} {{$label_immo}}
Montant
{{"%f"|math:$ligne_immo.amount|money_currency_html:false|raw}}
Date de l'immobilisation
@@ -148,7 +148,7 @@ {{: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}} - #{{$line.credit_trans_id}} + {{$line.credit_trans_id}} {{$line.trans_date|date_short}} {{"%f"|math:$line.credit_amount|money_html:false|raw}} {{$line.trans_label}} diff --git a/list_cessions.html b/list_cessions.html index 65a910d..7649e1c 100644 --- a/list_cessions.html +++ b/list_cessions.html @@ -77,7 +77,7 @@
Immobilisation
-
#{{$ligne_immo.trans_id}} {{$label_immo}}
+
{{$ligne_immo.trans_id}} {{$label_immo}}
Montant
{{"%f"|math:$ligne_immo.amount|money_currency_html:false|raw}}
Date de l'immobilisation
@@ -105,7 +105,7 @@ {{:assign cession_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.trans_id}} {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.year}} - #{{$line.trans_id}} + {{$line.trans_id}} {{$line.date|date_short}} {{if $line.line_label != null}} diff --git a/list_exit.html b/list_exit.html index 1d60ea5..a156311 100644 --- a/list_exit.html +++ b/list_exit.html @@ -75,7 +75,7 @@
Immobilisation
-
#{{$ligne_immo.trans_id}} {{$label_immo}}
+
{{$ligne_immo.trans_id}} {{$label_immo}}
Montant
{{"%f"|math:$ligne_immo.amount|money_currency_html:false|raw}}
Date de l'immobilisation
@@ -102,7 +102,7 @@ {{:assign exit_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.trans_id}} {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.year}} - #{{$line.trans_id}} + {{$line.trans_id}} {{$line.date|date_short}} {{$line.trans_label}} {{if $line.line_label != null && $line.line_label != $line.trans_label}} — {{$line.line_label}}{{/if}} diff --git a/modify_infos.html b/modify_infos.html index c65194a..2e056e5 100644 --- a/modify_infos.html +++ b/modify_infos.html @@ -129,7 +129,7 @@
Immobilisation
-
#{{$ligne_immo.trans_id}} {{$immo_label}}
+
{{$ligne_immo.trans_id}} {{$immo_label}}
Compte d'immobilisation
{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}
Montant
diff --git a/module.ini b/module.ini index d6cad20..94f3d90 100644 --- a/module.ini +++ b/module.ini @@ -1,5 +1,5 @@ name="Amortissements" -description="Immobilisations et amortissements\nversion 0.41.3" +description="Immobilisations et amortissements\nversion 0.41.4" author="Jean-Christophe Engel" author_url="https://gitea.zaclys.com/lesanges" home_button=false diff --git a/other_amortizations.html b/other_amortizations.html index e3d8f9e..f43cbf1 100644 --- a/other_amortizations.html +++ b/other_amortizations.html @@ -76,7 +76,7 @@
Immobilisation
-
#{{$ligne_immo.trans_id}} {{$label_immo}}
+
{{$ligne_immo.trans_id}} {{$label_immo}}
Montant
{{"%f"|math:$montant_immo|money_currency_html:false|raw}}
Début d'amortissement
@@ -102,7 +102,7 @@ {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.trans_id}} {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.year}} - #{{$line.trans_id}} + {{$line.trans_id}} {{$line.trans_date|date_short}} {{if $line.line_label != null}} diff --git a/scripts.js b/scripts.js index 3def0ba..1585e53 100644 --- a/scripts.js +++ b/scripts.js @@ -249,7 +249,7 @@ function computeTotal(id_total, id_url) { total[code] = getNumber(money.innerText) * 100; } total_general += getNumber(money.innerText) * 100; - const number = line.querySelector('.num a').innerText.slice(1); + const number = line.querySelector('.num a').innerText; transactions.push(number); } } From d54887a18d66d24619016d63e0295502eff01260 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 21 Oct 2026 13:49:29 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Correction=20incoh=C3=A9rence=20calcul=20mo?= =?UTF-8?q?ntant=20amortissement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- save_amort.html | 2 +- scripts.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/save_amort.html b/save_amort.html index 43cc871..97a6e93 100644 --- a/save_amort.html +++ b/save_amort.html @@ -229,7 +229,7 @@ {{:assign var=date_amort value=$years.0.end_date}} {{:include file="_calcul_dates.html" date_debut=$date_debut date_fin=$date_amort keep="nbjours"}} {{* montant de l'amortissement *}} - {{:assign montant_amort="%f/%f/365*%d"|math:$ligne_immo.amount:$info_immo.duration:$nbjours|intval}} + {{:assign montant_amort="round(%f/%f/365*%d,2)"|math:$ligne_immo.amount:$info_immo.duration:$nbjours|intval}} {{:assign montant_amort="min(%f, %d-%d)"|math:$montant_amort:$ligne_immo.amount:$total_amort}} {{/if}} diff --git a/scripts.js b/scripts.js index 1585e53..644ae39 100644 --- a/scripts.js +++ b/scripts.js @@ -93,7 +93,7 @@ function getNumber(text) { // @param date de fin // @result montant de l'amortissement function computeAmort(montant_immo, duree_immo, somme_amort, date_debut, date_fin) { - const nbjours = 1 + (date_fin - date_debut) / (60*60*24); + const nbjours = Math.round(1 + Math.abs((date_fin - date_debut)) / (60*60*24)); return Math.round(Math.min(montant_immo / duree_immo / 365 * nbjours, montant_immo - somme_amort)); } @@ -131,7 +131,7 @@ function displayAmort(id_immo, id_duree, id_amort, id_years, id_exercices, id_mo const somme_amort = Number(document.getElementById(id_amort).value); const montant_amort = computeAmort(montant_immo, duree_immo, somme_amort, date_debut, date_fin); case_montant.value = montant_amort/100; - case_montant.innerText = montant_amort; + case_montant.innerText = montant_amort/100; } function setSelectorYear(button_names, f_years_selector) From a9b061f79504f5eaaa6810432ca7236072d6369b Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Thu, 29 Oct 2026 10:01:28 +0100 Subject: [PATCH 3/4] =?UTF-8?q?Am=C3=A9lioration=20navigation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _nav.html | 2 +- add_asset.html | 2 +- index.html | 9 +++++---- module.ini | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/_nav.html b/_nav.html index f8b6023..5430e64 100644 --- a/_nav.html +++ b/_nav.html @@ -4,7 +4,7 @@ {{if $subcurrent == null}} {{if $current == "managed" || $current == "amortized" || $current == "archived"}} {{/if}} {{/if}} diff --git a/add_asset.html b/add_asset.html index 6473370..727d50d 100644 --- a/add_asset.html +++ b/add_asset.html @@ -151,7 +151,7 @@ {{* barre de navigation *}} {{if ! $dialog}} - {{:linkbutton href="index.html" label="Retour" shape="left"}} + {{:linkbutton href="index.html?type_immo=%s"|args:$_GET.from label="Retour" shape="left"}} {{/if}} {{:form_errors}} diff --git a/index.html b/index.html index 06ab7e4..aee4165 100644 --- a/index.html +++ b/index.html @@ -7,9 +7,7 @@ {{:assign type_immo=$_GET.type_immo}} {{/if}} -{{if $type_immo == "managed"}} - {{:admin_header title="Immobilisations en cours d'amortissement" custom_css="./style.css" current="module_amortization"}} -{{elseif $type_immo == "amortized"}} +{{if $type_immo == "amortized"}} {{:admin_header title="Immobilisations amorties" custom_css="./style.css" current="module_amortization"}} {{elseif $type_immo == "archived"}} {{:admin_header title="Immobilisations archivées" custom_css="./style.css" current="module_amortization"}} @@ -17,6 +15,9 @@ {{:admin_header title="Immobilisations à classer" custom_css="./style.css" current="module_amortization"}} {{elseif $type_immo == "unfinished"}} {{:admin_header title="Immobilisations en cours de constitution" custom_css="./style.css" current="module_amortization" subcurrent="unfinished"}} +{{else}} + {{:assign type_immo="managed"}} + {{:admin_header title="Immobilisations en cours d'amortissement" custom_css="./style.css" current="module_amortization"}} {{/if}} {{:include file="_nav.html" current=$type_immo}} @@ -46,7 +47,7 @@ {{:include file="_archives.html"}} {{elseif $type_immo == "unfinished"}} {{:include file="_unfinished.html"}} -{{elseif $type_immo == "managed" || $type_immo == "amortized"}} +{{else}} {{:include file="_immobilisations.html"}} {{/if}} {{:admin_footer}} diff --git a/module.ini b/module.ini index 73633af..07ac9b4 100644 --- a/module.ini +++ b/module.ini @@ -1,5 +1,5 @@ name="Amortissements" -description="Immobilisations et amortissements\nversion 0.42" +description="Immobilisations et amortissements\nversion 0.42.1" author="Jean-Christophe Engel" author_url="https://gitea.zaclys.com/lesanges" home_button=false From fb4bbaf6977f7f5d46075175b69453bf703e4636 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Fri, 30 Oct 2026 10:27:20 +0100 Subject: [PATCH 4/4] =?UTF-8?q?S=C3=A9curisation=20donn=C3=A9es=20POST?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- add_asset.html | 11 +++++++++++ add_infos.html | 6 ++++++ attach_credit.html | 2 +- balance_sheet_exit.html | 11 +++++++---- modify_infos.html | 12 ++++++++++++ module.ini | 2 +- save_amort.html | 3 +++ transfer.html | 6 ++++++ write_exit.html | 2 ++ 9 files changed, 49 insertions(+), 6 deletions(-) diff --git a/add_asset.html b/add_asset.html index 727d50d..a704dea 100644 --- a/add_asset.html +++ b/add_asset.html @@ -20,6 +20,12 @@ {{* Traiter l'envoi du formulaire *}} {{#form on="add"}} {{* vérifier que la date d'achat est située dans un l'exercice sélectionné *}} + {{if $_POST.date_achat|parse_date === false}} + {{:error message="Erreur : la date d'achat (%s) est invalide"|args:$_POST.date_achat}} + {{/if}} + {{if $_POST.date_mes|parse_date === false}} + {{:error message="Erreur : la date de mise en service (%s) est invalide"|args:$_POST.date_mes}} + {{/if}} {{:assign ts_date = $_POST.date_achat|parse_date|strtotime}} {{:assign ok=false}} {{#foreach from=$years}} @@ -93,7 +99,12 @@ {{:assign da=$_POST.date_achat|date_short}} {{:error message="Erreur : la date de mise en service (%s) ne peut être antérieure à la date d'acquisition (%s)"|args:$dd:$da}} {{/if}} + {{:assign duration=$_POST.duree|intval}} + {{if $duration <= 0}} + {{:error message="Erreur : la durée d'amortissement doit être strictement positive"}} + {{/if}} + {{:assign status="managed"}} {{if $_POST.date_mes == null || $_POST.date_mes == $_POST.date_achat}} {{:assign date_mes=null}} diff --git a/add_infos.html b/add_infos.html index d2a4874..cac3115 100644 --- a/add_infos.html +++ b/add_infos.html @@ -73,6 +73,12 @@ {{:redirect force="exit_step1.html?immo_doc_id=%s&from=exit"|args:$immo_doc_id}} {{else}} {{* immobilisation amortissable *}} + {{if $_POST.date_achat|parse_date === false}} + {{:error message="Erreur : la date d'achat (%s) est invalide"|args:$_POST.date_achat}} + {{/if}} + {{if $_POST.date_mes|parse_date === false}} + {{:error message="Erreur : la date de mise en service (%s) est invalide"|args:$_POST.date_mes}} + {{/if}} {{if $_POST.date_achat|parse_date > $ligne_immo.date_achat}} {{:assign da=$ligne_immo.date_achat|date_short}} {{:error message="Erreur : la date d'achat (%s) ne peut être postérieure à la date de l'écriture d'immobilisation (%s)"|args:$_POST.date_achat:$da}} diff --git a/attach_credit.html b/attach_credit.html index b1adb99..26ba567 100644 --- a/attach_credit.html +++ b/attach_credit.html @@ -61,7 +61,7 @@ {{* Traiter l'envoi du formulaire *}} {{#form on="save"}} - {{if $_POST.montant == null}} + {{if $_POST.montant == null || $_POST.montant == 0}} {{if $montant_affecte == 0}} {{:assign saved_credit=null}} {{:assign montant_credit=$credit_line.amount}} diff --git a/balance_sheet_exit.html b/balance_sheet_exit.html index 4043c5d..b6b4d5a 100644 --- a/balance_sheet_exit.html +++ b/balance_sheet_exit.html @@ -35,9 +35,6 @@ {{:assign amort_number=$linked_amort|count}} {{#foreach from=$linked_amort|ksort item="line"}} - {{if $first_amort_date == null}} - {{:assign first_amort_date=$line.date}} - {{/if}} {{if $last_amort_date == null}} {{:assign last_amort_date=$line.date}} {{elseif $line.date > $last_amort_date}} @@ -82,11 +79,15 @@ {{* Traiter l'envoi du formulaire *}} {{#form on="proceed"}} + {{* vérifier la validité de la date de sortie *}} {{if $_POST.date_sortie == null}} {{:error message="Vous devez renseigner la date de sortie"}} {{/if}} - {{* vérifier la validité de la date de sortie *}} + {{if $_POST.date_sortie|parse_date === false}} + {{:error message="Erreur : la date de sortie (%s) est invalide"|args:$_POST.date_sortie}} + {{/if}} + {{if $info_immo.date_mes != null}} {{if $_POST.date_sortie|parse_date < $info_immo.date_mes}} {{:assign immo_date=$info_immo.date_mes|date_short}} @@ -96,6 +97,7 @@ {{:assign immo_date=$ligne_immo.date_achat|date_short}} {{:error message="La date de sortie doit être postérieure à la date d'acquisition de l'immobilisation (%s)"|args:$immo_date}} {{/if}} + {{if $amort_number != 0 && $_POST.date_sortie|parse_date <= $last_amort_date}} {{:assign last_amort_date=$last_amort_date|date_short}} {{:error message="La date de sortie doit être postérieure à la date du dernier amortissement (%s)"|args:$last_amort_date}} @@ -103,6 +105,7 @@ {{:assign ts_exit = $_POST.date_sortie|parse_date|strtotime}} {{:assign exercice_ok=false}} + {{* vérifier que la date de sortie est dans l'exercice choisi *}} {{#foreach from=$years item="current_year"}} {{if $current_year.id == $_POST.id_year}} diff --git a/modify_infos.html b/modify_infos.html index 2e056e5..4830d7c 100644 --- a/modify_infos.html +++ b/modify_infos.html @@ -34,6 +34,18 @@ {{* traiter la saisie *}} {{#form on="save"}} + {{if $_POST.date_achat == null || $_POST.date_achat|parse_date == $ligne_immo.date_achat}} + {{:assign date_achat=null}} + {{else}} + {{:assign date_achat=$_POST.date_achat|parse_date}} + {{/if}} + + {{if $_POST.date_mes == null || $_POST.date_mes == $_POST.date_achat}} + {{:assign date_mes=null}} + {{else}} + {{:assign date_mes=$_POST.date_mes|parse_date}} + {{/if}} + {{if $_POST.date_achat|parse_date > $ligne_immo.date_achat}} {{:assign da=$ligne_immo.date_achat|date_short}} {{:error message="Erreur : la date d'achat (%s) ne peut être postérieure à la date de l'écriture d'immobilisation (%s)"|args:$_POST.date_achat:$da}} diff --git a/module.ini b/module.ini index 07ac9b4..515fdfd 100644 --- a/module.ini +++ b/module.ini @@ -1,5 +1,5 @@ name="Amortissements" -description="Immobilisations et amortissements\nversion 0.42.1" +description="Immobilisations et amortissements\nversion 0.42.2" author="Jean-Christophe Engel" author_url="https://gitea.zaclys.com/lesanges" home_button=false diff --git a/save_amort.html b/save_amort.html index 0226760..3e871a7 100644 --- a/save_amort.html +++ b/save_amort.html @@ -93,6 +93,9 @@ {{* Traiter l'envoi du formulaire *}} {{#form on="save"}} {{* vérifier que la date est située dans un exercice compatible *}} + {{if $_POST.date_amort|parse_date === false}} + {{:error message="Erreur : la date d'amortissement (%s) est invalide"|args:$_POST.date_amort}} + {{/if}} {{:assign ts_date = $_POST.date_amort|parse_date|strtotime}} {{:assign ok=false}} {{#foreach from=$years}} diff --git a/transfer.html b/transfer.html index 3017036..151d4e7 100644 --- a/transfer.html +++ b/transfer.html @@ -69,6 +69,9 @@ {{* Traiter l'envoi du formulaire *}} {{#form on="transfer"}} {{* vérifier que la date de mise en service est postérieure aux dates d'acquisition *}} + {{if $_POST.date_mes|parse_date === false}} + {{:error message="Erreur : la date de mise en service (%s) est invalide"|args:$_POST.date_mes}} + {{/if}} {{if $_POST.date_mes|parse_date < $max_date}} {{:assign dacq=$max_date|date_short}} {{:error message="La date de mise en service (%s) doit être postérieure à la date d'acquisition d'immobilisation la plus récente (%s) !"|args:$_POST.date_mes:$dacq}} @@ -96,6 +99,9 @@ {{:assign status="ignored"}} {{else}} {{:assign duration=$_POST.duree|intval}} + {{if $duration <= 0}} + {{:error message="Erreur : la durée d'amortissement doit être strictement positive"}} + {{/if}} {{:assign status="managed"}} {{/if}} diff --git a/write_exit.html b/write_exit.html index e9033d0..a62fb9c 100644 --- a/write_exit.html +++ b/write_exit.html @@ -320,6 +320,8 @@ :year_id = $_GET.year }} {{:assign chart_id=$id}} +{{else}} + {{:error message="Pas de plan comptable pour l'exercice %s"|args:$_GET.year}} {{/select}} {{#select