diff --git a/add_infos.html b/add_infos.html
index a6c96ea..72ec2c1 100644
--- a/add_infos.html
+++ b/add_infos.html
@@ -73,6 +73,18 @@
 			{{:error message="Erreur : la date de mise en service (%s) ne peut être antérieure à la date d'acquisition (%s)"|args:$_POST.date_mes:$da}}
 		{{/if}}
 
+		{{if $_POST.date_achat == null || $_POST.date_achat|parse_date == $ligne_immo.date_achat}}
+			{{:assign date_achat=null}}
+		{{else}}
+			{{:assign date_achat=$_POST.date_achat|parse_date}}
+		{{/if}}
+
+		{{if $_POST.date_mes == null || $_POST.date_mes == $_POST.date_achat}}
+			{{:assign date_mes=null}}
+		{{else}}
+			{{:assign date_mes=$_POST.date_mes|parse_date}}
+		{{/if}}
+
 		{{:assign duration=$_POST.duree|intval}}
 		{{if $duration <= 0}}
 			{{:error message="Erreur : la durée d'amortissement doit être strictement positive"}}
@@ -100,17 +112,6 @@
 			{{:error message="Le montant (%s) ne peut être supérieur au reste (%s)"|args:$montant_nb:$reste_nb}}
 		{{/if}}
 
-		{{if $_POST.date_achat == null || $_POST.date_achat|parse_date == $ligne_immo.date_achat}}
-			{{:assign date_achat=null}}
-		{{else}}
-			{{:assign date_achat=$_POST.date_achat|parse_date}}
-		{{/if}}
-
-		{{if $_POST.date_mes == null || $_POST.date_mes == $_POST.date_achat || $_POST.date_mes|parse_date == $ligne_immo.date_achat}}
-			{{:assign date_mes=null}}
-		{{else}}
-			{{:assign date_mes=$_POST.date_mes|parse_date}}
-		{{/if}}
 		{{:assign status="managed"}}
 	{{/if}}
 
diff --git a/modify_infos.html b/modify_infos.html
index edd3c92..826a106 100644
--- a/modify_infos.html
+++ b/modify_infos.html
@@ -91,22 +91,30 @@
 		{{:assign date_mes=null}}
 		{{:assign status="ignored"}}
 	{{else}}
-		{{if $_POST.date_achat == null || $_POST.date_achat|parse_date == $ligne_immo.date_achat}}
-			{{:assign date_achat=null}}
-		{{elseif $_POST.date_achat|parse_date == $info_immo.date_achat}}
-			{{:assign date_achat=$info_immo.date_achat}}
-		{{else}}
-			{{:assign date_achat=$_POST.date_achat|parse_date}}
-		{{/if}}
 		{{if $_POST.date_achat|parse_date > $ligne_immo.date_achat}}
 			{{:assign da=$ligne_immo.date_achat|date_short}}
 			{{:error message="Erreur : la date d'achat (%s) ne peut être postérieure à la date de l'écriture d'immobilisation (%s)"|args:$_POST.date_achat:$da}}
 		{{/if}}
 
-		{{if $_POST.date_mes == null || $_POST.date_mes|parse_date == $ligne_immo.date_achat}}
-			{{:assign date_mes=null}}
+		{{if $_POST.date_achat == null || $_POST.date_achat|parse_date == $info_immo.date_achat}}
+			{{:assign date_achat=$info_immo.date_achat}}
+		{{elseif $_POST.date_achat|parse_date == $ligne_immo.date_achat}}
+			{{:assign date_achat=null}}
+		{{else}}
+			{{:assign date_achat=$_POST.date_achat|parse_date}}
+		{{/if}}
+
+		{{* TODO : simplifier ? *}}
+		{{if $_POST.date_mes == null || $_POST.date_mes|parse_date == $info_immo.date_mes}}
+			{{:assign date_mes=$info_immo.date_mes}}
 		{{elseif $_POST.date_mes|parse_date == $info_immo.date_achat}}
 			{{:assign date_mes=null}}
+		{{elseif $_POST.date_mes|parse_date == $ligne_immo.date_achat}}
+			{{if $info_immo.date_achat == null}}
+				{{:assign date_mes=null}}
+			{{else}}
+				{{:assign date_mes=$ligne_immo.date_achat}}
+			{{/if}}
 		{{else}}
 			{{:assign date_mes=$_POST.date_mes|parse_date}}
 			{{:assign date_achat_comp=$ligne_immo.date_achat}}
@@ -250,7 +258,7 @@
 				{{:input type="text" name="libelle" label="Libellé" default=$info_immo.label}}
 				{{if $info_immo.amount != null}}
 					{{:assign max_aff="%f"|math:$max_disponible|money_currency:false}}
-					{{:input type="money" name="montant" label="Montant de l'immobilisation" default=$montant_immo help="Montant maximum = %s"|args:$max_aff}}
+					{{:input type="money" name="montant" label="Montant de l'immobilisation" default=$montant_immo help="Montant maximum : %s"|args:$max_aff}}
 				{{/if}}
 				{{:input type="date" name="date_achat" label="Date d'acquisition" default=$info_immo.date_achat}}
 				{{:input type="date" name="date_mes" label="Date de mise en service" default=$info_immo.date_mes}}
diff --git a/save_amort.html b/save_amort.html
index 1b199c0..d548c44 100644
--- a/save_amort.html
+++ b/save_amort.html
@@ -31,6 +31,9 @@
 
 {{#load id=$_GET.immo_doc_id|intval assign="info_immo"}}
 	{{:assign duree=$duration}}
+	{{if $date_achat != null}}
+		{{:assign date_debut=$date_achat}}
+	{{/if}}
 	{{if $date_mes != null}}
 		{{:assign date_debut=$date_mes}}
 	{{/if}}
@@ -42,6 +45,7 @@
 {{else}}
 	{{:error message="Informations de l'immobilisation « %s » non trouvées ; vous devez d'abord les renseigner"|args:$ligne_immo.label}}
 {{/load}}
+
 {{if $ligne_immo.line_label != null && $ligne_immo.line_label != $amort_label}}
 	{{:assign amort_label=$amort_label|cat:" — "|cat:$ligne_immo.line_label}}
 {{/if}}
@@ -83,6 +87,7 @@
 	{{#select
 		line.credit,
 		trans.date as amort_date,
+		COALESCE(trans.label, line.label) as amort_label,
 		account.code as account_code,
 		account.label as account_label
 		FROM acc_transactions_lines AS line
@@ -106,6 +111,7 @@
 	{{:assign date_debut=$line.amort_date}}
 	{{:assign code_amort=$line.account_code}}
 	{{:assign amort_account_label=$line.account_label}}
+	{{:assign amort_label=$amort_label}}
 {{/foreach}}
 
 {{if $valeur_residuelle == 0}}