_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 "|cat:$filter_condition|cat:" AND "|cat:$status_condition}}
+	{{:assign condition=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16) AND NOT "|cat:$filter_condition|cat:" AND "|cat:$status_condition}}
 
 	{{:assign total_cessions = 0}}
 

_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 !condition
+	WHERE credit > 0 AND (NOT trans.status & 16) AND !condition
 	ORDER BY trans.date, trans.label;
 	!condition=$condition
 	assign="amort_line"

_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 "|cat:$doc_condition}}
+{{:assign condition=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16) AND "|cat:$doc_condition}}
 
 {{:assign nb_ignored=0}}
 {{#select
@@ -79,7 +79,7 @@
 	!condition=$condition
 	assign="immo_line"
 }}
-	{{if $immo_line.status == 'managed' || $immo_line.status == 'amortized'}}
+	{{if $immo_line.status == 'managed'}}
 		{{if $immo_line.amount == null || $immo_line.amount == 0 || $immo_line.amount == $immo_line.debit}}
 			{{:continue}}
 		{{/if}}
@@ -169,10 +169,7 @@ function changeVisibility(evt, idcheck = 'f_unhide_1') {
 }
 
 (function () {
-	let unhide_button = document.getElementById('f_unhide_1');
+	document.getElementById('f_unhide_1').onclick = changeVisibility;
-	if (unhide_button != null) {
-		unhide_button.onclick = changeVisibility;
-	}
 })();
 
 </script>

_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"}}
+{{:assign condition=$accounts_condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"}}
 
 {{:assign filter_condition=" NOT ("}}
 {{#foreach from=$module.config.filters item="filter"}}

exit_step1.html

@@ -102,6 +102,7 @@
 	WHERE
 	account.code = :code_amort
 	AND line.credit > 0
+	AND (NOT trans.status & 16)
 	AND trans.date >= :immo_date
 	;
 	:code_amort = $code_amort

exit_step2.html

@@ -43,7 +43,6 @@
 
 {{* 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
@@ -70,6 +69,7 @@
 	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 @@
 			<dt>Montant des amortissements</dt>
 			<dd>{{$total_amort|money_currency_html:false|raw}}</dd>
 			<dt>Valeur nette résiduelle</dt>
-			<dd>{{$vnr|money_currency_html:false|raw}}</dd>
+			<dd>{{"%d-%d"|math:$solde:$total_amort|money_currency_html:false|raw}}</dd>
 		{{/if}}
 	</dl>
 </div>
 
-{{if $free_amort_lines && $vnr > 0}}
+{{if $free_amort_lines}}
 	<nav class="actions">
 		{{:linkbutton
 		label="Attacher une écriture d'amortissement"

exit_step4.html

@@ -171,6 +171,7 @@
 	WHERE
 	account.code = :code_amort
 	AND line.credit > 0
+	AND (NOT trans.status & 16)
 	AND trans.date >= :immo_date
 	;
 	:code_amort = $code_amort

index.html

@@ -22,7 +22,7 @@
 
 {{* Mise à niveau *}}
 {{:assign module_version="0.41"}}
-{{:include file="_upgrade.html" module_version=$module_version}}
+{{:include file="upgrade.html" module_version=$module_version}}
 
 {{* supprimer les documents sans écriture associée *}}
 {{:include file="_remove_orphan_docs.tpl"}}

module.ini

@@ -1,5 +1,5 @@
 name="Amortissements"
-description="Immobilisations et amortissements\nversion 0.41.2"
+description="Immobilisations et amortissements\nversion 0.41"
 author="Jean-Christophe Engel"
 author_url="https://gitea.zaclys.com/lesanges"
 home_button=false