From 371d9dd0e30ad3ec12a30c855f65e876d9d21f2b Mon Sep 17 00:00:00 2001
From: Jean-Christophe Engel <lesanges@zaclys.net>
Date: Wed, 30 Sep 2026 10:49:46 +0200
Subject: [PATCH] =?UTF-8?q?Suppression=20condition=20s=C3=A9lection=20trop?=
 =?UTF-8?q?=20restrictive?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _archives.html               | 2 +-
 _get_free_amort.html         | 2 +-
 _immobilisations_autres.html | 9 ++++++---
 _unfinished.html             | 2 +-
 exit_step1.html              | 1 -
 exit_step2.html              | 1 -
 exit_step4.html              | 1 -
 module.ini                   | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/_archives.html b/_archives.html
index 7619bcb..b53260c 100644
--- a/_archives.html
+++ b/_archives.html
@@ -26,7 +26,7 @@
 		{{:assign filter_condition=$filter_condition|cat:" trans_label LIKE "|cat:$filter|cat:" OR "}}
 	{{/foreach}}
 	{{:assign filter_condition=$filter_condition|cat:"0)"}}
-	{{:assign condition=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16) AND NOT "|cat:$filter_condition|cat:" AND "|cat:$status_condition}}
+	{{:assign condition=$account_condition|cat:" AND debit > 0 AND NOT "|cat:$filter_condition|cat:" AND "|cat:$status_condition}}
 
 	{{:assign total_cessions = 0}}
 
diff --git a/_get_free_amort.html b/_get_free_amort.html
index b3b142f..e71ec16 100644
--- a/_get_free_amort.html
+++ b/_get_free_amort.html
@@ -18,7 +18,7 @@
 	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 !condition
+	WHERE credit > 0 AND !condition
 	ORDER BY trans.date, trans.label;
 	!condition=$condition
 	assign="amort_line"
diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html
index 0dca07d..d80acee 100644
--- a/_immobilisations_autres.html
+++ b/_immobilisations_autres.html
@@ -50,7 +50,7 @@
 	{{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}}
 {{/foreach}}
 {{:assign account_condition=$account_condition|cat:"0)"}}
-{{:assign condition=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16) AND "|cat:$doc_condition}}
+{{:assign condition=$account_condition|cat:" AND debit > 0 AND "|cat:$doc_condition}}
 
 {{:assign nb_ignored=0}}
 {{#select
@@ -79,7 +79,7 @@
 	!condition=$condition
 	assign="immo_line"
 }}
-	{{if $immo_line.status == 'managed'}}
+	{{if $immo_line.status == 'managed' || $immo_line.status == 'amortized'}}
 		{{if $immo_line.amount == null || $immo_line.amount == 0 || $immo_line.amount == $immo_line.debit}}
 			{{:continue}}
 		{{/if}}
@@ -169,7 +169,10 @@ function changeVisibility(evt, idcheck = 'f_unhide_1') {
 }
 
 (function () {
-	document.getElementById('f_unhide_1').onclick = changeVisibility;
+	let unhide_button = document.getElementById('f_unhide_1');
+	if (unhide_button != null) {
+		unhide_button.onclick = changeVisibility;
+	}
 })();
 
 </script>
diff --git a/_unfinished.html b/_unfinished.html
index 33eadde..4c12d4d 100644
--- a/_unfinished.html
+++ b/_unfinished.html
@@ -45,7 +45,7 @@
 	{{:assign accounts_condition=$accounts_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}}
 {{/foreach}}
 {{:assign accounts_condition=$accounts_condition|cat:"0)"}}
-{{:assign condition=$accounts_condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"}}
+{{:assign condition=$accounts_condition|cat:" AND debit > 0"}}
 
 {{:assign filter_condition=" NOT ("}}
 {{#foreach from=$module.config.filters item="filter"}}
diff --git a/exit_step1.html b/exit_step1.html
index 592eff4..f47333e 100644
--- a/exit_step1.html
+++ b/exit_step1.html
@@ -102,7 +102,6 @@
 	WHERE
 	account.code = :code_amort
 	AND line.credit > 0
-	AND (NOT trans.status & 16)
 	AND trans.date >= :immo_date
 	;
 	:code_amort = $code_amort
diff --git a/exit_step2.html b/exit_step2.html
index db8e04d..8eab21f 100644
--- a/exit_step2.html
+++ b/exit_step2.html
@@ -70,7 +70,6 @@
 	WHERE
 	account.code = :code_amort
 	AND line.credit > 0
-	AND (NOT trans.status & 16)
 	AND trans.date >= :immo_date
 	;
 	:code_amort = $code_amort
diff --git a/exit_step4.html b/exit_step4.html
index 457f57b..26c5f71 100644
--- a/exit_step4.html
+++ b/exit_step4.html
@@ -171,7 +171,6 @@
 	WHERE
 	account.code = :code_amort
 	AND line.credit > 0
-	AND (NOT trans.status & 16)
 	AND trans.date >= :immo_date
 	;
 	:code_amort = $code_amort
diff --git a/module.ini b/module.ini
index 068c7e2..f1d45ac 100644
--- a/module.ini
+++ b/module.ini
@@ -1,5 +1,5 @@
 name="Amortissements"
-description="Immobilisations et amortissements\nversion 0.41.1"
+description="Immobilisations et amortissements\nversion 0.41.2"
 author="Jean-Christophe Engel"
 author_url="https://gitea.zaclys.com/lesanges"
 home_button=false