From 3ef33e15e31b2d1dcd8414821875a7d929a331c9 Mon Sep 17 00:00:00 2001
From: Jean-Christophe Engel <lesanges@zaclys.net>
Date: Thu, 9 Jan 2025 18:51:49 +0100
Subject: [PATCH] =?UTF-8?q?am=C3=A9lioration=20classification=20immobilisa?=
 =?UTF-8?q?tions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 immobilisations.html          | 3 +++
 immobilisations_achevees.html | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/immobilisations.html b/immobilisations.html
index 5f93277..545afec 100644
--- a/immobilisations.html
+++ b/immobilisations.html
@@ -31,6 +31,7 @@
 				{{:assign condition=$condition|cat:" account.code LIKE "|cat:$quote|cat:$code|cat:"%"|cat:$quote|cat:" OR "}}
 			{{/foreach}}
 			{{:assign condition=$condition|cat:"0)"}}
+			{{:assign condition=$condition|cat:" AND debit > 0"}}
 
 			{{#select
 				trans.id as trans_id,
@@ -55,6 +56,7 @@
 				{{: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}}
+				{{* voir si l'immo est prise en charge *}}
 				{{#load type="immo" where="$$.line = :line_id" :line_id=$immo_id|intval}}
 					{{:assign duration=$duration}}
 					{{if $noamort}}
@@ -92,6 +94,7 @@
 					}}
 					{{if $amort_amount == null}}
 						{{:assign exist_amort=false}}
+						{{:assign amort_amount=0}}
 					{{else}}
 						{{:assign amort_amount=$amort_amount}}
 						{{:assign exist_amort=true}}
diff --git a/immobilisations_achevees.html b/immobilisations_achevees.html
index b079841..d0182b4 100644
--- a/immobilisations_achevees.html
+++ b/immobilisations_achevees.html
@@ -31,6 +31,7 @@
 				{{:assign condition=$condition|cat:" account.code LIKE "|cat:$quote|cat:$code|cat:"%"|cat:$quote|cat:" OR "}}
 			{{/foreach}}
 			{{:assign condition=$condition|cat:"0)"}}
+			{{:assign condition=$condition|cat:" AND debit > 0"}}
 
 			{{#select
 				trans.id as trans_id,
@@ -55,6 +56,7 @@
 				{{: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}}
+				{{* voir si l'immo est prise en charge *}}
 				{{#load type="immo" where="$$.line = :line_id" :line_id=$immo_id|intval}}
 					{{:assign duration=$duration}}
 					{{if $noamort}}
@@ -92,6 +94,7 @@
 					}}
 					{{if $amort_amount == null}}
 						{{:assign exist_amort=false}}
+						{{:assign amort_amount=0}}
 					{{else}}
 						{{:assign amort_amount=$amort_amount}}
 						{{:assign exist_amort=true}}