From 420b91265ce16c1c13d0ee2fcc306c0a711bd3aa Mon Sep 17 00:00:00 2001
From: Jean-Christophe Engel <lesanges@zaclys.net>
Date: Wed, 10 Jun 2026 10:46:10 +0200
Subject: [PATCH] =?UTF-8?q?Ajout=20info=20cr=C3=A9ation=20nouvelle=20immob?=
 =?UTF-8?q?ilisation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 add_asset.html                   | 19 ++++++++-----------
 add_infos.html                   |  4 ++--
 schema.json => asset.schema.json |  5 +++++
 ignore.html                      |  2 +-
 modify_infos.html                |  2 +-
 transfer.html                    |  2 +-
 6 files changed, 18 insertions(+), 16 deletions(-)
 rename schema.json => asset.schema.json (85%)

diff --git a/add_asset.html b/add_asset.html
index 97eeeb6..6dce231 100644
--- a/add_asset.html
+++ b/add_asset.html
@@ -93,12 +93,7 @@
 		{{/if}}
 	{{/foreach}}
 
-	{{if $status != "unfinished" && ! $_POST.amortir}}
-		{{* ne pas amortir *}}
-		{{:assign duration=0}}
-		{{:assign date_debut=$_POST.date_achat|parse_date}}
-		{{:assign status="ignored"}}
-	{{elseif $status != "unfinished"}}
+	{{if $status != "unfinished"}}
 		{{* vérifier que la date d'acquisition est antérieure à la date de mise en service *}}
 		{{:assign date_debut=$_POST.date_mes|or:$_POST.date_achat|parse_date}}
 		{{if $date_debut|strtotime < $_POST.date_achat|parse_date|strtotime}}
@@ -111,7 +106,7 @@
 		{{if $_POST.date_mes == null ||  $_POST.date_mes == $_POST.date_achat}}
 			{{:assign date_mes=null}}
 		{{else}}
-			{{:assign date_mes=$_POST.date_mes|date_short}}
+			{{:assign date_mes=$_POST.date_mes|parse_date}}
 		{{/if}}
 	{{/if}}
 
@@ -142,18 +137,19 @@
 		{{* enregistrer les infos de l'immobilisation *}}
 		{{:save
 			key=$key
-			validate_schema="schema.json"
+			validate_schema="asset.schema.json"
 			type="immo"
 			line=$immo_line_id
 			duration=$duration
 			date_mes=$date_mes
 			status=$status
+			created=true
 		}}
 	{{/if}}
 
 	{{if $status == "unfinished"}}
 		{{:assign type_immo="unfinished"}}
-	{{elseif $_POST.amortir}}
+	{{elseif $status == "managed"}}
 		{{:assign type_immo="managed"}}
 	{{else}}
 		{{:assign type_immo="other"}}
@@ -206,8 +202,9 @@
 				name="credit_account"
 				label="Compte de décaissement"
 				required=true
-				target="!acc/charts/accounts/selector.php?types=%s&id_year=%d"|args:"1|2|3|4":$selected_year
+				target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:"512*|530*|404*":$selected_year
 			}}
+{{*				target="!acc/charts/accounts/selector.php?types=%s&id_year=%d"|args:"1|2|3|4":$selected_year*}}
 			{{:input
 				type="list"
 				name="debit_account"
@@ -226,7 +223,7 @@
 	<fieldset>
 		<legend>Amortissement</legend>
 		<dl>
-			{{:input id="amortir" type="checkbox" value=1 name="amortir" label="Amortir cette immobilisation sur une ou plusieurs années" checked="checked" help="Dé-cocher pour ne pas amortir"}}
+			{{*:input id="amortir" type="checkbox" value=1 name="amortir" label="Amortir cette immobilisation sur une ou plusieurs années" checked="checked" help="Dé-cocher pour ne pas amortir"*}}
 			<div id="div_amort">
 				{{:input type="number" name="duree" label="Durée d'amortissement" required=true min=0 default=1 suffix="année(s)"}}
 				{{:input type="date" name="date_mes" label="Date de mise en service" help="C'est la date de première utilisation ; à renseigner uniquement si différente de la date d'acquisition"}}
diff --git a/add_infos.html b/add_infos.html
index d78097c..699888f 100644
--- a/add_infos.html
+++ b/add_infos.html
@@ -56,7 +56,7 @@
 		{{* immobilisation sortie du bilan *}}
 		{{:save
 			key=""|uuid
-			validate_schema="schema.json"
+			validate_schema="asset.schema.json"
 			type="immo"
 			line=$_GET.immo_line_id|intval
 			duration=0
@@ -129,7 +129,7 @@
 	{{/if}}
 	{{:save
 		key=$key
-		validate_schema="schema.json"
+		validate_schema="asset.schema.json"
 		type="immo"
 		line=$_GET.immo_line_id|intval
 		duration=$duration
diff --git a/schema.json b/asset.schema.json
similarity index 85%
rename from schema.json
rename to asset.schema.json
index 23a924b..4391dd5 100644
--- a/schema.json
+++ b/asset.schema.json
@@ -1,5 +1,6 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
+	"description": "Donnée d'une immobilisation",
 	"type": "object",
 	"properties": {
 		"type": {
@@ -35,6 +36,10 @@
 		"status" : {
 			"type" : ["string", "null"],
 			"enum" : ["managed", "amortized", "archived", "ignored"]
+		},
+		"created" : {
+			"description" : "vrai si immobilisation créée dans le module",
+			"type" : ["boolean", "null"]
 		}
 	},
 	"required": ["type", "line", "duration", "status"]
diff --git a/ignore.html b/ignore.html
index 96254fd..4c1b760 100644
--- a/ignore.html
+++ b/ignore.html
@@ -30,7 +30,7 @@
 		{{:assign status="ignored"}}
 		{{:save
 			key=""|uuid
-			validate_schema="schema.json"
+			validate_schema="asset.schema.json"
 			type="immo"
 			line=$_GET.immo_line_id|intval
 			duration=$duration
diff --git a/modify_infos.html b/modify_infos.html
index 1b6d615..2486f45 100644
--- a/modify_infos.html
+++ b/modify_infos.html
@@ -151,7 +151,7 @@
 	{{* enregistrer les infos de l'immobilisation *}}
 	{{:save
 		key=$info_immo.key
-		validate_schema="schema.json"
+		validate_schema="asset.schema.json"
 		type="immo"
 		line=$info_immo.line
 		duration=$duration
diff --git a/transfer.html b/transfer.html
index cb6643c..1cbce9c 100644
--- a/transfer.html
+++ b/transfer.html
@@ -175,7 +175,7 @@
 	{{* enregistrer les infos de l'immobilisation *}}
 	{{:save
 		key=""|uuid
-		validate_schema="schema.json"
+		validate_schema="asset.schema.json"
 		type="immo"
 		line=$immo_line_id
 		duration=$duration