Masquer titre tableau si aucune immobilisation

_archives.html

@@ -25,24 +25,7 @@
 {{:assign filter_condition=$filter_condition|cat:"0)"}}
 {{:assign condition=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"|cat:$filter_condition}}
 
-<section class="immobilisation">
-	<table class="list">
-		<thead>
-			<tr>
-				<th>N°</th>
-				<th>Mise en service</th>
-				<th>Date sortie</th>
-				<th>Libellé</th>
-				<th class="nombre">Montant</th>
-				<th>N° compte</th>
-				<th>Compte</th>
-				<th class="actions"></th>
-			</tr>
-		</thead>
-		<tbody>
-
 {{:assign nb_immo=0}}
-		{{:assign total_immo = 0}}
 {{:assign total_cessions = 0}}
 
 {{#select
@@ -63,6 +46,7 @@
 	WHERE !condition
 	ORDER BY trans.date DESC;
 	!condition=$condition
+	assign="immo_line"
 }}
 
 	{{* voir si l'immo est prise en charge *}}
@@ -74,11 +58,11 @@
 	{{if $status != "archived"}}
 		{{:continue}}
 	{{/if}}
-			{{:assign date_mes=$info_immo.date_mes|or:$trans_date}}
+	{{:assign var="immo_line.date_mes" value=$info_immo.date_mes|or:$trans_date}}
-			{{:assign montant_immo=$debit}}
+	{{:assign var="immo_line.montant_immo" value=$debit}}
 
 	{{* chercher le doc de sortie du bilan *}}
-			{{:assign exit_date=null}}
+	{{:assign var="immo_line.exit_date" value=null}}
 	{{#load type="exit_link" where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id=$info_immo.id}}
 		{{:assign exit_line_id=$exit_line_id}}
 		{{#select
@@ -88,7 +72,7 @@
 			WHERE line.id = :exit_line_id;
 			:exit_line_id=$exit_line_id
 		}}
-					{{:assign exit_date=$date}}
+			{{:assign var="immo_line.exit_date" value=$date}}
 		{{/select}}
 	{{/load}}
 
@@ -109,7 +93,7 @@
 			{{:assign total_credits="%d+%d"|math:$total_credits:$amount}}
 		{{/if}}
 	{{/load}}
-			{{:assign solde_immo="%d-%d"|math:$montant_immo:$total_credits}}
+	{{:assign solde_immo="%d-%d"|math:$immo_line.montant_immo:$total_credits}}
 
 	{{if $solde_immo == 0}}
 		{{:assign status="archived"}}
@@ -119,12 +103,9 @@
 		{{:continue}}
 	{{/if}}
 
-			{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$trans_id}}
-			{{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}}
 	{{:assign nb_immo="%d+1"|math:$nb_immo}}
-			{{:assign total_immo="%d+%d"|math:$total_immo:$montant_immo}}
 	{{:assign var="montant" from="sommes_immo.%s"|args:$account_code}}
-			{{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$montant_immo}}
+	{{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$immo_line.montant_immo}}
 
 	{{* voir s'il y a une écriture de cession associée à cette immo *}}
 	{{#select
@@ -145,6 +126,31 @@
 		{{:assign var="montant_cessions.%d"|args:$account_code value="%d+%d"|math:$montant:$debit}}
 		{{:assign total_cessions="%d+%d"|math:$total_cessions:$debit}}
 	{{/select}}
+	{{:assign var="immo_lines." value=$immo_line}}
+{{/select}}
+
+{{if $immo_lines|count > 0}}
+	<section class="immobilisation">
+		<table class="list">
+			<thead>
+				<tr>
+					<th>N°</th>
+					<th>Mise en service</th>
+					<th>Date sortie</th>
+					<th>Libellé</th>
+					<th class="nombre">Montant</th>
+					<th>N° compte</th>
+					<th>Compte</th>
+					<th class="actions"></th>
+				</tr>
+			</thead>
+			<tbody>
+
+				{{:assign total_immo = 0}}
+				{{#foreach from=$immo_lines}}
+					{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$trans_id}}
+					{{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}}
+					{{:assign total_immo="%d+%d"|math:$total_immo:$montant_immo}}
 
 					<tr>
 						<td class="num"><a href="{{$trans_url}}">#{{$trans_id}}</a></td>
@@ -158,7 +164,7 @@
 							{{:linkbutton label="Modifier" href="exit_step1.html?immo_doc_id=%s&from=exit"|args:$info_immo.id shape="edit"}}
 						</td>
 					</tr>
-		{{/select}}
+				{{/foreach}}
 			</tbody>
 			<tfoot>
 				{{if $total_immo != 0}}
@@ -217,7 +223,7 @@
 				{{/if}}
 			</tfoot>
 		</table>
-	{{if $nb_immo == 0}}
+	</section>
+{{else}}
 	<p class="block alert">Aucune immobilisation</p>
 {{/if}}
-</section>

_immobilisations.html

@@ -16,22 +16,6 @@
 </p>
 
 {{if $module.table != null}}
-	<table class="list">
-		<thead>
-			<tr>
-				<th class="num">N°</th>
-				<th>Date</th>
-				<th>Libellé</th>
-				<th class="nombre">Montant</th>
-				<th class="nombre">Durée</th>
-				<th class="nombre">Amortissements</th>
-				<th class="nombre">Valeur nette</th>
-				<th>N° compte</th>
-				<th class="actions"></th>
-			</tr>
-		</thead>
-		<tbody>
-
 	{{* lister les immobilisations *}}
 	{{:assign account_condition="("}}
 	{{#foreach from=$module.config.prefixes item="code"}}
@@ -42,8 +26,6 @@
 	{{:assign status_condition="($$.status = 'managed' OR $$.status = 'amortized')"}}
 	{{:assign condition=$account_condition|cat:" AND line.debit > 0 AND "|cat:$status_condition}}
 
-			{{:assign nb_immo=0}}
-			{{:assign total_immo = 0}}
 	{{#select
 		trans.id as immo_trans_id,
 		trans.label as trans_label,
@@ -70,19 +52,9 @@
 		ORDER BY COALESCE(doc_date_achat, trans_date) DESC;
 		!table=$module.table
 		!condition=$condition
+		assign="immo_line"
 	}}
-				{{if $status != "managed" && $status != "amortized"}}
-					{{:continue}}
-				{{/if}}
-				{{: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 montant_immo=$doc_amount|or:$debit}}
-				{{:assign immo_date = $doc_date_achat|or:$trans_date}}
-				{{:assign label_immo=$doc_label|or:$trans_label}}
-				{{if $label_immo|strpos:$line_label === false}}
-					{{:assign label_immo=$label_immo|cat:" — "|cat:$line_label}}
-				{{/if}}
-
 		{{* déduire le montant des écritures liées à l'immo courante au crédit du même compte *}}
 		{{#load
 			type="credit_link"
@@ -102,6 +74,8 @@
 		{{if $montant_immo == 0}}
 			{{* Immobilisation soldée *}}
 			{{:continue}}
+		{{else}}
+			{{:assign var="immo_line.montant_immo" value=$montant_immo}}
 		{{/if}}
 
 		{{* montant des amortissements liés à l'immobilisation *}}
@@ -111,11 +85,42 @@
 		{{* classement par onglet *}}
 		{{if $type_immo == "managed" && $amort_amount >= $montant_immo}}{{:continue}}{{/if}}
 		{{if $type_immo == "amortized" && $amort_amount < $montant_immo}}{{:continue}}{{/if}}
+		{{:assign var="immo_line.amort_amount" value=$amort_amount}}
+
+		{{:assign var="immo_lines." value=$immo_line}}
+	{{/select}}
+
+	{{if $immo_lines|count > 0}}
+		<table class="list">
+			<thead>
+				<tr>
+					<th class="num">N°</th>
+					<th>Date</th>
+					<th>Libellé</th>
+					<th class="nombre">Montant</th>
+					<th class="nombre">Durée</th>
+					<th class="nombre">Amortissements</th>
+					<th class="nombre">Valeur nette</th>
+					<th>N° compte</th>
+					<th class="actions"></th>
+				</tr>
+			</thead>
+			<tbody>
+
+				{{:assign total_immo = 0}}
+				{{#foreach from=$immo_lines}}
+					{{: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 immo_date = $doc_date_achat|or:$trans_date}}
+					{{:assign label_immo=$doc_label|or:$trans_label}}
+					{{if $label_immo|strpos:$line_label === false}}
+						{{:assign label_immo=$label_immo|cat:" — "|cat:$line_label}}
+					{{/if}}
 
-				{{:assign nb_immo="%d+1"|math:$nb_immo}}
 					{{:assign total_immo="%d+%d"|math:$total_immo:$montant_immo}}
 					{{:assign var="montant" from="sommes_immo.%s"|args:$account_code}}
 					{{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$montant_immo}}
+
 					<tr>
 						<td class="num"><a href="{{$trans_url}}">#{{$immo_trans_id}}</a></td>
 						<td>{{$immo_date|date_short}}</td>
@@ -132,7 +137,9 @@
 							}}
 						</td>
 					</tr>
-			{{/select}}
+
+				{{/foreach}}
+
 			</tbody>
 			<tfoot>
 				{{if $total_immo != 0}}
@@ -167,6 +174,7 @@
 			</tfoot>
 		</table>
 	{{/if}}
-{{if $nb_immo == 0 || $module.table == null}}
+{{/if}}
+{{if $immo_lines|count == 0 || $module.table == null}}
 	<p class="block alert">Aucune immobilisation</p>
 {{/if}}