From 0160fef1c2cab3b3379e7c7c422238e61a639a68 Mon Sep 17 00:00:00 2001
From: Jean-Christophe Engel <lesanges@zaclys.net>
Date: Mon, 6 Jan 2025 15:14:29 +0100
Subject: [PATCH] =?UTF-8?q?S=C3=A9paration=20immobilisations=20achev=C3=A9?=
 =?UTF-8?q?es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _nav.html                     |   7 +-
 amortization.html             |  13 +++-
 immobilisations.html          |  40 +++++++---
 immobilisations_achevees.html | 141 ++++++++++++++++++++++++++++++++++
 index.html                    |   6 +-
 5 files changed, 191 insertions(+), 16 deletions(-)
 create mode 100644 immobilisations_achevees.html

diff --git a/_nav.html b/_nav.html
index 4c1d5a7..3287688 100644
--- a/_nav.html
+++ b/_nav.html
@@ -5,9 +5,10 @@
 	</ul>
 
 	{{if $current == 'index'}}
-		<ul class="sub">
-			<li {{if $subcurrent == 'amort'}}class="current"{{/if}}><a href="index.html?amort=1">Amortissables</a></li>
-			<li {{if $subcurrent == 'no_amort'}}class="current"{{/if}}><a href="index.html?amort=0">Non amortissables</a></li>
+	<ul class="sub">
+		<li {{if $subcurrent == 'amort'}}class="current"{{/if}}><a href="index.html?amort=1">Amortissables</a></li>
+		<li {{if $subcurrent == 'fini'}}class="current"{{/if}}><a href="index.html?amort=2">Terminées</a></li>
+		<li {{if $subcurrent == 'no_amort'}}class="current"{{/if}}><a href="index.html?amort=0">Non amortissables</a></li>
 		</ul>
 		{{if $subsubcurrent == 'amortization'}}
 			<ul class="sub">
diff --git a/amortization.html b/amortization.html
index 1a90d4f..181c52c 100644
--- a/amortization.html
+++ b/amortization.html
@@ -3,7 +3,14 @@
 {{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortissement"}}
 
 {{* barre de navigation *}}
-{{:include file="_nav.html" current="index" subcurrent="immobilisation" subsubcurrent="amortization"}}
+{{if $_GET.fini == null || $_GET.fini == 0}}
+	{{:assign subcurrent="amort"}}
+{{elseif $_GET.fini == 1}}
+	{{:assign subcurrent="fini"}}
+{{else}}
+	{{:assign subcurrent="no_amort"}}
+{{/if}}
+{{:include file="_nav.html" current="index" subcurrent="%s"|args:$subcurrent subsubcurrent="amortization"}}
 
 {{if $_GET.ok}}
 	{{if $_GET.msg|match:"attach"}}
@@ -224,6 +231,8 @@
 	</section>
 {{/if}}
 
+{{if $_GET.fini == null || $_GET.fini != 1}}
+
 {{* amortissement à exclure *}}
 {{:include
 	file="_amort_exclus.html"
@@ -305,6 +314,6 @@
 		</table>
 	</section>
 {{/if}}
-
+{{/if}}
 {{:form_errors}}
 {{:admin_footer}}
diff --git a/immobilisations.html b/immobilisations.html
index 7e098f8..87876bd 100644
--- a/immobilisations.html
+++ b/immobilisations.html
@@ -3,7 +3,7 @@
 {{* Liste des immobilisations amortissable ou à définir *}}
 
 <section class="immobilisation">
-	<h2 class="ruler">Liste des immobilisations</h2>
+	<h2 class="ruler">Immobilisations en cours</h2>
 
 	<table class="list">
 		<thead>
@@ -70,17 +70,37 @@
 				{{/if}}
 				{{* voir s'il existe des écritures d'amortissement associées *}}
 				{{#select
-					links.id_transaction,
-					links.id_related
-					FROM acc_transactions_links AS links
-					WHERE links.id_transaction = :trans_id OR links.id_related = :trans_id;
-					:trans_id=$trans_id
+					sum(l_amort.credit) as amort_amount,
+					CASE links.id_related = t_immo.id
+						WHEN true THEN links.id_transaction
+						WHEN false THEN links.id_related
+					END as amort_trans_id
+					FROM acc_transactions_lines as l_immo
+					INNER JOIN acc_transactions as t_immo on t_immo.id = l_immo.id_transaction
+					INNER JOIN acc_transactions_links as links
+					ON (
+						t_immo.id = links.id_transaction
+						OR
+						t_immo.id = links.id_related
+					)
+					INNER JOIN acc_transactions_lines as l_amort on amort_trans_id = l_amort.id_transaction
+					WHERE
+						l_immo.id = :line_id
+					AND
+						l_amort.credit <> 0;
+					:line_id = $immo_id|intval
 					}}
-					{{:assign exist_amort=true}}
-				{{else}}
-					{{:assign exist_amort=false}}
+					{{if $amort_amount == null}}
+						{{:assign exist_amort=false}}
+					{{else}}
+						{{:assign amort_amount=$amort_amount}}
+						{{:assign exist_amort=true}}
+					{{/if}}
 				{{/select}}
-				{{*:debug trans_id=$trans_id trans_label=$trans_label exist_amort=$exist_amort*}}
+				{{* immo amortie ? *}}
+				{{if $amort_amount >= $debit}}
+					{{:continue}}
+				{{/if}}
 			<tr>
 				<td class="num"><a href={{$trans_url}}>#{{$trans_id}}</a></td>
 				<td>{{$trans_date|date_short}}</td>
diff --git a/immobilisations_achevees.html b/immobilisations_achevees.html
new file mode 100644
index 0000000..8d58802
--- /dev/null
+++ b/immobilisations_achevees.html
@@ -0,0 +1,141 @@
+{{* -*- brindille -*- *}}
+
+{{* Liste des immobilisations totalement amorties *}}
+
+<section class="immobilisation">
+	<h2 class="ruler">Immobilisations amorties</h2>
+
+	<table class="list">
+		<thead>
+			<tr>
+				<th>N°</th>
+				<th>Date</th>
+				<th>Libellé</th>
+				<th>Montant</th>
+				<th>Durée</th>
+				<th>N° compte</th>
+				<th>Compte</th>
+				<th>Projet</th>
+				<th class="actions"></th>
+			</tr>
+		</thead>
+		<tbody>
+
+			{{* lister les immobilisations *}}
+			{{:read file="./defaut.json" assign="config_json"}}
+			{{:assign config_defaut=$config_json|json_decode}}
+			{{:assign var="prefix_array" value=$config_defaut.prefixes|keys}}
+			{{:assign quote="'"}}
+			{{:assign condition="("}}
+			{{#foreach from=$prefix_array item="code"}}
+				{{:assign condition=$condition|cat:" account.code LIKE "|cat:$quote|cat:$code|cat:"%"|cat:$quote|cat:" OR "}}
+			{{/foreach}}
+			{{:assign condition=$condition|cat:"0)"}}
+
+			{{#select
+				trans.id as trans_id,
+				trans.label as trans_label,
+				trans.date as trans_date,
+				line.id as immo_id,
+				account.id as account_id,
+				account.code as account_code,
+				account.label as account_label,
+				line.debit AS debit,
+				project.label as project_label,
+				trans.id_year as trans_id_year
+				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 acc_projects AS project ON line.id_project = project.id
+				WHERE !condition
+				ORDER BY trans.date DESC;
+				!condition=$condition
+			}}
+				{{: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 duration=null}}
+				{{#load type="immo" where="$$.line = :line_id" :line_id=$immo_id|intval}}
+					{{:assign duration=$duration}}
+					{{if $noamort}}
+						{{:assign amortissable="non"}}
+					{{else}}
+						{{:assign amortissable="oui"}}
+					{{/if}}
+				{{else}}
+					{{:assign amortissable="nsp"}}
+				{{/load}}
+				{{if $amortissable == "non"}}
+					{{:continue}}
+				{{/if}}
+				{{* voir s'il existe des écritures d'amortissement associées *}}
+				{{#select
+					sum(l_amort.credit) as amort_amount,
+					CASE links.id_related = t_immo.id
+						WHEN true THEN links.id_transaction
+						WHEN false THEN links.id_related
+					END as amort_trans_id
+					FROM acc_transactions_lines as l_immo
+					INNER JOIN acc_transactions as t_immo on t_immo.id = l_immo.id_transaction
+					INNER JOIN acc_transactions_links as links
+					ON (
+						t_immo.id = links.id_transaction
+						OR
+						t_immo.id = links.id_related
+					)
+					INNER JOIN acc_transactions_lines as l_amort on amort_trans_id = l_amort.id_transaction
+					WHERE
+						l_immo.id = :line_id
+					AND
+						l_amort.credit <> 0;
+					:line_id = $immo_id|intval
+					}}
+					{{if $amort_amount == null}}
+						{{:assign exist_amort=false}}
+					{{else}}
+						{{:assign amort_amount=$amort_amount}}
+						{{:assign exist_amort=true}}
+					{{/if}}
+				{{/select}}
+				{{* immo amortie ? *}}
+				{{if $amort_amount < $debit}}
+					{{:continue}}
+				{{/if}}
+			<tr>
+				<td class="num"><a href={{$trans_url}}>#{{$trans_id}}</a></td>
+				<td>{{$trans_date|date_short}}</td>
+				<td>{{$trans_label}}</td>
+				<td class="money">{{"%f"|math:$debit|money}}</td>
+				<td class="num">{{if $duration != null}}{{$duration}}{{/if}}</td>
+				<td><a href={{$compte_url}}>{{$account_code}}</a></td>
+				<td>{{$account_label}}</td>
+				<td>{{$project_label}}</td>
+				<td class="actions">
+					{{if $duration == null}}
+						{{:linkbutton
+						label="Ajouter infos"
+						href="add_infos.html?immo_id=%s&amort=1"|args:$immo_id
+						shape="help"
+						target="_dialog"
+						}}
+					{{else}}
+						{{if ! $exist_amort}}
+							{{:linkbutton
+							label="Modifier infos"
+							href="modif_infos.html?immo_id=%s&amort=1"|args:$immo_id
+							shape="help"
+							target="_dialog"
+							}}
+						{{/if}}
+						{{:linkbutton
+							label="Amortissements"
+							href="amortization.html?immo_id=%s&fini=1"|args:$immo_id
+							shape="table"
+						}}
+					{{/if}}
+				</td>
+			</tr>
+			{{/select}}
+		</tbody>
+	</table>
+</section>
diff --git a/index.html b/index.html
index e89cb2b..ad7a86d 100644
--- a/index.html
+++ b/index.html
@@ -2,8 +2,10 @@
 {{:admin_header title="Gestion des amortissements" custom_css=$custom_css current="module_amortissement"}}
 
 {{* barre de navigation *}}
-{{if $_GET.amort == null || $_GET.amort}}
+{{if $_GET.amort == null || $_GET.amort == 1}}
 	{{:assign amort="amort"}}
+{{elseif $_GET.amort == 2}}
+	{{:assign amort="fini"}}
 {{else}}
 	{{:assign amort="no_amort"}}
 {{/if}}
@@ -37,6 +39,8 @@
 
 {{if $amort == "amort"}}
 	{{:include file="./immobilisations.html"}}
+{{elseif $amort == "fini"}}
+	{{:include file="./immobilisations_achevees.html"}}
 {{else}}
 	{{:include file="./immobilisations_non.html"}}
 {{/if}}