From 617ff5cafb2c95e6e1e7a910d06123cf483f3e62 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Thu, 25 Jan 2024 08:47:41 +0100
Subject: [PATCH 01/38] Updated PHPDoc. Cleaned code. Fixed types.

---
 htdocs/societe/class/societe.class.php | 40 +++++++++++---------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index cf7d9aa55b9..2656d6a5bff 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -310,8 +310,7 @@ class Societe extends CommonObject
 	public $status = 1;
 
 	/**
-	 * Id of region
-	 * @var int
+	 * @var string	region code
 	 */
 	public $region_code;
 
@@ -1334,17 +1333,17 @@ class Societe extends CommonObject
 		$now = dol_now();
 
 		// Clean parameters
-		$this->id = $id;
-		$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
-		$this->name = $this->name ? trim($this->name) : trim($this->nom);
-		$this->nom = $this->name; // For backward compatibility
-		$this->name_alias = trim($this->name_alias);
+		$this->id 			= $id;
+		$this->entity 		= ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
+		$this->name 		= $this->name ? trim($this->name) : trim($this->nom);
+		$this->nom 			= $this->name; // For backward compatibility
+		$this->name_alias 	= trim($this->name_alias);
 		$this->ref_ext		= trim($this->ref_ext);
-		$this->address		= $this->address ? trim($this->address) : trim($this->address);
-		$this->zip = $this->zip ? trim($this->zip) : trim($this->zip);
-		$this->town = $this->town ? trim($this->town) : trim($this->town);
-		$this->state_id = trim($this->state_id);
-		$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
+		$this->address		= trim($this->address);
+		$this->zip 			= trim($this->zip);
+		$this->town 		= trim($this->town);
+		$this->state_id 	= (is_numeric($this->state_id)) ? (int) trim($this->state_id) : 0;
+		$this->country_id 	= ($this->country_id > 0) ? $this->country_id : 0;
 		$this->phone		= trim($this->phone);
 		$this->phone		= preg_replace("/\s/", "", $this->phone);
 		$this->phone		= preg_replace("/\./", "", $this->phone);
@@ -1361,14 +1360,14 @@ class Societe extends CommonObject
 		$this->idprof4		= trim($this->idprof4);
 		$this->idprof5		= (!empty($this->idprof5) ? trim($this->idprof5) : '');
 		$this->idprof6		= (!empty($this->idprof6) ? trim($this->idprof6) : '');
-		$this->prefix_comm = trim($this->prefix_comm);
+		$this->prefix_comm 	= trim($this->prefix_comm);
 		$this->outstanding_limit = price2num($this->outstanding_limit);
 		$this->order_min_amount = price2num($this->order_min_amount);
 		$this->supplier_order_min_amount = price2num($this->supplier_order_min_amount);
 
-		$this->tva_assuj			= trim($this->tva_assuj);
+		$this->tva_assuj			= (is_numeric($this->tva_assuj)) ? (int) trim($this->tva_assuj) : 0;
 		$this->tva_intra			= dol_sanitizeFileName($this->tva_intra, '');
-		$this->vat_reverse_charge	= empty($this->vat_reverse_charge) ? '0' : '1';
+		$this->vat_reverse_charge	= empty($this->vat_reverse_charge) ? 0 : 1;
 		if (empty($this->status)) {
 			$this->status = 0;
 		}
@@ -1388,12 +1387,7 @@ class Societe extends CommonObject
 		$this->localtax1_value = trim($this->localtax1_value);
 		$this->localtax2_value = trim($this->localtax2_value);
 
-		if ($this->capital != '') {
-			$this->capital = price2num(trim($this->capital));
-		}
-		if (!is_numeric($this->capital)) {
-			$this->capital = ''; // '' = undef
-		}
+		$this->capital = (!empty($this->capital)) ? (float) price2num(trim($this->capital)) : 0;
 
 		$this->effectif_id = trim($this->effectif_id);
 		$this->forme_juridique_code = trim($this->forme_juridique_code);
@@ -1550,7 +1544,7 @@ class Societe extends CommonObject
 				$sql .= ",localtax2_value =0.000";
 			}
 
-			$sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
+			$sql .= ",capital = ".($this->capital == 0 ? "null" : $this->capital);
 
 			$sql .= ",prefix_comm = ".(!empty($this->prefix_comm) ? "'".$this->db->escape($this->prefix_comm)."'" : "null");
 
@@ -1913,7 +1907,7 @@ class Societe extends CommonObject
 				$this->state_id     = $obj->state_id;
 				$this->state_code   = $obj->state_code;
 				$this->region_id    = $obj->region_id;
-				$this->region_code = $obj->region_code;
+				$this->region_code  = $obj->region_code;
 				$this->state        = ($obj->state != '-' ? $obj->state : '');
 
 				$transcode = $langs->trans('StatusProspect'.$obj->fk_stcomm);

From 49d10bb491032a8280bfba39ebfc1eeacfa4191f Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Thu, 25 Jan 2024 11:05:34 +0100
Subject: [PATCH 02/38] Refactored & cleaned isACompany method

---
 htdocs/societe/class/societe.class.php | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 2656d6a5bff..cb69b5b27d0 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3988,30 +3988,27 @@ class Societe extends CommonObject
 	}
 
 	/**
-	 *  Return if third party is a company (Business) or an end user (Consumer)
+	 *  Check if third party is a company (Business) or an end user (Consumer)
 	 *
-	 *  @return    boolean     true=is a company, false=a and user
+	 *  @return		boolean		if a company: true || if a user: false
 	 */
 	public function isACompany()
 	{
-		global $conf;
-
 		// Define if third party is treated as company (or not) when nature is unknown
-		$isacompany = !getDolGlobalString('MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES') ? 0 : 1; // 0 by default
+		$isACompany = !getDolGlobalString('MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES') ? false : true;
 		if (!empty($this->tva_intra)) {
-			$isacompany = 1;
+			$isACompany = true;
 		} elseif (!empty($this->idprof1) || !empty($this->idprof2) || !empty($this->idprof3) || !empty($this->idprof4) || !empty($this->idprof5) || !empty($this->idprof6)) {
-			$isacompany = 1;
+			$isACompany = true;
 		} elseif (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN') {
 			// TODO Add a field is_a_company into dictionary
 			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) {
-				$isacompany = 0;
+				$isACompany = false;
 			} else {
-				$isacompany = 1;
+				$isACompany = true;
 			}
 		}
-
-		return $isacompany;
+		return $isACompany;
 	}
 
 	/**

From 465a49107327749657d56d0c0231a11406626802 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Thu, 25 Jan 2024 11:24:12 +0100
Subject: [PATCH 03/38] Cleaned country_id type

---
 htdocs/societe/class/societe.class.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index cb69b5b27d0..623310be452 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -929,7 +929,7 @@ class Societe extends CommonObject
 		if ($this->code_client == -1 || $this->code_client === 'auto') {
 			$this->get_codeclient($this, 0);
 		}
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') {
+		if ($this->code_fournisseur == '-1' || $this->code_fournisseur === 'auto') {
 			$this->get_codefournisseur($this, 1);
 		}
 
@@ -1399,7 +1399,7 @@ class Societe extends CommonObject
 		if ($this->code_client == -1 || $this->code_client === 'auto') {
 			$this->get_codeclient($this, 0);
 		}
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') {
+		if ($this->code_fournisseur == '-1' || $this->code_fournisseur === 'auto') {
 			$this->get_codefournisseur($this, 1);
 		}
 
@@ -4229,7 +4229,7 @@ class Societe extends CommonObject
 
 		$this->client = 1; // A member is a customer by default
 		$this->code_client = ($customercode ? $customercode : -1);
-		$this->code_fournisseur = -1;
+		$this->code_fournisseur = '-1';
 		$this->typent_code = ($member->morphy == 'phy' ? 'TE_PRIVATE' : 0);
 		$this->typent_id = $this->typent_code ? dol_getIdFromCode($this->db, $this->typent_code, 'c_typent', 'id', 'code') : 0;
 
@@ -4303,10 +4303,11 @@ class Societe extends CommonObject
 		$this->note_private = getDolGlobalString('MAIN_INFO_SOCIETE_NOTE');
 
 		// We define country_id, country_code and country
-		$country_id = $country_code = $country_label = '';
+		$country_id = 0;
+		$country_code = $country_label = '';
 		if (getDolGlobalString('MAIN_INFO_SOCIETE_COUNTRY')) {
 			$tmp = explode(':', getDolGlobalString('MAIN_INFO_SOCIETE_COUNTRY'));
-			$country_id = $tmp[0];
+			$country_id =  (is_numeric($tmp[0])) ? (int) $tmp[0] : 0;
 			if (!empty($tmp[1])) {   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
 				$country_code = $tmp[1];
 				$country_label = $tmp[2];

From a7f2acfc972bd3f1a11348899f49a45632bf2d1c Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Thu, 25 Jan 2024 11:28:08 +0100
Subject: [PATCH 04/38] Cleaned capital type

---
 htdocs/societe/class/societe.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 623310be452..31bc938eba3 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4390,7 +4390,7 @@ class Societe extends CommonObject
 		$this->idprof6 = getDolGlobalString('MAIN_INFO_PROFID6');
 		$this->tva_intra = getDolGlobalString('MAIN_INFO_TVAINTRA'); // VAT number, not necessarily INTRA.
 		$this->managers = getDolGlobalString('MAIN_INFO_SOCIETE_MANAGERS');
-		$this->capital = getDolGlobalString('MAIN_INFO_CAPITAL');
+		$this->capital = is_numeric(getDolGlobalString('MAIN_INFO_CAPITAL')) ? (float) price2num(getDolGlobalString('MAIN_INFO_CAPITAL')) : 0;
 		$this->forme_juridique_code = getDolGlobalString('MAIN_INFO_SOCIETE_FORME_JURIDIQUE');
 		$this->email = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL');
 		$this->default_lang = getDolGlobalString('MAIN_LANG_DEFAULT', 'auto');

From 73bd62b48db0441bc0dbb19de385110631f00988 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Thu, 25 Jan 2024 11:31:59 +0100
Subject: [PATCH 05/38] Cleaned tva_assuj type

---
 htdocs/societe/class/societe.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 31bc938eba3..39ef740cad4 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4402,7 +4402,7 @@ class Societe extends CommonObject
 		$this->logo_squarred_mini = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI');
 
 		// Define if company use vat or not
-		$this->tva_assuj = getDolGlobalString('FACTURE_TVAOPTION');
+		$this->tva_assuj = (is_numeric(getDolGlobalString('FACTURE_TVAOPTION'))) ? (int) getDolGlobalString('FACTURE_TVAOPTION') : 0;
 
 		// Define if company use local taxes
 		$this->localtax1_assuj = ((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == '1' || getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')) ? 1 : 0);

From d17b6712e6c70eae488c23d58af7c6bac6810460 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Thu, 25 Jan 2024 11:52:08 +0100
Subject: [PATCH 06/38] Added contributor details

---
 htdocs/societe/class/societe.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 39ef740cad4..6a232bb47f5 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -19,6 +19,7 @@
  * Copyright (C) 2020       Open-Dsi         		<support@open-dsi.fr>
  * Copyright (C) 2022		ButterflyOfFire         <butterflyoffire+dolibarr@protonmail.com>
  * Copyright (C) 2023       Alexandre Janniaux      <alexandre.janniaux@gmail.com>
+ * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 6facd01c484cbb84418ddcbb020a7fdcb02d5014 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Fri, 26 Jan 2024 08:49:08 +0100
Subject: [PATCH 07/38] Refactored isACompany method

---
 htdocs/societe/class/societe.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 6a232bb47f5..58485c3c15d 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3996,20 +3996,20 @@ class Societe extends CommonObject
 	public function isACompany()
 	{
 		// Define if third party is treated as company (or not) when nature is unknown
-		$isACompany = !getDolGlobalString('MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES') ? false : true;
+		$isACompany = getDolGlobalInt('MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES');
 		if (!empty($this->tva_intra)) {
-			$isACompany = true;
+			$isACompany = 1;
 		} elseif (!empty($this->idprof1) || !empty($this->idprof2) || !empty($this->idprof3) || !empty($this->idprof4) || !empty($this->idprof5) || !empty($this->idprof6)) {
-			$isACompany = true;
+			$isACompany = 1;
 		} elseif (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN') {
 			// TODO Add a field is_a_company into dictionary
 			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) {
-				$isACompany = false;
+				$isACompany = 0;
 			} else {
-				$isACompany = true;
+				$isACompany = 1;
 			}
 		}
-		return $isACompany;
+		return boolval($isACompany);
 	}
 
 	/**

From c8b1e705a43314b3ae2f5f6bac3d70e8f894ebc3 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Fri, 26 Jan 2024 08:55:00 +0100
Subject: [PATCH 08/38] Cleaned code

---
 htdocs/societe/class/societe.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 58485c3c15d..616d97338b3 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4403,7 +4403,7 @@ class Societe extends CommonObject
 		$this->logo_squarred_mini = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI');
 
 		// Define if company use vat or not
-		$this->tva_assuj = (is_numeric(getDolGlobalString('FACTURE_TVAOPTION'))) ? (int) getDolGlobalString('FACTURE_TVAOPTION') : 0;
+		$this->tva_assuj = getDolGlobalInt('FACTURE_TVAOPTION');
 
 		// Define if company use local taxes
 		$this->localtax1_assuj = ((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == '1' || getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')) ? 1 : 0);

From 6f6d5fa6d81220fb4db546a25809c282e0aa4149 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Fri, 26 Jan 2024 09:11:50 +0100
Subject: [PATCH 09/38] Refactored capital property update

---
 htdocs/societe/class/societe.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 616d97338b3..fb17d2ffe08 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1388,7 +1388,7 @@ class Societe extends CommonObject
 		$this->localtax1_value = trim($this->localtax1_value);
 		$this->localtax2_value = trim($this->localtax2_value);
 
-		$this->capital = (!empty($this->capital)) ? (float) price2num(trim($this->capital)) : 0;
+		$this->capital = ($this->capital != '') ? (float) price2num(trim($this->capital)) : null;
 
 		$this->effectif_id = trim($this->effectif_id);
 		$this->forme_juridique_code = trim($this->forme_juridique_code);
@@ -1545,7 +1545,7 @@ class Societe extends CommonObject
 				$sql .= ",localtax2_value =0.000";
 			}
 
-			$sql .= ",capital = ".($this->capital == 0 ? "null" : $this->capital);
+			$sql .= ",capital = ".($this->capital == null ? "null" : $this->capital);
 
 			$sql .= ",prefix_comm = ".(!empty($this->prefix_comm) ? "'".$this->db->escape($this->prefix_comm)."'" : "null");
 

From dea1978171b7f0ecbc72176ca1b24f59127d0180 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Fri, 26 Jan 2024 09:17:02 +0100
Subject: [PATCH 10/38] Fixed 0 values

---
 htdocs/societe/class/societe.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index fb17d2ffe08..370c538764b 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1545,7 +1545,7 @@ class Societe extends CommonObject
 				$sql .= ",localtax2_value =0.000";
 			}
 
-			$sql .= ",capital = ".($this->capital == null ? "null" : $this->capital);
+			$sql .= ",capital = ".($this->capital === null ? "null" : $this->capital);
 
 			$sql .= ",prefix_comm = ".(!empty($this->prefix_comm) ? "'".$this->db->escape($this->prefix_comm)."'" : "null");
 

From a615672525fcfba21695bd931f948175bf5bc843 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Mon, 29 Jan 2024 09:23:11 +0100
Subject: [PATCH 11/38] Added client code to order export

---
 htdocs/core/modules/modCommande.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index eb276ea8c3d..005ae6490be 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -200,7 +200,7 @@ class modCommande extends DolibarrModules
 		$this->export_label[$r] = 'CustomersOrdersAndOrdersLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r] = array(array("commande", "commande", "export"));
 		$this->export_fields_array[$r] = array(
-			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom'=>'ParentCompany', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'd.nom'=>'State', 'co.label'=>'Country',
+			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom'=>'ParentCompany', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'd.nom'=>'State', 'co.label'=>'Country',
 			'co.code'=>"CountryCode", 's.phone'=>'Phone', 's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 'c.rowid'=>"Id",
 			'c.ref'=>"Ref", 'c.ref_client'=>"RefCustomer", 'c.fk_soc'=>"IdCompany", 'c.date_creation'=>"DateCreation", 'c.date_commande'=>"OrderDate",
 			'c.date_livraison'=>"DateDeliveryPlanned", 'c.amount_ht'=>"Amount", 'c.total_ht'=>"TotalHT",
@@ -233,7 +233,7 @@ class modCommande extends DolibarrModules
 		//	'p.rowid'=>'List:product:ref','p.ref'=>'Text','p.label'=>'Text'
 		//);
 		$this->export_TypeFields_array[$r] = array(
-			's.nom'=>'Text', 'ps.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'co.label'=>'List:c_country:label:label', 'co.code'=>'Text', 's.phone'=>'Text',
+			's.nom'=>'Text', 'ps.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'co.label'=>'List:c_country:label:label', 'co.code'=>'Text', 's.phone'=>'Text',
 			's.siren'=>'Text', 's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 'c.ref'=>"Text", 'c.ref_client'=>"Text", 'c.date_creation'=>"Date",
 			'c.date_commande'=>"Date", 'c.date_livraison'=>"Date", 'sm.code'=>"Text", 'c.amount_ht'=>"Numeric", 'c.total_ht'=>"Numeric",
 			'c.total_ttc'=>"Numeric", 'c.facture'=>"Boolean", 'c.fk_statut'=>'Status', 'c.note_public'=>"Text", 'pj.ref'=>'Text',
@@ -242,7 +242,7 @@ class modCommande extends DolibarrModules
 			'c.entity'=>'List:entity:label:rowid',
 		);
 		$this->export_entities_array[$r] = array(
-			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'd.nom'=>'company', 'co.label'=>'company',
+			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.code_client'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'd.nom'=>'company', 'co.label'=>'company',
 			'co.code'=>'company', 's.phone'=>'company', 's.siren'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.siret'=>'company', 'c.rowid'=>"order",
 			'c.ref'=>"order", 'c.ref_client'=>"order", 'c.fk_soc'=>"order", 'c.date_creation'=>"order", 'c.date_commande'=>"order", 'c.amount_ht'=>"order",
 			'c.total_ht'=>"order", 'c.total_ttc'=>"order", 'c.facture'=>"order", 'c.fk_statut'=>"order", 'c.note'=>"order",

From 3cc15d416373798ea216a5aa338e8f8cbd503a4b Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 29 Jan 2024 15:38:13 +0100
Subject: [PATCH 12/38] New display for template email in boxes

---
 htdocs/ai/admin/setup.php                 |  2 -
 htdocs/ai/class/ai.class.php              | 33 +++++---
 htdocs/ai/css/style.css                   | 89 ++++++++++++++++++++
 htdocs/core/class/html.formmail.class.php | 99 +++++++++++++++++++----
 htdocs/langs/en_US/mails.lang             |  6 +-
 5 files changed, 198 insertions(+), 31 deletions(-)
 create mode 100644 htdocs/ai/css/style.css

diff --git a/htdocs/ai/admin/setup.php b/htdocs/ai/admin/setup.php
index 33d4954ea2d..00e3623dab5 100644
--- a/htdocs/ai/admin/setup.php
+++ b/htdocs/ai/admin/setup.php
@@ -67,8 +67,6 @@ foreach ($arrayofia as $ia) {
 	$item->defaultFieldValue = '';
 }
 
-// Retrieve existing API Key
-//$apiKey = dolibarr_get_const($db, 'MAIN_AI_CHATGPT_API_KEY');
 
 $setupnotempty =+ count($formSetup->items);
 
diff --git a/htdocs/ai/class/ai.class.php b/htdocs/ai/class/ai.class.php
index 3a1e5de3ad1..dd103c837e0 100644
--- a/htdocs/ai/class/ai.class.php
+++ b/htdocs/ai/class/ai.class.php
@@ -19,6 +19,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  * or see https://www.gnu.org/
  */
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 
 /**
  * Class for AI
@@ -43,33 +44,39 @@ class Ai
 	/**
 	 * Constructor
 	 *
-	 * @param   string  $apiEndpoint       Endpoint of api
-	 * @param   string  $apiKey   key of api
+	 * @param	DoliDB	$db		 Database handler
+	 *
 	 */
-	public function __construct($apiEndpoint, $apiKey)
+	public function __construct($db)
 	{
-		$this->apiEndpoint = $apiEndpoint;
-		$this->apiKey = $apiKey;
+		$this->db = $db;
+		$this->apiEndpoint = dolibarr_get_const($this->db, 'AI_API_ENDPOINT');
+		$this->apiKey = dolibarr_get_const($this->db, 'AI_KEY_API_CHATGPT');
 	}
 
 	/**
 	 * Generate response of instructions
 	 * @param   string  $instructions   instruction for generate content
+	 * @param   string  $model          model name (chat,text,image...)
 	 * @return   mixed   $response
 	 */
-	public function generateContent($instructions)
+	public function generateContent($instructions, $model = 'gpt-3.5-turbo')
 	{
 		try {
 			$ch = curl_init($this->apiEndpoint);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode(['prompt' => $instructions]));
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode([
+				'messages' => [
+					['role' => 'user', 'content' => $instructions]
+				],
+				'model' => $model
+			]));
 			curl_setopt($ch, CURLOPT_HTTPHEADER, [
 				'Authorization: Bearer ' . $this->apiKey,
 				'Content-Type: application/json'
 			]);
 
 			$response = curl_exec($ch);
-
 			if (curl_errno($ch)) {
 				throw new Exception('cURL error: ' . curl_error($ch));
 			}
@@ -78,11 +85,15 @@ class Ai
 			if ($statusCode != 200) {
 				throw new Exception('API request failed with status code ' . $statusCode);
 			}
+			// Decode JSON response
+			$decodedResponse = json_decode($response, true);
 
-			return $response;
+			// Extraction content
+			$generatedEmailContent = $decodedResponse['choices'][0]['message']['content'];
+
+			return $generatedEmailContent;
 		} catch (Exception $e) {
-			error_log($e->getMessage());
-			return null;
+			return array('error' => true, 'message' => $e->getMessage());
 		} finally {
 			curl_close($ch);
 		}
diff --git a/htdocs/ai/css/style.css b/htdocs/ai/css/style.css
new file mode 100644
index 00000000000..22a06705912
--- /dev/null
+++ b/htdocs/ai/css/style.css
@@ -0,0 +1,89 @@
+.template-container {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    background: #f5f5f5;
+    border: 1px solid #d3d3d3;
+    border-radius: 5px;
+    margin-bottom: 15px;
+  }
+  
+  .template-option {
+    flex: 1;
+    text-align: center;
+    padding: 10px;
+    margin: 0 5px;
+    background: #e9e9e9;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    cursor: pointer;
+    height: 80px;
+    display: flex;
+    flex-direction: column; 
+    align-items: center;
+    justify-content: center;
+  }
+  
+  .template-option:hover {
+    font-weight: bold;
+    background: var(--butactionbg);
+    color: var(--textbutaction);
+    border-radius: 8px;
+    border-collapse: collapse;
+    border: none;
+  }
+  
+  .template-option[data-template="ai"] {
+    background: #c5f7c5;
+  }
+  
+  .template-option[data-template="ai"]:hover {
+    font-weight: bold;
+    background: var(--butactionbg);
+    color: var(--textbutaction);
+    border-radius: 8px;
+    border-collapse: collapse;
+    border: none;
+  }
+
+  .template-option.selected {
+    font-weight: bold;
+    background: var(--butactionbg);
+    color: var(--textbutaction);
+    border-radius: 8px;
+    border-collapse: collapse;
+    border: none;
+}
+
+  #template-selector {
+    width: 100%;
+    max-width: 80%;
+    height: auto;
+    padding: 10px;
+    border: 1px solid #d3d3d3;
+    border-radius: 5px;
+    margin-bottom: 10px;
+    margin-top: 10px;
+  }
+
+  .template-option i {
+    font-size: 42px; 
+    margin-bottom: 5px;
+   
+}
+.template-option-text {
+  padding-top: 5px;
+  font-size: 12px; 
+}
+
+#ai_input {
+  display: none;
+}
+
+.template-option img {
+  display: block; 
+  width: 100%; 
+  height: 100%; 
+  margin: 0 5px;
+ padding: auto;
+}
\ No newline at end of file
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 9592ed0a291..6c610e9bacc 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -755,7 +755,7 @@ class FormMail extends Form
 			if (!empty($this->withtoccuser) && is_array($this->withtoccuser) && getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {
 				$out .= '<tr><td>';
 				$out .= $langs->trans("MailToCCUsers");
-				$out .= '</td></td>';
+				$out .= '</td><td>';
 
 				// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
 				$tmparray = $this->withtoccuser;
@@ -889,8 +889,8 @@ class FormMail extends Form
 
 			//input prompt AI
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-			if (isModEnabled('ai') && getDolGlobalString('AI_CHATGPT_API_KEY')) {
-				$out .= $this->getHtmlForInstruction();
+			if (isModEnabled('ai')) {
+				$out .= $this->getModelEmailTemplate();
 			}
 			// Message
 			if (!empty($this->withbody)) {
@@ -1002,7 +1002,7 @@ class FormMail extends Form
 				$out .= '<td colspan="2">';
 				if ($this->withbodyreadonly) {
 					$out .= nl2br($defaultmessage);
-					$out .= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
+					$out .= '<input type="hidden" id="message" disabled value="'.$defaultmessage.'" />';
 				} else {
 					if (!isset($this->ckeditortoolbar)) {
 						$this->ckeditortoolbar = 'dolibarr_mailings';
@@ -1386,39 +1386,57 @@ class FormMail extends Form
 	{
 		global $langs, $form;
 
-		$baseUrl = dol_buildpath('/', 1);
-
-		$out = '<tr>';
+		$out = '<tr id="ai_input">';
 		$out .= '<td>';
 		$out .= $form->textwithpicto($langs->trans('helpWithAi'), $langs->trans("YouCanMakeSomeInstructionForEmail"));
 		$out .= '</td>';
 
 		$out .= '<td>';
-		$out .= '<input type="hidden" id="csrf_token" name="token" value="'.newToken().'">';
-		$out .= '<input type="text" class="quatrevingtpercent" id="ai_instructions" name="instruction" placeholder="message with AI"/>';
-		$out .= '<button id="generate_button" type="button" class="button smallpaddingimp">'.$langs->trans('Generate').'</button>';
+		$out .= '<input type="text" class="quatrevingtpercent" id="ai_instructions" name="instruction" placeholder="message with AI" />';
+		$out .= '<input id="generate_button" type="button" class="button smallpaddingimp"  value="'.$langs->trans('Generate').'"/>';
 		$out .= "</td></tr>\n";
+
+
 		$out .= "<script type='text/javascript'>
 			$(document).ready(function() {
+
+				//for keydown
+				$('#ai_instructions').keydown(function(event) {
+					if (event.keyCode === 13) { 
+						event.preventDefault(); 
+						$('#generate_button').click(); 
+					}
+				});
+
 				$('#generate_button').click(function() {
 					var instructions = $('#ai_instructions').val();
-					var token = $('#csrf_token').val();
+					//editor on readonly 
+        			if (CKEDITOR.instances.message) {
+						CKEDITOR.instances.message.setReadOnly(1);
+					}
 
 					$.ajax({
-						url: '".$baseUrl."ai/lib/generate_content.lib.php',
-						method: 'POST',
-						dataType: 'json',
+						url: '". DOL_URL_ROOT."/ai/ajax/generate_content.php?token=".newToken()."',
+						type: 'POST',
 						contentType: 'application/json',
 						data: JSON.stringify({
-							'token': token,
 							'instructions': instructions,
 						}),
 						success: function(response) {
-							console.log(response);
+							if (".getDolGlobalString('FCKEDITOR_ENABLE_MAIL').") {
+								CKEDITOR.instances.message.setData(response);
+							} 
+							else {
+								tinymce.get('message').setContent(response);
+							}
+							// remove readonly 
+							CKEDITOR.instances.message.setReadOnly(0);
+							$('#ai_instructions').val('');
 						},
 						error: function(xhr, status, error) {
 							console.error('error ajax', status, error);
 						}
+						
 					});
 				});
 			});
@@ -1427,6 +1445,55 @@ class FormMail extends Form
 		return $out;
 	}
 
+	/**
+	 * get models template email in boxes
+	 * @return 	string      HTML for model email boxes
+
+	 */
+	public function getModelEmailTemplate()
+	{
+
+		global $langs, $form;
+		$out = '<tr>';
+		$out .= '<td>';
+		$out .= $form->textwithpicto($langs->trans('ModelTemplate'), $langs->trans("YouCanChooseAModelForYouMailContent"));
+		$out .= '</td>';
+		$out .= '<td>';
+		$out .= '<div id="template-selector" class="template-container">';
+		$templates = array('empty', 'basic', 'news', 'commerce', 'text');
+		foreach ($templates as $template) {
+			$out .= '<div class="template-option" data-template="'.$template.'">';
+			$out .= '<img alt="Gray rectangle" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC" />';
+			$out .= ucfirst($template);
+			$out .= '</div>';
+		}
+		$out .= '<div class="template-option" data-template="ai"><i class="fas fa-edit"></i>Generate with AI</div>';
+		$out .= '</div>';
+		$out .= '</td></tr>';
+		$out .= "<script type='text/javascript'>
+				var cssLink = document.createElement('link');
+				cssLink.href = '".DOL_URL_ROOT."/ai/css/style.css';
+				cssLink.rel = 'stylesheet';
+				cssLink.type = 'text/css';
+				document.head.appendChild(cssLink);</script>";
+		$out .= "<script type='text/javascript'>
+				$(document).ready(function() {
+					$('.template-option').click(function() {
+						$('.template-option').removeClass('selected');
+						$(this).addClass('selected');
+
+						var template = $(this).data('template');
+						if(template === 'ai') {
+							$('#ai_input').show();
+						} else {
+							$('#ai_input').hide();
+						}
+					});
+				});
+		</script>";
+		$out .= $this->getHtmlForInstruction();
+		return $out;
+	}
 
 
 	/**
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 2de7dbbbdc3..aaddd278084 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -184,5 +184,7 @@ EmailOptedOut=Email owner has requested to not contact him with this email anymo
 EvenUnsubscribe=Include opt-out emails
 EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Useful for mandatory service emails for example.
 XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
-helpWithAi=Add instructions
-YouCanMakeSomeInstructionForEmail=You can add some instructions for your email (Example: generate image in email template...)
+helpWithAi=Generate message from AI
+YouCanMakeSomeInstructionForEmail=You Can Make Some Instruction For your Email (Exemple: generate image in email template...)
+ModelTemplate=Email template
+YouCanChooseAModelForYouMailContent= You can shoose one of models or generate one with Ai
\ No newline at end of file

From 17ce61b82f09e7f6898daf5946df196469665310 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 29 Jan 2024 16:03:11 +0100
Subject: [PATCH 13/38] fix name in input message

---
 htdocs/core/class/html.formmail.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 6c610e9bacc..83f3edbb9d1 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1002,7 +1002,7 @@ class FormMail extends Form
 				$out .= '<td colspan="2">';
 				if ($this->withbodyreadonly) {
 					$out .= nl2br($defaultmessage);
-					$out .= '<input type="hidden" id="message" disabled value="'.$defaultmessage.'" />';
+					$out .= '<input type="hidden" id="message" name="message" disabled value="'.$defaultmessage.'" />';
 				} else {
 					if (!isset($this->ckeditortoolbar)) {
 						$this->ckeditortoolbar = 'dolibarr_mailings';

From fc9e833318b16144236a927fd00278d6c5f5023c Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 29 Jan 2024 16:17:42 +0100
Subject: [PATCH 14/38] add script for generate email template

---
 .../generate_content.php}                     | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)
 rename htdocs/ai/{lib/generate_content.lib.php => ajax/generate_content.php} (82%)

diff --git a/htdocs/ai/lib/generate_content.lib.php b/htdocs/ai/ajax/generate_content.php
similarity index 82%
rename from htdocs/ai/lib/generate_content.lib.php
rename to htdocs/ai/ajax/generate_content.php
index 898bd2205ca..d2efc05de34 100644
--- a/htdocs/ai/lib/generate_content.lib.php
+++ b/htdocs/ai/ajax/generate_content.php
@@ -41,30 +41,27 @@ if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
 
-require_once '../../main.inc.php';
+require '../../main.inc.php';
+
 require_once DOL_DOCUMENT_ROOT.'/ai/class/ai.class.php';
 
+top_httphead();
 
 //get data from AJAX
 $rawData = file_get_contents('php://input');
 $jsonData = json_decode($rawData, true);
 
 if (is_null($jsonData)) {
-	dol_print_error(null, 'data with format JSON valide.');
+	dol_print_error('data with format JSON valide.');
 }
-$token = GETPOST('token');
-if ($token !== currentToken()) { // Remplacez 'newToken' par le nom de votre variable de session contenant le token
-	dol_print_error(null, 'CSRF token validation failed.');
-	exit;
-}
-$chatGPT = new Ai('API_ENDPOINT', 'API_KEY');
+$chatGPT = new Ai($db);
 
 $instructions = dol_string_nohtmltag($jsonData['instructions'], 1, 'UTF-8');
 
 $generatedContent = $chatGPT->generateContent($instructions);
 
-if ($generatedContent) {
-	print $generatedContent;
+if (is_array($generatedContent) && $generatedContent['error']) {
+	print "Error : " . $generatedContent['message'];
 } else {
-	dol_print_error(null, 'error!!');
-}
+	print $generatedContent;
+}
\ No newline at end of file

From c92b8709f2615cf3ff7ace1e8f7f8be739142a80 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 29 Jan 2024 16:17:49 +0100
Subject: [PATCH 15/38] add script for generate email template

---
 htdocs/ai/ajax/generate_content.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/ai/ajax/generate_content.php b/htdocs/ai/ajax/generate_content.php
index d2efc05de34..c38ab4ef54b 100644
--- a/htdocs/ai/ajax/generate_content.php
+++ b/htdocs/ai/ajax/generate_content.php
@@ -64,4 +64,4 @@ if (is_array($generatedContent) && $generatedContent['error']) {
 	print "Error : " . $generatedContent['message'];
 } else {
 	print $generatedContent;
-}
\ No newline at end of file
+}

From 586230adbedf2b7b2b4510e71e37a6c0c5ff7587 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 29 Jan 2024 17:31:23 +0100
Subject: [PATCH 16/38] add image for boxes

---
 htdocs/ai/css/style.css                       |  28 +++++++++++++-----
 htdocs/core/class/html.formmail.class.php     |   6 ++--
 htdocs/theme/common/mailtemplate/basic.png    | Bin 0 -> 1400 bytes
 htdocs/theme/common/mailtemplate/commerce.png | Bin 0 -> 2490 bytes
 htdocs/theme/common/mailtemplate/empty.png    | Bin 0 -> 2150 bytes
 htdocs/theme/common/mailtemplate/news.png     | Bin 0 -> 2346 bytes
 htdocs/theme/common/mailtemplate/text.png     | Bin 0 -> 1183 bytes
 7 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 htdocs/theme/common/mailtemplate/basic.png
 create mode 100644 htdocs/theme/common/mailtemplate/commerce.png
 create mode 100644 htdocs/theme/common/mailtemplate/empty.png
 create mode 100644 htdocs/theme/common/mailtemplate/news.png
 create mode 100644 htdocs/theme/common/mailtemplate/text.png

diff --git a/htdocs/ai/css/style.css b/htdocs/ai/css/style.css
index 22a06705912..29ed800d134 100644
--- a/htdocs/ai/css/style.css
+++ b/htdocs/ai/css/style.css
@@ -17,7 +17,7 @@
     border: 1px solid #ccc;
     border-radius: 5px;
     cursor: pointer;
-    height: 80px;
+    height: 90px;
     display: flex;
     flex-direction: column; 
     align-items: center;
@@ -66,14 +66,25 @@
     margin-top: 10px;
   }
 
-  .template-option i {
+  .template-option[data-template="ai"] i {
     font-size: 42px; 
-    margin-bottom: 5px;
+    display: block; 
+    width: 80%; 
+    max-height: 80px; 
+    margin: 0 5px;
+    padding-top: 5px;
+    border-radius: 5px;
    
 }
+.template-option[data-template="ai"] span {
+  padding-top: 30px;
+  font-size: 14px; 
+
+}
+
 .template-option-text {
-  padding-top: 5px;
-  font-size: 12px; 
+  padding-top: 3px;
+  font-size: 14px; 
 }
 
 #ai_input {
@@ -82,8 +93,9 @@
 
 .template-option img {
   display: block; 
-  width: 100%; 
-  height: 100%; 
+  width: 80%; 
+  max-height: 80px; 
   margin: 0 5px;
- padding: auto;
+  padding-top: 5px;
+  border-radius: 7px;
 }
\ No newline at end of file
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 83f3edbb9d1..54f69f0e5fa 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1463,11 +1463,11 @@ class FormMail extends Form
 		$templates = array('empty', 'basic', 'news', 'commerce', 'text');
 		foreach ($templates as $template) {
 			$out .= '<div class="template-option" data-template="'.$template.'">';
-			$out .= '<img alt="Gray rectangle" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC" />';
-			$out .= ucfirst($template);
+			$out .= '<img alt="'.$template.'" src="'.DOL_URL_ROOT.'/theme/common/mailtemplate/'.$template.'.png" />';
+			$out .= '<span class="template-option-text">'.ucfirst($template).'</span>';
 			$out .= '</div>';
 		}
-		$out .= '<div class="template-option" data-template="ai"><i class="fas fa-edit"></i>Generate with AI</div>';
+		$out .= '<div class="template-option" data-template="ai"><i class="fas fa-edit"></i><span >Generate with AI</span></div>';
 		$out .= '</div>';
 		$out .= '</td></tr>';
 		$out .= "<script type='text/javascript'>
diff --git a/htdocs/theme/common/mailtemplate/basic.png b/htdocs/theme/common/mailtemplate/basic.png
new file mode 100644
index 0000000000000000000000000000000000000000..a96a07e7d769be89b29d60efa59650e89d29d8c6
GIT binary patch
literal 1400
zcmV-;1&8{HP)<h;3K|Lk000e1NJLTq004CW003zS0{{R3GtQiD0000&P)t-s|NsBh
z+1ujd<>lt+wa(ko)Ytv}{r~>|{Qv*6(Av4p*sis=>h13N`~BqU>g)FWxy#hN(cIqQ
z<L~hDx4XT-&C(}G_DKK$1o25kK~!ko#hQzPqaX}LQKx}AMy=HU|J5ach=`8X*u5z3
zxYg6}2mvaT_<sU4g0D$POO;;JZF!S*(!Ln{m3Wp)xA<*CrDCd@=-_M(B`y=er6h%N
z+$B{eRCeX5Ugm}(aTl@LqpBeP4gF~={=y;ls7j$p%ATprlOG?mDH*D{-`%7&RoXUe
zPKE6_j(trUd)73TRElxGO{u-(a;onwRc%ro^C!{sn(DD~EoPItMqZ_wr~7?sorPYu
zwQto1RXHj#=-^D2sy3<K)aMVc>T%OnuvA~7>j%%IbsKinqzxMvV!%|wQ$=1%tFPP-
zh6#b`sn+33qCUAxH&EwTVS`$8WB;U@kFZng=Mh^kchJ;N94KL9D=+kU%+{LO*5`qG
zy#cymtBD>l*vj67pM7au1W4E`;hv#h6F+RIG`mQt<fX8Ey`HvWU(6a?+@ON&Dqq5V
z|I=SP6H&d+@peo_=-ScQTASWu4x4>?jgqlqpr|RSR~mz8TGvdrnqlIHLYe-vs|kbR
zRQIE`6>w!Mn3-f}s^IxDSXUeVa{3znUAwb>6^*IaOdA#w<sux`SFR!RcUuz?W2V1S
z#rl}vHaC}lcnz6<m&rg$k;cP<sGx+pLn0c`6RNv!XI~-;aIUUA(0nfXGocFj#<B>e
zR9grtn&h&UF*-w6RJy6KVOHC^YlRlDDq*q{^~0-RN_1Fh^L8m@mfAdS(%6#6UCkuj
zaTm3CG}hMR)bXP{RU1`mO4UVF9qufO!d*`1_Q^?=%y<dq4nv(Z_>)Ja&iW=x1&o%Z
z+@SmUvR2glh0qw>-_lDcKL*TRLikLaP85atSIq1z)p`Hrv)7%{!YSvdWGN_?WDfH}
z5D8r-R2t=t>(G@~dr?(ud?4(t6U$&dXg<GCXd#bLXOFn@r)NE&^}O5GPE^XVbzies
zx$(2Iwwh4v5Vc_~;b=VFqY6El$soPI>mcVwjb&L5r1GMgw(JhHVL6ZW6q{y0dGxRu
z?v!ujhr=vH@r8(~TY?N#`bd)2+s#)1a*;5lGy5oOiNrZY+bLljP`5{^@g|P6+jX}{
z=BYNK!1g9JT4viYSn6<-Dh-?S9KfA1r#f@4M8SmIpmuZ6o*w5?(@t;kxrR(EK^w1O
z4u;vyD<zL7zmq%Xa>F;d|2P<neB5DjemJsGEM~per;rdigrvU$Hc@r(P3+9sg>h{~
zMI1_#hVq`C19{&x_neYhmMSw;>-#CVvk@M%G;VlAD)kV2v;Q0eHmHl9!#>7rjIVOq
zN55sH!<~^1!fJ?SR)cYGO?ystmvnwk7x&leG2*)CESyBn)*E_GvmEG>)`W0R5Tg(E
z9LcMlXwCIx1-T9z*U2jM`aDLI_RTh+*z2z@rUT@my1BZ*Y8VP?!@1d^y+3FXegMW4
z4`cIw|Nj2IZEp4UDd=5v94pBSYWe%83gqyZ@g$@h-dnKuWbuQjz(%Ft5Db6YI?^5q
za#1A`_5COHVRvT!gRO|_+tf$L*_x=w9x7o?-iymOk<Z(<^&K)p<+IhVaviaCZ_Vs1
z)vaE>L-*X!IH1^FT{%l7@2{Jtvb#Qsrdg>83TWhF^!~ONN+EV9Q(#A8<n+UTd@c;o
zoPPKiRSKcLM-5!|^`_%x{C%qY8Wke$7j1>fAG!6Fi|BtWWc~$RwH=870000<MNUMn
GLSTaCaoLjq

literal 0
HcmV?d00001

diff --git a/htdocs/theme/common/mailtemplate/commerce.png b/htdocs/theme/common/mailtemplate/commerce.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a5dd14c3ad7cc9d68604845dcc1ba4c4aa31446
GIT binary patch
literal 2490
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
Eg3P!I{Qv*}

literal 0
HcmV?d00001

diff --git a/htdocs/theme/common/mailtemplate/empty.png b/htdocs/theme/common/mailtemplate/empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..458ad61630fa91b592b592bb309c10796eb2ab20
GIT binary patch
literal 2150
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/common/mailtemplate/news.png b/htdocs/theme/common/mailtemplate/news.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fc4146f509a907d175b08c644ea1e7cacdacdc7
GIT binary patch
literal 2346
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
QUjP6A07*qoM6N<$f)=2#oB#j-

literal 0
HcmV?d00001

diff --git a/htdocs/theme/common/mailtemplate/text.png b/htdocs/theme/common/mailtemplate/text.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b8966e811731efe617d34ea4dd8c9b8e7012c1f
GIT binary patch
literal 1183
zcmV;Q1YrA#P)<h;3K|Lk000e1NJLTq004Oa003+R0{{R3yw3nq0000aP)t-s|NsB~
z|NsB~{^8^0<mTw;>Fe+C^3v4S`~3X)`ux_|+4J`Iz?u_F000CwNkl<ZSi`MYJ&)T)
z5FKvC>qHj88gBMj@zRP{#AT>Ukur!BBW{EwR+Q)m2w+7r39y2jgPjBtu5=+l6>T2`
z*!pvsC3Vm)NsF_*Jc_~rr^lV0H(yKOYuOtqWS-|iPYeLb0~eo@=ef)SI|v8@09WE4
zgMl}&URymuu^nYZKXx9#BiMNNXR~VQzU*pgYw0RB9LZD+{x`PTH23Zfi^HCXgUP=1
zy-&O4Zo8x*d2X;XkN>)~z*lwlkK65Tmyobrehqnzz1vbPPm=GL6pyhyOf|1@^qK{p
zgPR(Ptv8$XYD0uz^27$|UlQY_1Q>dw2Ll?r8Rvo8g!}Jo_HuR(6TBBGq)j%a_$SnR
zyGuU%*(y1cdE43m7bL}!X$zZyxcEKkAmZXlQnawqZ5KZ*w}c>@x@il0jck(TZj0pt
z!Y{kx3)5r!_Qk`}EY<c6LGDTUx}$f5m>R5VB8KG{>ZFPkmJ#a8yvFu3DZAQf{;((u
zYHaoFth*Yr{A9Rkc^BE^qViVLYZ>RAUb~WN&r+^l1Ehvxe~l40;|_d}_sj9*BfzOL
zxmX_VN25_ZJda3y#ltwByF!Z=WPcda5zY0r8TzcWeA02D)#@6**Y~Z8YN!O=tj}Mo
zjk@GY)Y-OOFf}aC5M(-pV0vx8Kpbe;-|9Xu6^jv6r_Y%lscy!9woq(1ceO6aSXM?0
z71sqA(IP!^7ed^nMrA^FnPQkK-M}A0gPk3L|2_Z7vb@25b+CYGIeHDVBrXvRJ3et_
zdaYC}>a7@7nm2J2QKKa)j5x<U!Fsc@QA}u6Q8=OGs_vm2I0AX+zB0dFQ-#xiPE~BB
z*vEdcR(fqTqPqP0y-`zfb}03x(tm=$WdA~_$Painb)~j%CY+~>#eP4dVSif=ni|{Y
zT;hY&ea^s96*(g-CiRNUfZ5dKCn7Xr4ctG_=j75<xT(><-M=mB+PBj>`;ARaoibst
zFQ{sjxHTeGrj8%-EGM7ZjVuZ6b4>HOD7z>pE0zK?75isQ$E48DV~YJ@7~4!9Eqcdv
zwxO6{f8Nle<(tCrIm@kl{v<Wo_KF!fX18{I%Ej~8WHKQ~YCX>HBa0+!<e1H*IV@b!
zKfiAZR;z1VwL#)rxmPWUVUkc&6zXg>&)C#d)AFZkf+PyIsP*q-mP9mQA2Xu`yWq3o
zTY49)#oGPoW;7-%R%hSY%xl7kwJJ-<b<G7SS~8Sek@YT!vzx2N5z@@Ef9Iw33=OGS
zay^<i*;n)&d*L_O^c;(RtIulzIA2hsboQ>sX7cEBzgsPi^GOOVHI-8o!&829-{snz
zaCvQPMIRg|u4)(j6nld+Z-S4NLYvndlT2a5=|?OG`6c&!b^Ot1g>&pWoI&-Ze(Y*K
x=*=d*KmYvNk7D;<+qv@OWjWLp<{LSK{U6q9ERM|!*JA(x002ovPDHLkV1i<{P*MN@

literal 0
HcmV?d00001


From 70b9a06986f372ef446fe2d6d22fd37d3d9d5a61 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Mon, 29 Jan 2024 19:04:06 +0100
Subject: [PATCH 17/38] qual: phpstan for htdocs/projet/tasks/stats/index.php

htdocs/projet/tasks/stats/index.php	83	Property Stats::$year (int) does not accept array|string.
htdocs/projet/tasks/stats/index.php	125	Property Stats::$year (int) does not accept array|string.
---
 htdocs/projet/tasks/stats/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index eb720c69f74..2c402efac39 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -45,7 +45,7 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$year = GETPOST('year') > 0 ? GETPOST('year') : $nowyear;
+$year = GETPOSTINT('year') > 0 ? GETPOSTINT('year') : $nowyear;
 $startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 

From 98622106816d76c167e79ef89d1438bce77f1245 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Mon, 29 Jan 2024 19:06:19 +0100
Subject: [PATCH 18/38] qual: phpstan for htdocs/projet/tasks/task.php

htdocs/projet/tasks/task.php	114	Property Task::$budget_amount (float) does not accept string.
---
 htdocs/projet/tasks/task.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index c9a6c4d3aa4..215bfa7f072 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -111,7 +111,7 @@ if ($action == 'update' && !GETPOST("cancel") && $user->hasRight('projet', 'cree
 		$object->date_start = dol_mktime(GETPOST('date_starthour', 'int'), GETPOST('date_startmin', 'int'), 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
 		$object->date_end = dol_mktime(GETPOST('date_endhour', 'int'), GETPOST('date_endmin', 'int'), 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
 		$object->progress = price2num(GETPOST('progress', 'alphanohtml'));
-		$object->budget_amount = price2num(GETPOST('budget_amount', 'alphanohtml'));
+		$object->budget_amount = GETPOSTFLOAT('budget_amount');
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');

From c0d8da34d4957204e297dd7317c689c35b43cc48 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Mon, 29 Jan 2024 22:36:23 +0100
Subject: [PATCH 19/38] qual: phpdoc for htdocs/core/class/utils.class.php

---
 htdocs/core/class/utils.class.php | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index ec3c4d15505..029e8de6a7b 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -31,15 +31,30 @@
 class Utils
 {
 	/**
-	 * @var DoliDB Database handler.
+	 * @var DoliDB      Database handler
 	 */
 	public $db;
 
+	/**
+	 * @var string      Error message
+	 * @see             $errors
+	 */
 	public $error;
+
+	/**
+	 * @var string[]    Array of error messages
+	 */
 	public $errors;
 
-	public $output; // Used by Cron method to return message
-	public $result; // Used by Cron method to return data
+	/**
+	 * @var string      Used by Cron method to return message
+	 */
+	public $output;
+
+	/**
+	 * @var array{'commandbackuplastdone': string, 'commandbackuptorun': string}      Used by Cron method to return data
+	 */	
+	public $result;
 
 	/**
 	 *	Constructor

From ce5130c4d0e45e4cefb04276ae55244ee223f2fd Mon Sep 17 00:00:00 2001
From: ATM-Lucas <lucas.mantegari@atm-consulting.fr>
Date: Tue, 30 Jan 2024 09:18:26 +0100
Subject: [PATCH 20/38] fix false js

---
 htdocs/bom/tpl/objectline_create.tpl.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 9c59338fa69..b33d1729b0a 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -254,9 +254,7 @@ jQuery(document).ready(function() {
 					,'idproduct' : idproduct
 				}
 			}).done(function(data) {
-				var data = JSON.parse(data);
 				$('#idworkstations').val(data.defaultWk).select2();
-
 			});
 	});
 	<?php } ?>

From 11d985e24fd2745df97e1517a7294e6f98f15e18 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 30 Jan 2024 15:37:52 +0100
Subject: [PATCH 21/38] generate html model for each box

---
 htdocs/core/class/html.formmail.class.php |  26 ++-
 htdocs/core/lib/modelemail.lib.php        | 185 ++++++++++++++++++++++
 2 files changed, 208 insertions(+), 3 deletions(-)
 create mode 100644 htdocs/core/lib/modelemail.lib.php

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 54f69f0e5fa..7ad760bccf5 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -29,6 +29,8 @@
  *       \brief      Fichier de la class permettant la generation du formulaire html d'envoi de mail unitaire
  */
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/modelemail.lib.php';
+
 
 
 /**
@@ -1460,9 +1462,19 @@ class FormMail extends Form
 		$out .= '</td>';
 		$out .= '<td>';
 		$out .= '<div id="template-selector" class="template-container">';
-		$templates = array('empty', 'basic', 'news', 'commerce', 'text');
-		foreach ($templates as $template) {
-			$out .= '<div class="template-option" data-template="'.$template.'">';
+		$templates = array(
+			'empty' => 'empty_template',
+			'basic' => 'basic_template',
+			'news'  => 'news_template',
+			'commerce' => 'commerce_template',
+			'text' => 'text_template'
+		);
+
+		foreach ($templates as $template => $templateFunction) {
+			if (function_exists($templateFunction)) {
+				$contentHtml = $templateFunction();
+			}
+			$out .= '<div class="template-option" data-template="'.$template.'" data-content="'.htmlentities($contentHtml).'">';
 			$out .= '<img alt="'.$template.'" src="'.DOL_URL_ROOT.'/theme/common/mailtemplate/'.$template.'.png" />';
 			$out .= '<span class="template-option-text">'.ucfirst($template).'</span>';
 			$out .= '</div>';
@@ -1483,6 +1495,13 @@ class FormMail extends Form
 						$(this).addClass('selected');
 
 						var template = $(this).data('template');
+						var contentHtml = $(this).data('content');
+						
+						var editorInstance = CKEDITOR.instances.message;
+						if (editorInstance) {
+							editorInstance.setData(contentHtml);
+						}
+						// display input for gnerate with IA
 						if(template === 'ai') {
 							$('#ai_input').show();
 						} else {
@@ -1496,6 +1515,7 @@ class FormMail extends Form
 	}
 
 
+
 	/**
 	 *  Return templates of email with type = $type_template or type = 'all'.
 	 *  This search into table c_email_templates. Used by the get_form function.
diff --git a/htdocs/core/lib/modelemail.lib.php b/htdocs/core/lib/modelemail.lib.php
new file mode 100644
index 00000000000..a03c8e4c58e
--- /dev/null
+++ b/htdocs/core/lib/modelemail.lib.php
@@ -0,0 +1,185 @@
+<?php
+/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2018 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024      Alexandre Janniaux   <alexandre.janniaux@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *		\file       htdocs/core/lib/emailmodel.lib.php
+ *
+ *		\brief      File for getting email html models
+ */
+
+/**
+ * get empty html
+ * @return string  $out  html content
+ */
+function empty_template()
+{
+	$out = '';
+	return $out;
+}
+
+/**
+ * get basic html
+ * @return string  $out  html content
+ */
+function basic_template()
+{
+	$out = '
+            <div >
+            <div >
+            <img alt="Gray rectangle" style="margin-left:150px;" width="800px" height="100px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC" />
+            </div>
+            <h3 style="margin-left:150px;">Lorem, ipsum dolor sit amet consectetur adipisicing elit.</h3>
+            <h3 style="margin-left:150px;">Lorem, ipsum dolor sit amet consectetur</h3>
+            <!-- Les paragraphes de texte -->
+            <div class="email-template-text">
+            <p style="margin-left:150px;">Lorem, ipsum dolor sit amet consectetur adipisicing elit. Aperiam non blanditiis delectus accusamus reprehenderit voluptates repellat.<br> Excepturi illo delectus nisi labore, iste voluptatibus dignissimos explicabo, corrupti voluptatum et facere cum?</p>
+            </div>
+            <div class="email-template-text">
+            <p style="margin-left:150px;">Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+            </div>
+            <div class="email-template-text">
+            <p style="margin-left:150px;">Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
+            </div>
+
+            <img alt="Gray rectangle" style="margin-left:150px;" width="15%" height="50px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC" />
+
+        </div>';
+	return $out;
+}
+
+/**
+ * get news html
+ * @return string  $out  html content
+ */
+function news_template()
+{
+	$out = '
+        <h1 style="margin-left:120px;">Lorem, ipsum dolor sit amet consectetur adipisicing elit sit amet consectetur</h1>
+        <h2 style="margin-left:120px;">Lorem, ipsum dolor sit amet consectetur adipisicing elitsit amet consectetur adipisicing </h2>
+
+        <div style="display: flex; align-items: center; justify-content: start; width: 100%; max-width: 600px;margin-top:0">
+            <div style="flex-grow: 1; margin-right: 10px; margin-left:120px;width:200px">
+            <h2>Lorem ipsum dolor sit amet, consectetur Lorem ipsum dolor sit amet, consectetur</h2>
+
+                Lorem ipsum dolor sit amet, consectetur
+                adipiscing elit. Sed do eiusmod temxwshslkdsdsslpor incididunt ut labore et dolore magna <br>aliqua. Lorem, ipsum dolor sit amet consectetur adipisicing elit. Totam sit<br> autem nihil omnis! Odit ipsum repellat, voluptas accusantium dolores adipisci ut voluptates eius cumque dicta obcaecati
+                <img alt="Gray rectangle" style="margin-top:10px"   width="15%" height="20px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC" />
+
+            </div>
+            <div style="flex-shrink: 0;">
+                <!-- Ici, ajoutez votre image -->
+                <img alt="Gray rectangle" style="" width="130px" height="130px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC" />
+            </div>
+        </div>
+
+        <div style="display: flex; align-items: center; justify-content: start; width: 100%; max-width: 600px;margin-top:40px">
+            <div style="flex-grow: 1; margin-right: 10px; margin-left:120px;width:200px">
+            <h2>Lorem ipsum dolor sit amet, consectetur Lorem ipsum dolor sit amet, consectetur</h2>
+
+                Lorem ipsum dolor sit amet, consectetur
+                adipiscing elit. Sed do eiusmod temxwshslkdsdsslpor incididunt ut labore et dolore magna <br>aliqua. Lorem, ipsum dolor sit amet consectetur adipisicing elit. Totam sit<br> autem nihil omnis! Odit ipsum repellat, voluptas accusantium dolores adipisci ut voluptates eius cumque dicta obcaecati
+                <img alt="Gray rectangle" style="margin-top:10px"   width="15%" height="20px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC" />
+
+            </div>
+            <div style="flex-shrink: 0;">
+                <!-- Ici, ajoutez votre image -->
+                <img alt="Gray rectangle" style="" width="130px" height="130px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC" />
+            </div>
+        </div>';
+	return $out;
+}
+
+/**
+ * get commerce html
+ * @return string  $out  html content
+ */
+function commerce_template()
+{
+	$out = '
+    <h1 style="margin-left:120px;">Lorem, ipsum dolor sit amet consectetur adipisicing elit sit amet consectetur</h1>
+    <h2 style="margin-left:120px;">Lorem, ipsum dolor sit amet consectetur adipisicing elitsit amet consectetur adipisicing </h2>
+
+    <div style="font-family: Arial, sans-serif; background-color: #f7f7f7; padding: 16px; max-width: 600px; margin: 0 auto; box-sizing: border-box;">
+    <div style="display: flex;">
+        <div style="margin-bottom: 50px; flex: 1; padding-right: 8px;">
+            <div>
+                <img alt="Gray rectangle" style="margin-left:120px;margin-top:30px;" width="350px" height="100px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC" />
+            </div>
+            <div style="margin-left:120px;background-color: #e0e0e0; padding: 8px; margin-bottom: 8px; text-indent: 50px;">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit<br>Lorem ipsum dolor sit amet, consectetur adipiscing elit...
+            </div>
+        </div>
+
+            <br><br>
+        <div style="margin-bottom: 10px; flex: 1; padding-left: 8px;">
+            <div>
+                <img alt="Gray rectangle" style="margin-left:120px;margin-top:30px;" width="350px" height="100px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC" />
+            </div>
+                <div style="margin-left:120px;background-color: #e0e0e0; padding: 8px; margin-bottom: 8px; text-indent: 50px;">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit<br>Lorem ipsum dolor sit amet, consectetur adipiscing elit...
+            </div>
+        </div>	  
+    </div>	 
+    <div style="display: flex;">
+        <div style="margin-bottom: 50px; flex: 1; padding-right: 8px;">
+            <div>
+                <img alt="Gray rectangle" style="margin-left:120px;margin-top:30px;" width="350px" height="100px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC" />
+            </div>
+            <div style="margin-left:120px;background-color: #e0e0e0; padding: 8px; margin-bottom: 8px; text-indent: 50px;">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit<br>Lorem ipsum dolor sit amet, consectetur adipiscing elit...
+            </div>
+        </div>
+
+            <br><br>
+        <div style="margin-bottom: 10px; flex: 1; padding-left: 8px;">
+            <div>
+                <img alt="Gray rectangle" style="margin-left:120px;margin-top:30px;" width="350px" height="100px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC" />
+            </div>
+                <div style="margin-left:120px;background-color: #e0e0e0; padding: 8px; margin-bottom: 8px; text-indent: 50px;">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit<br>Lorem ipsum dolor sit amet, consectetur adipiscing elit...
+            </div>
+        </div>	  
+    </div>	 
+  </div>
+      
+  ';
+	return $out;
+}
+
+/**
+ * get basic html
+ * @return string  $out  html content
+ */
+function text_template()
+{
+	$out = '
+        <h1 style="margin-left:150px">Lorem ipsum dolor sit amet consectetur adipisicing elit sit amet consectetur adipisicing elit.</h1>
+        <h3 style="margin-left:150px">Lorem ipsum dolor sit amet consectetur adipisicing elit sit amet consectetur adipisicing elit.</h3>
+        <p style="margin-left:150px">
+        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic nam consequuntur id harum pariatur, quo illo quaerat minima tempore.
+        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic nam consequuntur id harum pariatur, quo illo quaerat minima tempore.
+        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic nam consequuntur id harum pariatur, quo illo quaerat minima tempore.
+        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic nam consequuntur id harum pariatur, quo illo quaerat minima tempore.
+        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic nam consequuntur id harum pariatur, quo illo quaerat minima tempore.
+        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic nam consequuntur id harum pariatur, quo illo quaerat minima tempore.
+        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic nam consequuntur id harum pariatur, quo illo quaerat minima tempore.
+        </p>';
+
+	return $out;
+}

From 9ef70a70be6feb78688bf44c177741b9b09d2916 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 30 Jan 2024 15:51:38 +0100
Subject: [PATCH 22/38] fix orthographe

---
 htdocs/core/class/html.formmail.class.php |  2 +-
 htdocs/core/lib/modelemail.lib.php        | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 7ad760bccf5..546b020a2f2 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1501,7 +1501,7 @@ class FormMail extends Form
 						if (editorInstance) {
 							editorInstance.setData(contentHtml);
 						}
-						// display input for gnerate with IA
+						// display input for generate with IA
 						if(template === 'ai') {
 							$('#ai_input').show();
 						} else {
diff --git a/htdocs/core/lib/modelemail.lib.php b/htdocs/core/lib/modelemail.lib.php
index a03c8e4c58e..c752658744b 100644
--- a/htdocs/core/lib/modelemail.lib.php
+++ b/htdocs/core/lib/modelemail.lib.php
@@ -172,13 +172,13 @@ function text_template()
         <h1 style="margin-left:150px">Lorem ipsum dolor sit amet consectetur adipisicing elit sit amet consectetur adipisicing elit.</h1>
         <h3 style="margin-left:150px">Lorem ipsum dolor sit amet consectetur adipisicing elit sit amet consectetur adipisicing elit.</h3>
         <p style="margin-left:150px">
-        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic nam consequuntur id harum pariatur, quo illo quaerat minima tempore.
-        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic nam consequuntur id harum pariatur, quo illo quaerat minima tempore.
-        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic nam consequuntur id harum pariatur, quo illo quaerat minima tempore.
-        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic nam consequuntur id harum pariatur, quo illo quaerat minima tempore.
-        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic nam consequuntur id harum pariatur, quo illo quaerat minima tempore.
-        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic nam consequuntur id harum pariatur, quo illo quaerat minima tempore.
-        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic nam consequuntur id harum pariatur, quo illo quaerat minima tempore.
+        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic name consequuntur id harum pariatur, quo illo quaerat minima tempore.
+        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic name consequuntur id harum pariatur, quo illo quaerat minima tempore.
+        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic name consequuntur id harum pariatur, quo illo quaerat minima tempore.
+        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic name consequuntur id harum pariatur, quo illo quaerat minima tempore.
+        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic name consequuntur id harum pariatur, quo illo quaerat minima tempore.
+        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic name consequuntur id harum pariatur, quo illo quaerat minima tempore.
+        Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic name consequuntur id harum pariatur, quo illo quaerat minima tempore.
         </p>';
 
 	return $out;

From ae6a7a205219db9ce5828f03dcfce86f51e954dc Mon Sep 17 00:00:00 2001
From: ATM-Lucas <lucas.mantegari@atm-consulting.fr>
Date: Tue, 30 Jan 2024 16:41:01 +0100
Subject: [PATCH 23/38] trouble with jsonparse

---
 htdocs/bom/tpl/objectline_create.tpl.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index b33d1729b0a..49c4bb474bc 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -241,7 +241,6 @@ jQuery(document).ready(function() {
 			}).done(function(data) {
 
 				console.log(data);
-				var data = JSON.parse(data);
 				$("#fk_unit").val(data).change();
 			});
 

From df60be8abc101af3ab0a6b1d534d249bdacacb6c Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 30 Jan 2024 17:34:40 +0100
Subject: [PATCH 24/38] phpcs

---
 htdocs/core/class/utils.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 029e8de6a7b..3a1e6e34a96 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -53,7 +53,7 @@ class Utils
 
 	/**
 	 * @var array{'commandbackuplastdone': string, 'commandbackuptorun': string}      Used by Cron method to return data
-	 */	
+	 */
 	public $result;
 
 	/**

From 5ebc760e0484623420723d2de8733006064f163e Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 30 Jan 2024 17:36:55 +0100
Subject: [PATCH 25/38] qual Update functions.lib.php - clearer return for
 roundUpToNextMultiple()

---
 htdocs/core/lib/functions.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6f5ecc7711b..bba253bcaf8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -11369,7 +11369,7 @@ function isVisibleToUserType($type_user, &$menuentry, &$listofmodulesforexternal
  */
 function roundUpToNextMultiple($n, $x = 5)
 {
-	$result = (ceil($n) % $x === 0) ? ceil($n) : round(($n + $x / 2) / $x) * $x;
+	$result = (ceil($n) % $x === 0) ? ceil($n) : (round(($n + $x / 2) / $x) * $x);
 	return (int) $result;
 }
 

From bb2ca75c4685324115aa34c09e1c5c68d4344501 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 30 Jan 2024 17:49:58 +0100
Subject: [PATCH 26/38] qual: Update FunctionsLibTest.php - add unit test for
 roundUpToNextMultiple()

see remarks from PR 27865
---
 test/phpunit/FunctionsLibTest.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index ce34604cc32..b28e945e28d 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -1797,4 +1797,29 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 
 		return true;
 	}
+
+
+	/**
+	 * testRoundUpToNextMultiple
+	 *
+	 * @return void;
+	 */
+	public function testRoundUpToNextMultiple()
+	{
+		$this->assertEquals(roundUpToNextMultiple(39.5), 40);
+		$this->assertEquals(roundUpToNextMultiple(40), 40);
+		$this->assertEquals(roundUpToNextMultiple(40.4), 45);
+		$this->assertEquals(roundUpToNextMultiple(40.5), 45);
+		$this->assertEquals(roundUpToNextMultiple(44.5), 45);
+
+		$this->assertEquals(roundUpToNextMultiple(39.5, 10), 40);
+		$this->assertEquals(roundUpToNextMultiple(40, 10), 40);
+		$this->assertEquals(roundUpToNextMultiple(40.5, 10), 50);
+		$this->assertEquals(roundUpToNextMultiple(44.5, 10), 50);
+
+		$this->assertEquals(roundUpToNextMultiple(39.5, 6), 42);
+		$this->assertEquals(roundUpToNextMultiple(40, 6), 42);
+		$this->assertEquals(roundUpToNextMultiple(40.5, 6), 42);
+		$this->assertEquals(roundUpToNextMultiple(44.5, 6), 48);
+	}
 }

From f83e18f53b06cd798703431b0f8aad6c7b6803f1 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 30 Jan 2024 18:06:11 +0100
Subject: [PATCH 27/38] qual: Update website.class.php - function
 replaceLineUsingNum()

function_exists('posix_getpwuid') is checked twice but not function_exists('posix_geteuid')
---
 htdocs/website/class/website.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 16e2625ddb6..fb711c31302 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -2078,7 +2078,7 @@ class Website extends CommonObject
 		$userId = fileowner($desfFile);
 		if ($userId !== false) {
 			// Obtain user information from the ID
-			if (function_exists('posix_getpwuid')&& function_exists('posix_getpwuid')) {
+			if (function_exists('posix_geteuid') && function_exists('posix_getpwuid')) {
 				$uid = posix_geteuid();
 				$userInfoM = posix_getpwuid($uid);
 

From 84e09093106a05033fd2a274067986f049fbeefc Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 30 Jan 2024 20:20:52 +0100
Subject: [PATCH 28/38] Update cregion.class.php

htdocs/core/class/cregion.class.php	97	Property CommonDict::$active (int) does not accept string.
htdocs/core/class/cregion.class.php	227	Property CommonDict::$active (int) does not accept string.
---
 htdocs/core/class/cregion.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/cregion.class.php b/htdocs/core/class/cregion.class.php
index 758ae9842bc..358935bb2a9 100644
--- a/htdocs/core/class/cregion.class.php
+++ b/htdocs/core/class/cregion.class.php
@@ -94,7 +94,7 @@ class Cregion extends CommonDict
 			$this->cheflieu = trim($this->cheflieu);
 		}
 		if (isset($this->active)) {
-			$this->active = trim($this->active);
+			$this->active = (int) $this->active;
 		}
 
 		// Check parameters
@@ -224,7 +224,7 @@ class Cregion extends CommonDict
 			$this->cheflieu = trim($this->cheflieu);
 		}
 		if (isset($this->active)) {
-			$this->active = trim($this->active);
+			$this->active = (int) $this->active;
 		}
 
 

From 5df55a0c34811b9e0ff2f795a413434c93990ef2 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 30 Jan 2024 20:22:55 +0100
Subject: [PATCH 29/38] Update cstate.class.php

htdocs/core/class/cstate.class.php	87	Property CommonDict::$active (int) does not accept string.
htdocs/core/class/cstate.class.php	197	Property CommonDict::$active (int) does not accept string.
---
 htdocs/core/class/cstate.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
index 99ad05c668a..8921689f2a1 100644
--- a/htdocs/core/class/cstate.class.php
+++ b/htdocs/core/class/cstate.class.php
@@ -84,7 +84,7 @@ class Cstate extends CommonDict
 			$this->nom = trim($this->nom);
 		}
 		if (isset($this->active)) {
-			$this->active = trim($this->active);
+			$this->active = (int) $this->active;
 		}
 
 		// Check parameters
@@ -194,7 +194,7 @@ class Cstate extends CommonDict
 			$this->name = trim($this->name);
 		}
 		if (isset($this->active)) {
-			$this->active = trim($this->active);
+			$this->active = (int) $this->active;
 		}
 
 		// Check parameters

From aa3085d7ad8fc1df3e493454bd51635ae4b09fe4 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 30 Jan 2024 20:25:46 +0100
Subject: [PATCH 30/38] Update ctypent.class.php

htdocs/core/class/ctypent.class.php	67	Property CommonDict::$id (int) does not accept string.
htdocs/core/class/ctypent.class.php	76	Property CommonDict::$active (int) does not accept string.
htdocs/core/class/ctypent.class.php	196	Property CommonDict::$activ
---
 htdocs/core/class/ctypent.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index b1d88898338..26c5e07b2cf 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -64,7 +64,7 @@ class Ctypent extends CommonDict
 		// Clean parameters
 
 		if (isset($this->id)) {
-			$this->id = trim($this->id);
+			$this->id = (int) $this->id;
 		}
 		if (isset($this->code)) {
 			$this->code = trim($this->code);
@@ -73,7 +73,7 @@ class Ctypent extends CommonDict
 			$this->libelle = trim($this->libelle);
 		}
 		if (isset($this->active)) {
-			$this->active = trim($this->active);
+			$this->active = (int) $this->active;
 		}
 		if (isset($this->module)) {
 			$this->module = trim($this->module);
@@ -193,7 +193,7 @@ class Ctypent extends CommonDict
 			$this->libelle = trim($this->libelle);
 		}
 		if (isset($this->active)) {
-			$this->active = trim($this->active);
+			$this->active = (int) $this->active;
 		}
 		if (isset($this->module)) {
 			$this->module = trim($this->module);

From fa21289257ee96adaede5108a2792805eea5f5dd Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 30 Jan 2024 20:27:07 +0100
Subject: [PATCH 31/38] Update ctyperesource.class.php

htdocs/core/class/ctyperesource.class.php	83	Property CommonDict::$active (int) does not accept string.
htdocs/core/class/ctyperesource.class.php	280	Property CommonDict::$active (int) does not accept string.
htdocs/core/class/ctyperesource.class.php	436	Property CommonDict::$active (int) does not accept string.
---
 htdocs/core/class/ctyperesource.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index 2b1a8cc26f1..717b7c43ec6 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -80,7 +80,7 @@ class Ctyperesource extends CommonDict
 			$this->label = trim($this->label);
 		}
 		if (isset($this->active)) {
-			$this->active = trim($this->active);
+			$this->active = (int) $this->active;
 		}
 
 		// Insert request
@@ -277,7 +277,7 @@ class Ctyperesource extends CommonDict
 			$this->label = trim($this->label);
 		}
 		if (isset($this->active)) {
-			$this->active = trim($this->active);
+			$this->active = (int) $this->active;
 		}
 
 		// Check parameters
@@ -433,7 +433,7 @@ class Ctyperesource extends CommonDict
 
 		$this->code = '';
 		$this->label = '';
-		$this->active = '';
+		$this->active = 0;
 	}
 }
 

From 0d395aa0824f7c74169ed02ae7f1c4a387898587 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 30 Jan 2024 20:31:05 +0100
Subject: [PATCH 32/38] Update cunits.class.php

htdocs/core/class/cunits.class.php	88	Property CommonDict::$active (int) does not accept string.
htdocs/core/class/cunits.class.php	91	Property CommonDict::$active (int) does not accept string.
htdocs/core/class/cunits.class.php	321	Property CommonDict::$active (int) does not accept string.
---
 htdocs/core/class/cunits.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index cd16e4edeac..4a5326d719e 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -88,7 +88,7 @@ class CUnits extends CommonDict
 			$this->active = trim($this->unit_type);
 		}
 		if (isset($this->active)) {
-			$this->active = trim($this->active);
+			$this->active = (int) $this->active;
 		}
 		if (isset($this->scale)) {
 			$this->scale = trim($this->scale);
@@ -318,7 +318,7 @@ class CUnits extends CommonDict
 			$this->scale = trim($this->scale);
 		}
 		if (isset($this->active)) {
-			$this->active = trim($this->active);
+			$this->active = (int) $this->active;
 		}
 
 		// Check parameters

From 83e90c65c2cf0496d6d57f67f5eda351127d6a77 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 30 Jan 2024 21:12:19 +0100
Subject: [PATCH 33/38] qual: phpstan for htdocs/compta/tva/class/tva.class.php

htdocs/compta/tva/class/tva.class.php	88	PHPDoc type int|string of property Tva::$totalpaid is not covariant with PHPDoc type float of overridden property CommonObject::$totalpaid.
htdocs/compta/tva/class/tva.class.php	429	Property Tva::$fk_bank (int) does not accept string.
htdocs/compta/tva/class/tva.class.php	430	Property Tva::$fk_user_creat (int) does not accept string.
htdocs/compta/tva/class/tva.class.php	431	Property Tva::$fk_user_modif (int) does not accept string.
htdocs/compta/tva/class/tva.class.php	579	Property Tva::$datec (DateTime) does not accept int.
---
 htdocs/compta/tva/class/tva.class.php | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index f5ab07a82e8..1684bd9a96d 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -63,7 +63,7 @@ class Tva extends CommonObject
 	public $num_payment;
 
 	/**
-	 * @var DateTime
+	 * @var int     Creation date
 	 */
 	public $datec;
 
@@ -82,11 +82,6 @@ class Tva extends CommonObject
 	 */
 	public $rappro;
 
-	/**
-	 * @var integer|string totalpaid
-	 */
-	public $totalpaid;
-
 	/**
 	 * @var string label
 	 */
@@ -426,9 +421,9 @@ class Tva extends CommonObject
 		$this->amount = '';
 		$this->label = '';
 		$this->note = '';
-		$this->fk_bank = '';
-		$this->fk_user_creat = '';
-		$this->fk_user_modif = '';
+		$this->fk_bank = 0;
+		$this->fk_user_creat = 0;
+		$this->fk_user_modif = 0;
 	}
 
 

From 7546063a8e99191bcac5af544c64ec05f5b668b9 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 30 Jan 2024 21:22:21 +0100
Subject: [PATCH 34/38] Update ccountry.class.php

htdocs/core/class/ccountry.class.php	76	Property CommonDict::$active (int) does not accept string.
htdocs/core/class/ccountry.class.php	198	Property CommonDict::$active (int) does not accept string.
---
 htdocs/core/class/ccountry.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index 0a065041efe..179eaaf2edb 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -73,7 +73,7 @@ class Ccountry extends CommonDict
 			$this->label = trim($this->label);
 		}
 		if (isset($this->active)) {
-			$this->active = trim($this->active);
+			$this->active = (int) $this->active;
 		}
 
 		// Check parameters
@@ -195,7 +195,7 @@ class Ccountry extends CommonDict
 			$this->label = trim($this->label);
 		}
 		if (isset($this->active)) {
-			$this->active = trim($this->active);
+			$this->active = (int) $this->active;
 		}
 
 

From 3d5fd010b4cd08866914df6087d4f58e483df956 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 30 Jan 2024 21:25:01 +0100
Subject: [PATCH 35/38] Update cgenericdic.class.php

htdocs/core/class/cgenericdic.class.php	100	Property CGenericDic::$active (int) does not accept string.
htdocs/core/class/cgenericdic.class.php	324	Property CGenericDic::$active (int) does not accept string.
---
 htdocs/core/class/cgenericdic.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/cgenericdic.class.php b/htdocs/core/class/cgenericdic.class.php
index f488ab75937..7e163c56acb 100644
--- a/htdocs/core/class/cgenericdic.class.php
+++ b/htdocs/core/class/cgenericdic.class.php
@@ -97,7 +97,7 @@ class CGenericDic extends CommonDict
 			$this->label = trim($this->label);
 		}
 		if (isset($this->active)) {
-			$this->active = trim($this->active);
+			$this->active = (int) $this->active;
 		}
 
 		// Insert request
@@ -321,7 +321,7 @@ class CGenericDic extends CommonDict
 			$this->label = trim($this->label);
 		}
 		if (isset($this->active)) {
-			$this->active = trim($this->active);
+			$this->active = (int) $this->active;
 		}
 
 		// Check parameters

From 009ab57586151cb73ad45a5ac1df8386e63eff30 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 30 Jan 2024 22:05:15 +0100
Subject: [PATCH 36/38] qual: phpstan for htdocs/ecm/class/ecmfiles.class.php

htdocs/ecm/class/ecmfiles.class.php	665	Property EcmFiles::$entity (int) does not accept string.
htdocs/ecm/class/ecmfiles.class.php	693	Property EcmFiles::$fk_user_m (int) does not accept string.
htdocs/ecm/class/ecmfiles.class.php	982	Property EcmFiles::$fk_user_m (int) does not accept string.
---
 htdocs/ecm/class/ecmfiles.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index aa0b89ff9b0..5e1c0107cfa 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -662,7 +662,7 @@ class EcmFiles extends CommonObject
 			$this->share = trim($this->share);
 		}
 		if (isset($this->entity)) {
-			$this->entity = trim($this->entity);
+			$this->entity = (int) $this->entity;
 		}
 		if (isset($this->filename)) {
 			$this->filename = preg_replace('/\.noexe$/', '', trim($this->filename));
@@ -690,7 +690,7 @@ class EcmFiles extends CommonObject
 			$this->extraparams = trim($this->extraparams);
 		}
 		if (isset($this->fk_user_m)) {
-			$this->fk_user_m = trim($this->fk_user_m);
+			$this->fk_user_m = (int) $this->fk_user_m;
 		}
 		if (isset($this->acl)) {
 			$this->acl = trim($this->acl);
@@ -979,7 +979,7 @@ class EcmFiles extends CommonObject
 		$this->date_c = (dol_now() - 3600 * 24 * 10);
 		$this->date_m = '';
 		$this->fk_user_c = $user->id;
-		$this->fk_user_m = '';
+		$this->fk_user_m = $user->id;
 		$this->acl = '';
 		$this->src_object_type = 'product';
 		$this->src_object_id = 1;

From e3ef3996dbe7c51bba3c0e5bd92d00a09f9c6715 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 30 Jan 2024 22:19:43 +0100
Subject: [PATCH 37/38] qual: phpstan for htdocs/expedition/card.php

htdocs/expedition/card.php	761	Property ExpeditionLigne::$entrepot_id (int) does not accept array|string.
htdocs/expedition/card.php	762	Property ExpeditionLigne::$qty (float) does not accept array|string.
---
 htdocs/expedition/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index decb5ab0cf3..6bf40733ed9 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -758,8 +758,8 @@ if (empty($reshook)) {
 							$stockLocation = 0;
 							$qty = "qtyl".$line_id;
 							$line->id = $line_id;
-							$line->entrepot_id = GETPOST($stockLocation, 'int');
-							$line->qty = GETPOST($qty, 'int');
+							$line->entrepot_id = GETPOSTINT($stockLocation);
+							$line->qty = GETPOSTFLOAT($qty);
 							if ($line->update($user) < 0) {
 								setEventMessages($line->error, $line->errors, 'errors');
 								$error++;

From 3df2d3543f038deae001d5f5567845b81c46274f Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 30 Jan 2024 22:49:39 +0100
Subject: [PATCH 38/38] qual: phpstan for htdocs/cron/class/cronjob.class.php

htdocs/cron/class/cronjob.class.php	266	Property Cronjob::$frequency (int) does not accept string.
htdocs/cron/class/cronjob.class.php	269	Property Cronjob::$status (int) does not accept string.
htdocs/cron/class/cronjob.class.php	713	Property Cronjob::$frequency (int) does not accept string.
htdocs/cron/class/cronjob.class.php	716	Property Cronjob::$status (int) does not accept string.
htdocs/cron/class/cronjob.class.php	722	Property Cronjob::$nbrun (int) does not accept string.
htdocs/cron/class/cronjob.class.php	948	Property CommonObject::$ref (string) does not accept int.
htdocs/cron/class/cronjob.class.php	970	Property Cronjob::$frequency (int) does not accept string.
htdocs/cron/class/cronjob.class.php	978	Property Cronjob::$nbrun (int) does not accept string.
htdocs/cron/class/cronjob.class.php	1232	Property Cronjob::$lastresult (string) does not accept int.
htdocs/cron/class/cronjob.class.php	1248	Property Cronjob::$lastresult (string) does not accept int.
htdocs/cron/class/cronjob.class.php	1260	Property Cronjob::$lastresult (string) does not accept int.
htdocs/cron/class/cronjob.class.php	1268	Property Cronjob::$lastresult (string) does not accept int.
htdocs/cron/class/cronjob.class.php	1283	Property Cronjob::$lastresult (string) does not accept int.
---
 htdocs/cron/class/cronjob.class.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 8a57372927b..9c57f274779 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -110,7 +110,7 @@ class Cronjob extends CommonObject
 	public $datelastresult = '';
 
 	/**
-	 * @var string 			Last result from end job execution
+	 * @var int 			Last result from end job execution
 	 */
 	public $lastresult;
 
@@ -263,10 +263,10 @@ class Cronjob extends CommonObject
 			$this->unitfrequency = trim($this->unitfrequency);
 		}
 		if (isset($this->frequency)) {
-			$this->frequency = trim($this->frequency);
+			$this->frequency = (int) $this->frequency;
 		}
 		if (isset($this->status)) {
-			$this->status = trim($this->status);
+			$this->status = (int) $this->status;
 		}
 		if (isset($this->note_private)) {
 			$this->note_private = trim($this->note_private);
@@ -710,10 +710,10 @@ class Cronjob extends CommonObject
 			$this->unitfrequency = trim($this->unitfrequency);
 		}
 		if (isset($this->frequency)) {
-			$this->frequency = trim($this->frequency);
+			$this->frequency = (int) $this->frequency;
 		}
 		if (isset($this->status)) {
-			$this->status = trim($this->status);
+			$this->status = (int) $this->status;
 		}
 		if (isset($this->note_private)) {
 			$this->note_private = trim($this->note_private);
@@ -945,7 +945,7 @@ class Cronjob extends CommonObject
 	public function initAsSpecimen()
 	{
 		$this->id = 0;
-		$this->ref = 0;
+		$this->ref = '';
 		$this->entity = 0;
 		$this->tms = '';
 		$this->datec = '';
@@ -967,7 +967,7 @@ class Cronjob extends CommonObject
 		$this->lastoutput = '';
 		$this->lastresult = '';
 		$this->unitfrequency = '';
-		$this->frequency = '';
+		$this->frequency = 0;
 		$this->status = 0;
 		$this->processing = 0;
 		$this->pid = null;
@@ -975,7 +975,7 @@ class Cronjob extends CommonObject
 		$this->fk_user_author = 0;
 		$this->fk_user_mod = 0;
 		$this->note_private = '';
-		$this->nbrun = '';
+		$this->nbrun = 0;
 		$this->maxrun = 100;
 		$this->libname = '';
 	}