lesanges
/
amortization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correction erreur exercice sur 2 années civiles

This commit is contained in:
Jean-Christophe Engel 2024-03-15 20:53:59 +01:00
parent cc7ea1b54c
commit db26c7b2d6
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
amortization.html
View File

@ -43,7 +43,7 @@
trans.label as label, trans.label as label,
trans.date as date_achat, trans.date as date_achat,
y.id as year_id, 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 project.label as project_label
from acc_transactions_lines as line from acc_transactions_lines as line
inner join acc_transactions as trans on line.id_transaction = trans.id inner join acc_transactions as trans on line.id_transaction = trans.id
@ -59,8 +59,6 @@
{{:error message=$message}} {{:error message=$message}}
{{/select}} {{/select}}
{{*:debug ligne_immo=$ligne_immo*}}
{{* chercher des écritures d'amortissement liées à l'immobilisation *}} {{* chercher des écritures d'amortissement liées à l'immobilisation *}}
{{#select {{#select
l_amort.credit as amort_amount, l_amort.credit as amort_amount,
@ -100,8 +98,6 @@
{{:assign var="amort_years." value=$amort_year}} {{:assign var="amort_years." value=$amort_year}}
{{/select}} {{/select}}
{{*:debug linked_lines=$linked_lines amort_associes=$amort_associes*}}
{{* chercher parmi les associations *}} {{* chercher parmi les associations *}}
{{#foreach from=$info_immo.amort item="id_amort"}} {{#foreach from=$info_immo.amort item="id_amort"}}
{{#select {{#select
@ -138,7 +134,6 @@
{{/select}} {{/select}}
{{/foreach}} {{/foreach}}
{{*:debug linked_lines=$linked_lines*}}
{{* montant de l'annuité théorique *}} {{* montant de l'annuité théorique *}}
{{:assign montant="%f"|math:$ligne_immo.montant}} {{:assign montant="%f"|math:$ligne_immo.montant}}
{{:assign annuite="%f/%f"|math:$montant:$duree}} {{: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"}} {{: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 annuite_1="%f/360*%d"|math:$annuite:$nbjours|intval}}
{{*:assign date_amort=$date_fin*}}
{{:assign annuite_courante=$annuite_1}} {{:assign annuite_courante=$annuite_1}}
{{:assign current_year=$ligne_immo.year_id}} {{:assign current_year=$ligne_immo.year_id}}
{{:assign solde=$ligne_immo.montant}} {{:assign solde=$ligne_immo.montant}}

2
save_amort.html
View File

@ -59,7 +59,7 @@
{{#select {{#select
id, id,
label, 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; from acc_years where id=:id;
:id=$_GET.year assign=year :id=$_GET.year assign=year
}} }}