From 2b6ac366ec1dbbbb25b8898170e8a47eb54efc7e Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 8 Jul 2026 16:36:43 +0200 Subject: [PATCH] =?UTF-8?q?Ne=20pas=20lister=20amortissements=20ant=C3=A9r?= =?UTF-8?q?ieurs=20mise=20en=20service=20immo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _get_free_amort.html | 6 +++--- amortization.html | 6 +++++- other_amortizations.html | 9 +++++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/_get_free_amort.html b/_get_free_amort.html index 8a2649b..b3b142f 100644 --- a/_get_free_amort.html +++ b/_get_free_amort.html @@ -2,7 +2,7 @@ {{* lister les amortissement non rattachés à une immo - @param filter_condition + @param condition *}} {{#select line.id as line_id, @@ -18,9 +18,9 @@ FROM acc_transactions_lines AS line INNER JOIN acc_accounts AS account ON account.id = line.id_account INNER JOIN acc_transactions AS trans ON trans.id = line.id_transaction - WHERE credit > 0 AND (NOT trans.status & 16) AND !filter_condition + WHERE credit > 0 AND (NOT trans.status & 16) AND !condition ORDER BY trans.date, trans.label; - !filter_condition=$filter_condition + !condition=$condition assign="amort_line" }} {{* voir s'il existe des lignes d'immo liées à cette ligne d'amortissement *}} diff --git a/amortization.html b/amortization.html index 81d0cfc..cafea18 100644 --- a/amortization.html +++ b/amortization.html @@ -39,7 +39,11 @@ {{* lister les amortissements non attachés à une immo *}} {{:assign account_filter="28%"|quote_sql}} {{:assign filter_condition="account.code LIKE "|cat:$account_filter}} - {{:include file="./_get_free_amort.html" filter_condition=$filter_condition keep="free_amort_lines"}} + + {{:assign date_amort=$date_debut|quote_sql}} + {{:assign date_condition="trans.date >= "|cat:$date_amort}} + {{:assign condition=$date_condition|cat:" AND "|cat:$filter_condition}} + {{:include file="./_get_free_amort.html" condition=$condition keep="free_amort_lines"}} {{/if}} {{:admin_header title="Détails de l'immobilisation" custom_css="./style.css" current="module_amortization"}} diff --git a/other_amortizations.html b/other_amortizations.html index f9dd9cb..4c53fb2 100644 --- a/other_amortizations.html +++ b/other_amortizations.html @@ -29,14 +29,19 @@ keep="code_amort" }} {{if $_GET.filter}} - {{:assign filter_condition="account.code = "|cat:$code_amort}} + {{:assign amort_account=$code_amort|quote_sql}} + {{:assign filter_condition="account.code = "|cat:$amort_account}} {{else}} {{:assign account_filter="28%"|quote_sql}} {{:assign filter_condition="account.code LIKE "|cat:$account_filter}} {{/if}} +{{:assign date_amort=$date_mes|quote_sql}} +{{:assign date_condition="trans.date >= "|cat:$date_amort}} +{{:assign condition=$date_condition|cat:" AND "|cat:$filter_condition}} + {{* lister les amortissements non rattachés à une immo *}} -{{:include file="./_get_free_amort.html" filter_condition=$filter_condition keep="free_amort_lines"}} +{{:include file="./_get_free_amort.html" condition=$condition keep="free_amort_lines"}} {{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortization"}}