From 25a033c64e322d84c4ecf449c78624f2c4090ba6 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 5 Jan 2025 13:53:16 +0100
Subject: [PATCH] Rename field to avoid conflict.

---
 htdocs/fichinter/class/fichinter.class.php    | 28 ++++++++++++-------
 htdocs/install/mysql/tables/llx_fichinter.sql | 14 +++++-----
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 1a9340923e6..1a81f99bde7 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -200,11 +200,18 @@ class Fichinter extends CommonObject
 	const STATUS_CLOSED = 3;
 
 	/**
-	 * Date delivery
-	 * @var null|int|''		Delivery int
+	 * Date of delivery of receipt
+	 * @var null|int|''		Date the intervention receipt has been delivered
+	 * @deprecated Use $delivery_date_receipt
 	 */
 	public $date_delivery;
 
+	/**
+	 * Date of delivery of receipt
+	 * @var null|int|''		Date the intervention receipt has been delivered
+	 */
+	public $delivery_date_receipt;
+
 	/**
 	 * Author Id
 	 * @var int
@@ -1196,23 +1203,24 @@ class Fichinter extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Defines a delivery date of intervention
+	 *  Defines a delivery date of the receipt of intervention
 	 *
-	 *  @param      User	$user				Object user who define
-	 *  @param      integer	$date_delivery   	date of delivery
-	 *  @return     int							Return integer <0 if KO, >0 if OK
+	 *  @param      User	$user						Object user who define
+	 *  @param      integer	$delivery_date_receipt   	Date of delivery of receipt
+	 *  @return     int									Return integer <0 if KO, >0 if OK
 	 */
-	public function set_date_delivery($user, $date_delivery)
+	public function set_date_delivery($user, $delivery_date_receipt)
 	{
 		// phpcs:enable
 		if ($user->hasRight('ficheinter', 'creer')) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
-			$sql .= " SET datei = '".$this->db->idate($date_delivery)."'";
+			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
+			$sql .= " SET datei = '".$this->db->idate($delivery_date_receipt)."'";
 			$sql .= " WHERE rowid = ".((int) $this->id);
 			$sql .= " AND fk_statut = 0";
 
 			if ($this->db->query($sql)) {
-				$this->date_delivery = $date_delivery;
+				$this->date_delivery = $delivery_date_receipt;
+				$this->delivery_date_receipt = $delivery_date_receipt;
 				return 1;
 			} else {
 				$this->error = $this->db->error();
diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql
index 954a4e5ad9d..0b6b613626f 100644
--- a/htdocs/install/mysql/tables/llx_fichinter.sql
+++ b/htdocs/install/mysql/tables/llx_fichinter.sql
@@ -28,17 +28,17 @@ create table llx_fichinter
   ref_client		varchar(255),				-- customer intervention number
   entity			integer DEFAULT 1 NOT NULL, -- multi company id
   tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  datec				datetime,                   -- date de creation
-  date_valid		datetime,                   -- date de validation
-  datei				date,						-- date de livraison du bon d'intervention
+  datec				datetime,                   -- date of creation
+  date_valid		datetime,                   -- date of validation
+  datei				date,						-- date of delivery of the intervention receipt
   fk_user_author	integer,					-- user making creation
   fk_user_modif     integer,                    -- user making last change
   fk_user_valid		integer,                    -- user validating record
   fk_statut			smallint  DEFAULT 0,
-  dateo				date,						-- date de début d'intervention
-  datee				date,						-- date de fin d'intervention
-  datet				date,						-- date de terminaison de l'intervention
-  duree				real,                       -- duree totale de l'intervention
+  dateo				date,						-- date start intervention
+  datee				date,						-- date end intervention (diff with datet ?)
+  datet				date,						-- date end intervention (diff with datee ?)
+  duree				real,                       -- duration total of  intervention
   description		text,
 
   signed_status     smallint DEFAULT NULL,      -- signed status NULL, 0 or 1