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

correction erreur sélection écritures d'amortissement

Browse Source
This commit is contained in:
Jean-Christophe Engel 2025-01-31 12:23:30 +01:00
parent 4b63ad4560
commit f17ccd1bc8
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
amortization.html
View File

@ -41,11 +41,11 @@
y.id as year_id, y.id as year_id,
y.end_date 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
inner join acc_years as y on trans.id_year = y.id INNER JOIN acc_years AS y ON trans.id_year = y.id
left join acc_projects AS project ON line.id_project = project.id LEFT JOIN acc_projects AS project ON line.id_project = project.id
where line.id = :line_id; WHERE line.id = :line_id;
:line_id = $_GET.immo_id|intval :line_id = $_GET.immo_id|intval
assign=ligne_immo assign=ligne_immo
}} }}
@ -70,9 +70,9 @@
trans.date as amort_date, trans.date as amort_date,
trans.label as trans_label, trans.label as trans_label,
trans.id_year as amort_year, trans.id_year as amort_year,
acc.id as account_id, account.id as account_id,
acc.code as account_code, account.code as account_code,
acc.label as account_name account.label as account_name
FROM FROM
acc_transactions_lines as l_immo 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 as t_immo on t_immo.id = l_immo.id_transaction
@ -84,11 +84,13 @@
) )
INNER JOIN acc_transactions_lines as l_amort on amort_trans_id = l_amort.id_transaction 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_transactions as trans on l_amort.id_transaction = trans.id
INNER join acc_accounts as acc on l_amort.id_account = acc.id INNER join acc_accounts as account on l_amort.id_account = account.id
WHERE WHERE
l_immo.id = :line_id l_immo.id = :line_id
AND AND
l_amort.credit <> 0 l_amort.credit <> 0
AND
account.code LIKE '28%'
ORDER BY trans.date; ORDER BY trans.date;
:line_id = $_GET.immo_id|intval :line_id = $_GET.immo_id|intval
assign=linked_lines. assign=linked_lines.
@ -198,7 +200,7 @@
{{#foreach count="%d+1"|math:$nbamort key="num"}} {{#foreach count="%d+1"|math:$nbamort key="num"}}
{{:assign solde_prec=$solde}} {{:assign solde_prec=$solde}}
{{:assign solde="%f-%d"|math:$solde:$annuite_courante}} {{:assign solde="%f-%d"|math:$solde:$annuite_courante}}
{{#select id from acc_years where :amort_date >= start_date and :amort_date <= end_date and status == 0; :amort_date=$date_amort|parse_date}} {{#select id FROM acc_years WHERE :amort_date >= start_date AND :amort_date <= end_date AND status == 0; :amort_date=$date_amort|parse_date}}
{{:assign enregistrer=1}} {{:assign enregistrer=1}}
{{:assign current_year=$id}} {{:assign current_year=$id}}
{{else}} {{else}}
@ -246,22 +248,22 @@
li.label as l_label, li.label as l_label,
trans.date as t_date, trans.date as t_date,
trans.label as t_label, trans.label as t_label,
acc.code as a_code, account.code as a_code,
acc.label as a_label, account.label as a_label,
y.label as y_label y.label as y_label
from acc_transactions_lines as li FROM acc_transactions_lines AS li
inner join acc_accounts as acc on acc.id = li.id_account INNER JOIN acc_accounts AS account ON account.id = li.id_account
inner join acc_transactions as trans on trans.id = li.id_transaction INNER JOIN acc_transactions AS trans ON trans.id = li.id_transaction
inner join acc_years as y on y.id = trans.id_year INNER JOIN acc_years AS y ON y.id = trans.id_year
where acc.code like "28%" AND credit > 0 AND (NOT trans.status & 16) WHERE account.code LIKE "28%" AND credit > 0 AND (NOT trans.status & 16)
order by trans.date, trans.label; ORDER BY trans.date, trans.label;
assign=autre_amort assign=autre_amort
}} }}
{{#select {{#select
id_transaction, id_transaction,
id_related id_related
from acc_transactions_links FROM acc_transactions_links
where id_transaction = :id_amort or id_related = :id_amort; WHERE id_transaction = :id_amort OR id_related = :id_amort;
:id_amort=$t_id :id_amort=$t_id
}} }}
{{else}} {{else}}

5
immobilisations.html
View File

@ -90,10 +90,13 @@
t_immo.id = links.id_related 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_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 WHERE
l_immo.id = :line_id l_immo.id = :line_id
AND AND
l_amort.credit <> 0; l_amort.credit <> 0
AND
account.code LIKE '28%';
:line_id = $immo_id|intval :line_id = $immo_id|intval
}} }}
{{if $amort_amount == null}} {{if $amort_amount == null}}