From db26c7b2d6572e9bc576187ee66a9725015cb45f Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Fri, 15 Mar 2024 20:53:59 +0100 Subject: [PATCH] =?UTF-8?q?Correction=20erreur=20exercice=20sur=202=20ann?= =?UTF-8?q?=C3=A9es=20civiles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- amortization.html | 8 +------- save_amort.html | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/amortization.html b/amortization.html index 9ea65da..b8bf32c 100644 --- a/amortization.html +++ b/amortization.html @@ -43,7 +43,7 @@ trans.label as label, trans.date as date_achat, y.id as year_id, - date(y.start_date, "start of year", "+1 year", "-1 day") as date_amort, + y.end_date as date_amort, project.label as project_label from acc_transactions_lines as line inner join acc_transactions as trans on line.id_transaction = trans.id @@ -59,8 +59,6 @@ {{:error message=$message}} {{/select}} -{{*:debug ligne_immo=$ligne_immo*}} - {{* chercher des écritures d'amortissement liées à l'immobilisation *}} {{#select l_amort.credit as amort_amount, @@ -100,8 +98,6 @@ {{:assign var="amort_years." value=$amort_year}} {{/select}} -{{*:debug linked_lines=$linked_lines amort_associes=$amort_associes*}} - {{* chercher parmi les associations *}} {{#foreach from=$info_immo.amort item="id_amort"}} {{#select @@ -138,7 +134,6 @@ {{/select}} {{/foreach}} -{{*:debug linked_lines=$linked_lines*}} {{* montant de l'annuité théorique *}} {{:assign montant="%f"|math:$ligne_immo.montant}} {{:assign annuite="%f/%f"|math:$montant:$duree}} @@ -149,7 +144,6 @@ {{:include file="_calcul_dates.html" date_debut=$date_achat date_fin=$date_amort keep="nbjours"}} {{:assign annuite_1="%f/360*%d"|math:$annuite:$nbjours|intval}} -{{*:assign date_amort=$date_fin*}} {{:assign annuite_courante=$annuite_1}} {{:assign current_year=$ligne_immo.year_id}} {{:assign solde=$ligne_immo.montant}} diff --git a/save_amort.html b/save_amort.html index 30adbec..6eb4d70 100644 --- a/save_amort.html +++ b/save_amort.html @@ -59,7 +59,7 @@ {{#select id, label, - date(start_date, "start of year", "+1 year", "-1 day") as date_amort + end_date as date_amort from acc_years where id=:id; :id=$_GET.year assign=year }}