From 59b05062f6ced8c70b9d979d75f4e890b26fcc74 Mon Sep 17 00:00:00 2001
From: KANE LAZENI <lkane@ebene.info>
Date: Sat, 3 Jan 2026 09:58:32 +0000
Subject: [PATCH 1/2] a

---
 Vue/Listeavenant/index.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Vue/Listeavenant/index.php b/Vue/Listeavenant/index.php
index 52eb4d0..e4ccdf4 100644
--- a/Vue/Listeavenant/index.php
+++ b/Vue/Listeavenant/index.php
@@ -14,6 +14,7 @@
 		<th> <?= _("Producteur") ?> </th>
 		<th style='text-align:center'> <?= _("Saisie") ?> </th>
 		<th colspan="3"style='text-align:center'> <?= _("Facturation") ?> </th>
+		<th style='text-align:center'> <?= _("RH") ?> </th>
 	  </tr>
 	</thead>
 
@@ -43,6 +44,14 @@
 			
 			<td align='center'> <?= dateheureLang($this->nettoyer($avenant['dateFacturation'])) ?></td>
 			<td align='center'> <?= $this->nettoyer($avenant['userFacturation']) ?> </td>
+
+			<td align='center'> 
+				<?php if($avenant['ajoutClient']=='1'): ?>
+					<input type="checkbox" checked disabled>
+				<?php else: ?>
+					<input type="checkbox" disabled>
+				<?php endif; ?>
+			</td>
 		</tr>
 		<?php endforeach; ?>
 	</tbody>

From 2c79b35420e2059a25657ffaed815a2aaf83c3a7 Mon Sep 17 00:00:00 2001
From: KANE LAZENI <lkane@ebene.info>
Date: Sat, 3 Jan 2026 11:48:22 +0000
Subject: [PATCH 2/2] a

---
 Js/fonctions.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Js/fonctions.js b/Js/fonctions.js
index a7bae89..2e01c64 100755
--- a/Js/fonctions.js
+++ b/Js/fonctions.js
@@ -1555,20 +1555,16 @@ function enregistrer_retrait()
 	});
 }
 
-<<<<<<<<< Temporary merge branch 1
 function liste_avenant()
 {
 	window.location.assign($("#racineWeb" ).val()+"Listeavenant/");
-=========
+}
+
 function controle_date_avenant()
 {
 	codeTypeAvenant=$("#codeTypeAvenant").val();
-	
 	$("#div_periodidite").html("");
-
   $("#dateAvenant").val($("#datejourfr_C").val());	
-  
   $("#dateAvenant").readable();			
   $("#motifavenant").readable();
->>>>>>>>> Temporary merge branch 2
 }