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

Merge branch 'main' into selector

Browse Source
This commit is contained in:
Jean-Christophe Engel 2025-01-20 17:27:16 +01:00
commit ad4b76695d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amortization.html
View File

@ -259,7 +259,7 @@
inner join acc_accounts as acc on acc.id = li.id_account inner join acc_accounts as acc on acc.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 where acc.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
}} }}

2
immobilisations.html
View File

@ -35,7 +35,7 @@
{{:assign condition=$condition|cat:" account.code LIKE "|cat:$quote|cat:$code|cat:"%"|cat:$quote|cat:" OR "}} {{:assign condition=$condition|cat:" account.code LIKE "|cat:$quote|cat:$code|cat:"%"|cat:$quote|cat:" OR "}}
{{/foreach}} {{/foreach}}
{{:assign condition=$condition|cat:"0)"}} {{:assign condition=$condition|cat:"0)"}}
{{:assign condition=$condition|cat:" AND debit > 0"}} {{:assign condition=$condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"}}
{{#select {{#select
trans.id as trans_id, trans.id as trans_id,