Amélioration affichage libellé et correction oubli

_archives.html

@@ -89,7 +89,8 @@
 					WHEN true THEN links.id_transaction
 					WHEN false THEN links.id_related
 				END as other_id,
-				line.credit
+				line.credit,
+				MAX(trans2.date) as exit_date
 				FROM acc_transactions AS trans
 				INNER JOIN acc_transactions_links as links
 					ON (trans.id = links.id_transaction OR trans.id = links.id_related)
@@ -104,6 +105,7 @@
 				assign="credit_immo."
 			}}
 				{{:assign solde_immo="%d-%d"|math:$solde_immo:$credit}}
+				{{:assign exit_date=$exit_date}}
 			{{/select}}
 
 			{{if $solde_immo == 0}}
@@ -150,7 +152,7 @@
 				<td class="num"><a href={{$trans_url}}>#{{$trans_id}}</a></td>
 				<td>{{$trans_date|date_short}}</td>
 				<td>{{$exit_date|date_short}}</td>
-				<td>{{$trans_label}}{{if $line_label != null}} — {{$line_label}}{{/if}}</td>
+				<td>{{$trans_label}}{{if $line_label != null && $line_label != $trans_label}} — {{$line_label}}{{/if}}</td>
 				<td class="money">{{"%f"|math:$montant_immo|money_html:false|raw}}</td>
 				<td><a href={{$compte_url}}>{{$account_code}}</a></td>
 				<td>{{$account_label}}</td>