_immobilisations.html

@@ -38,16 +38,14 @@
 			{{/foreach}}
 			{{:assign account_condition=$account_condition|cat:"0)"}}
 
-			{{:assign filter_condition=" NOT ("}}
+			{{:assign filter_condition=" AND NOT ("}}
 			{{#foreach from=$module.config.filters item="filter"}}
 				{{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}}
 				{{:assign filter_condition=$filter_condition|cat:" trans_label LIKE "|cat:$filter|cat:" OR "}}
 			{{/foreach}}
 			{{:assign filter_condition=$filter_condition|cat:"0)"}}
-			{{:assign filter_condition="($$.status IS NULL AND NOT (trans.status & 16) AND "|cat:$filter_condition|cat:")"}}
-			{{:assign doc_condition="($$.status <> 'ignored' AND $$.status <> 'archived')"}}
 
-			{{:assign condition=$account_condition|cat:" AND debit > 0 AND ("|cat:$filter_condition|cat:" OR "|cat:$doc_condition|cat:")"}}
+			{{:assign condition=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"|cat:$filter_condition}}
 			{{:assign nb_immo=0}}
 			{{:assign total_immo = 0}}
 			{{#select
@@ -59,25 +57,30 @@
 				line.label AS line_label,
 				account.id as account_id,
 				account.code as account_code,
-				trans.id_year as trans_id_year,
+				trans.id_year as trans_id_year
-				$$.duration as duration,
-				$$.status as status
 				FROM acc_transactions AS trans
 				INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id
 				INNER JOIN acc_accounts AS account ON line.id_account = account.id
 				INNER JOIN acc_years AS years ON trans.id_year = years.id
-				LEFT JOIN !table AS info ON $$.line = line.id
 				WHERE !condition
 				ORDER BY trans.date DESC;
-				!table=$module.table
 				!condition=$condition
 			}}
 				{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$immo_trans_id}}
 				{{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}}
-				{{:assign duration=$duration}}
+				{{:assign duration=null}}
 				{{:assign montant_immo=$debit}}
-				{{if $status == null}}
+
+				{{* voir si l'immo est prise en charge *}}
+				{{#load type="immo" where="$$.line = :line_id" :line_id=$immo_line_id|intval}}
+					{{:assign duration=$duration}}
+					{{:assign status=$status}}
+				{{else}}
+					{{:assign amortissable="nsp"}}
 					{{:assign status="unknown"}}
+				{{/load}}
+				{{if $status == "ignored"}}
+					{{:continue}}
 				{{/if}}
 
 				{{* chercher des écritures liées à l'immo courante au crédit du même compte
@@ -101,6 +104,9 @@
 					{{:assign montant_immo="%d-%d"|math:$montant_immo:$credit}}
 				{{/select}}
 				{{if $montant_immo == 0}}
+					{{:assign status="archived"}}
+				{{/if}}
+				{{if $status == "archived"}}
 					{{:continue}}
 				{{/if}}
 
@@ -124,9 +130,10 @@
 					assign="amort_lines."
 				}}
 				{{/select}}
+
 				{{:assign amort_amount=0}}
 				{{#foreach from=$amort_lines item="elem"}}
-					{{* voir s'il existe un doc associé à l'écriture d'amortissement *}}
+					{{* voir s'il existe un doc associé *}}
 					{{#load type="link"
 						where="$$.immo_line_id = :immo_line_id AND $$.amort_trans_id = :amort_trans_id"
 						:immo_line_id = $immo_line_id
@@ -150,8 +157,9 @@
 
 				{{* classement par onglet *}}
 				{{if $type_immo == "managed" && $amort_amount >= $montant_immo}}{{:continue}}{{/if}}
+				{{if $type_immo == "managed" && $status == "amortized"}}{{:continue}}{{/if}}
 				{{if $status == "unknown" && ! $exist_amort}}{{:continue}}{{/if}}
-				{{if $type_immo == "amortized" && $amort_amount < $montant_immo}}{{:continue}}{{/if}}	{{* ?? *}}
+				{{if $type_immo == "amortized" && $amort_amount < $montant_immo && $status != "amortized"}}{{:continue}}{{/if}}
 
 				{{:assign nb_immo="%d+1"|math:$nb_immo}}
 				{{:assign total_immo="%d+%d"|math:$total_immo:$montant_immo}}

_immobilisations_autres.html

@@ -30,7 +30,7 @@
 
 	<form method="post" action="">
 		<fieldset>
-			{{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher toutes les écritures" }}
+			{{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher les écritures marquées ignorées" }}
 		</fieldset>
 	</form>
 
@@ -58,6 +58,8 @@
 			{{:assign condition=$condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"}}
 
 			{{if $unhide ==  null}}
+				{{*:assign condition=$condition|cat:" AND NOT (trans.status & 16)"*}}
+
 				{{:assign filter_condition=" NOT ("}}
 				{{#foreach from=$module.config.filters item="filter"}}
 					{{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}}

_unfinished.html

@@ -55,7 +55,7 @@
 			</div>
 		</fieldset>
 		<fieldset>
-			{{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher toutes les écritures" }}
+			{{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher les écritures marquées ignorées" }}
 		</fieldset>
 	</form>
 

other_amortizations.html

@@ -8,8 +8,7 @@
 
 {{* récupérer les infos de l'immobilisation *}}
 {{#select
-	trans.label as label,
+	trans.label as label
-	line.label as line_label
 	FROM acc_transactions_lines AS line
 	INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id
 	WHERE line.id = :line_id;
@@ -21,17 +20,12 @@
 {{/select}}
 
 {{:include file="_get_config.html" keep="module.config"}}
-
+{{:assign filter_condition=" NOT ("}}
-{{if $_POST.unhide == null}}
+{{#foreach from=$module.config.filters item="filter"}}
-	{{:assign filter_condition=" NOT ("}}
+	{{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}}
-	{{#foreach from=$module.config.filters item="filter"}}
+	{{:assign filter_condition=$filter_condition|cat:" trans.label LIKE "|cat:$filter|cat:" OR "}}
-		{{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}}
+{{/foreach}}
-		{{:assign filter_condition=$filter_condition|cat:" trans.label LIKE "|cat:$filter|cat:" OR "}}
+{{:assign filter_condition=$filter_condition|cat:"0)"}}
-	{{/foreach}}
-	{{:assign filter_condition=$filter_condition|cat:"0)"}}
-{{else}}
-	{{:assign filter_condition="1"}}
-{{/if}}
 
 {{* lister les écritures d'amortissement *}}
 {{#select
@@ -110,19 +104,9 @@
 }}
 {{/if}}
 
-{{if $_POST.unhide != null}}
-	{{:assign checked="checked"}}
-{{/if}}
-
-<form method="post" action="">
-	<fieldset>
-		{{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher toutes les écritures" }}
-	</fieldset>
-</form>
-
 {{if $autres_amortissements != null}}
 	<section class="amortissement">
-		<h3 class="ruler">Immobilisation « {{$ligne_immo.label}}{{if $ligne_immo.line_label != null}} — {{$ligne_immo.line_label}}{{/if}} »</h3>
+		<h3 class="ruler">Immobilisation « {{$ligne_immo.label}} »</h3>
 		<table class="list">
 			<thead>
 				<tr>
@@ -159,15 +143,3 @@
 {{/if}}
 {{:form_errors}}
 {{:admin_footer}}
-
-<script type="text/javascript">
-function changeVisibility(evt, idcheck = 'f_unhide_1') {
-	this.form.dispatchEvent(new Event('submit'));
-	this.form.submit();
-}
-
-(function () {
-	document.getElementById('f_unhide_1').onclick = changeVisibility;
-})();
-
-</script>

save_amort.html

@@ -10,7 +10,6 @@
 	line.id_account as account_id,
 	line.debit as montant,
 	line.id_project as project_id,
-	line.label as line_label,
 	trans.id as trans_id,
 	trans.label,
 	trans.date,
@@ -28,9 +27,6 @@
 {{/select}}
 {{:assign date_debut=$ligne_immo.date}}
 {{:assign var="amort_label" value="Amortissement %s"|args:$ligne_immo.label}}
-{{if $ligne_immo.line_label != null}}
-	{{:assign amort_label=$amort_label|cat:" — "|cat:$ligne_immo.line_label}}
-{{/if}}
 
 {{#load type="immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}}
 	{{:assign duree=$duration}}
@@ -293,7 +289,7 @@
 		<dl>
 			{{:input type="select" default=$selected_year name="id_year" label="Exercice" required=true default_empty="— Faire un choix —" options=$open_years}}
 			{{:input type="date" name="date_amort" label="Date" required=true default=$date_amort|date_short}}
-			{{:input type="text" name="designation" label="Libellé" required=true default=$amort_label size="50"}}
+			{{:input type="text" name="designation" label="Libellé" required=true default=$amort_label}}
 			{{:input type="money" name="montant" label="Montant" required=true default=$montant_amort}}
 			{{:input
 				type="list"