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;
+ }
})();
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/upgrade.html b/_upgrade.html
similarity index 100%
rename from upgrade.html
rename to _upgrade.html
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 c230b98..8eab21f 100644
--- a/exit_step2.html
+++ b/exit_step2.html
@@ -43,6 +43,7 @@
{{* lister les amortissements liés à l'immobilisation *}}
{{:include file="./_get_amort_lines.html" immo_doc_id=$_GET.immo_doc_id keep="linked_amort, total_amort"}}
+{{:assign vnr="%d-%d"|math:$solde:$total_amort}}
{{* déterminer le compte d'amortissement en fonction du compte d'immobilisation *}}
{{:include
@@ -69,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
@@ -132,12 +132,12 @@
Montant des amortissements
{{$total_amort|money_currency_html:false|raw}}
Valeur nette résiduelle
- {{"%d-%d"|math:$solde:$total_amort|money_currency_html:false|raw}}
+ {{$vnr|money_currency_html:false|raw}}
{{/if}}
-{{if $free_amort_lines}}
+{{if $free_amort_lines && $vnr > 0}}