From 9051e411d074a300686868724831f150e099c2c1 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Mon, 18 Dec 2023 12:00:41 +0100
Subject: [PATCH 001/243] FIX Multilangs : PDF lines description

---
 htdocs/comm/propal/class/propal.class.php |  2 +-
 htdocs/core/lib/pdf.lib.php               | 26 ++++++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 2dbaeaf056e..536e7fb59e0 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1680,7 +1680,7 @@ class Propal extends CommonObject
 				$this->lines = array();
 
 				// Lines
-				$result = $this->fetch_lines();
+				$result = $this->fetch_lines(0, (!empty(getDolGlobalInt('MAIN_MULTILANGS')) ? 1 : 0));
 				if ($result < 0) {
 					return -3;
 				}
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index d6a22f64de5..d5da41777ab 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1410,12 +1410,28 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 {
 	global $db, $conf, $langs;
 
+    $multilangsactive = getDolGlobalInt('MAIN_MULTILANGS');
+
+    //id
 	$idprod = (!empty($object->lines[$i]->fk_product) ? $object->lines[$i]->fk_product : false);
-	$label = (!empty($object->lines[$i]->label) ? $object->lines[$i]->label : (!empty($object->lines[$i]->product_label) ? $object->lines[$i]->product_label : ''));
-	$desc = (!empty($object->lines[$i]->desc) ? $object->lines[$i]->desc : (!empty($object->lines[$i]->description) ? $object->lines[$i]->description : ''));
+    //label
+    if(!empty($object->lines[$i]->label)){
+        $label = $object->lines[$i]->label;
+    } else {
+        $label = (!empty($object->lines[$i]->multilangs[$langs->defaultlang]['label'] && $multilangsactive) ? $object->lines[$i]->multilangs[$langs->defaultlang]['label'] : (!empty($object->lines[$i]->product_label) ? $object->lines[$i]->product_label : ''));
+    }
+    //description
+    if(!empty($object->lines[$i]->desc)){
+        $desc = $object->lines[$i]->desc;
+    } else {
+        $desc = (!empty($object->lines[$i]->multilangs[$langs->defaultlang]['description'] && $multilangsactive) ? $object->lines[$i]->multilangs[$langs->defaultlang]['description'] : (!empty($object->lines[$i]->description) ? $object->lines[$i]->description : ''));
+    }
+    //ref supplier
 	$ref_supplier = (!empty($object->lines[$i]->ref_supplier) ? $object->lines[$i]->ref_supplier : (!empty($object->lines[$i]->ref_fourn) ? $object->lines[$i]->ref_fourn : '')); // TODO Not yet saved for supplier invoices, only supplier orders
-	$note = (!empty($object->lines[$i]->note) ? $object->lines[$i]->note : '');
-	$dbatch = (!empty($object->lines[$i]->detail_batch) ? $object->lines[$i]->detail_batch : false);
+	//note
+    $note = (!empty($object->lines[$i]->note) ? $object->lines[$i]->note : '');
+	//dbatch
+    $dbatch = (!empty($object->lines[$i]->detail_batch) ? $object->lines[$i]->detail_batch : false);
 
 	if ($issupplierline) {
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
@@ -1432,7 +1448,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	if ($idprod) {
 		$prodser->fetch($idprod);
 		// If a predefined product and multilang and on other lang, we renamed label with label translated
-		if (getDolGlobalInt('MAIN_MULTILANGS') && ($outputlangs->defaultlang != $langs->defaultlang)) {
+		if ($multilangsactive && ($outputlangs->defaultlang != $langs->defaultlang)) {
 			$translatealsoifmodified = (!empty($conf->global->MAIN_MULTILANG_TRANSLATE_EVEN_IF_MODIFIED)); // By default if value was modified manually, we keep it (no translation because we don't have it)
 
 			// TODO Instead of making a compare to see if param was modified, check that content contains reference translation. If yes, add the added part to the new translation

From ec19dcc8f85afab59a816a4bdba6103fa875e810 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Mon, 18 Dec 2023 13:34:50 +0100
Subject: [PATCH 002/243] Invoice

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 7232137ae1c..faa54322c49 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2076,7 +2076,7 @@ class Facture extends CommonInvoice
 				// Lines
 				$this->lines = array();
 
-				$result = $this->fetch_lines();
+                $result = $this->fetch_lines(0, (!empty(getDolGlobalInt('MAIN_MULTILANGS')) ? 1 : 0));
 				if ($result < 0) {
 					$this->error = $this->db->error();
 					return -3;

From abc9eb7bdc21dff0608c12bd6ee0ec075c4d7251 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Mon, 18 Dec 2023 13:44:19 +0100
Subject: [PATCH 003/243] Clean Code

---
 htdocs/core/lib/pdf.lib.php | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index d5da41777ab..cb242fdf1f4 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1410,28 +1410,27 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 {
 	global $db, $conf, $langs;
 
-    $multilangsactive = getDolGlobalInt('MAIN_MULTILANGS');
-
-    //id
+	$multilangsactive = getDolGlobalInt('MAIN_MULTILANGS');
+	//id
 	$idprod = (!empty($object->lines[$i]->fk_product) ? $object->lines[$i]->fk_product : false);
-    //label
-    if(!empty($object->lines[$i]->label)){
-        $label = $object->lines[$i]->label;
-    } else {
-        $label = (!empty($object->lines[$i]->multilangs[$langs->defaultlang]['label'] && $multilangsactive) ? $object->lines[$i]->multilangs[$langs->defaultlang]['label'] : (!empty($object->lines[$i]->product_label) ? $object->lines[$i]->product_label : ''));
-    }
-    //description
-    if(!empty($object->lines[$i]->desc)){
-        $desc = $object->lines[$i]->desc;
-    } else {
-        $desc = (!empty($object->lines[$i]->multilangs[$langs->defaultlang]['description'] && $multilangsactive) ? $object->lines[$i]->multilangs[$langs->defaultlang]['description'] : (!empty($object->lines[$i]->description) ? $object->lines[$i]->description : ''));
-    }
-    //ref supplier
+	//label
+	if (!empty($object->lines[$i]->label)) {
+		$label = $object->lines[$i]->label;
+	} else {
+		$label = (!empty($object->lines[$i]->multilangs[$langs->defaultlang]['label'] && $multilangsactive) ? $object->lines[$i]->multilangs[$langs->defaultlang]['label'] : (!empty($object->lines[$i]->product_label) ? $object->lines[$i]->product_label : ''));
+	}
+	//description
+	if (!empty($object->lines[$i]->desc)) {
+		$desc = $object->lines[$i]->desc;
+	} else {
+		$desc = (!empty($object->lines[$i]->multilangs[$langs->defaultlang]['description'] && $multilangsactive) ? $object->lines[$i]->multilangs[$langs->defaultlang]['description'] : (!empty($object->lines[$i]->description) ? $object->lines[$i]->description : ''));
+	}
+	//ref supplier
 	$ref_supplier = (!empty($object->lines[$i]->ref_supplier) ? $object->lines[$i]->ref_supplier : (!empty($object->lines[$i]->ref_fourn) ? $object->lines[$i]->ref_fourn : '')); // TODO Not yet saved for supplier invoices, only supplier orders
 	//note
-    $note = (!empty($object->lines[$i]->note) ? $object->lines[$i]->note : '');
+	$note = (!empty($object->lines[$i]->note) ? $object->lines[$i]->note : '');
 	//dbatch
-    $dbatch = (!empty($object->lines[$i]->detail_batch) ? $object->lines[$i]->detail_batch : false);
+	$dbatch = (!empty($object->lines[$i]->detail_batch) ? $object->lines[$i]->detail_batch : false);
 
 	if ($issupplierline) {
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';

From 4d32d93ee2c065e5db590bb64796939e8074d8d9 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Mon, 18 Dec 2023 17:28:41 +0100
Subject: [PATCH 004/243] Clean Travis

---
 htdocs/comm/propal/class/propal.class.php     | 2 +-
 htdocs/compta/facture/class/facture.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 536e7fb59e0..bdc3ee4d7f1 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1680,7 +1680,7 @@ class Propal extends CommonObject
 				$this->lines = array();
 
 				// Lines
-				$result = $this->fetch_lines(0, (!empty(getDolGlobalInt('MAIN_MULTILANGS')) ? 1 : 0));
+				$result = $this->fetch_lines(0, (getDolGlobalInt('MAIN_MULTILANGS') ? 1 : 0));
 				if ($result < 0) {
 					return -3;
 				}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index faa54322c49..f3466a73eba 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2076,7 +2076,7 @@ class Facture extends CommonInvoice
 				// Lines
 				$this->lines = array();
 
-                $result = $this->fetch_lines(0, (!empty(getDolGlobalInt('MAIN_MULTILANGS')) ? 1 : 0));
+				$result = $this->fetch_lines(0, (getDolGlobalInt('MAIN_MULTILANGS') ? 1 : 0));
 				if ($result < 0) {
 					$this->error = $this->db->error();
 					return -3;

From 86971c7b863c1b891c30f901b5ed3751eeaa720d Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 22 Dec 2023 09:30:35 +0100
Subject: [PATCH 005/243] Clean Conditions

---
 htdocs/core/lib/pdf.lib.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index cb242fdf1f4..4b9fdb6e7c3 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1417,13 +1417,29 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	if (!empty($object->lines[$i]->label)) {
 		$label = $object->lines[$i]->label;
 	} else {
-		$label = (!empty($object->lines[$i]->multilangs[$langs->defaultlang]['label'] && $multilangsactive) ? $object->lines[$i]->multilangs[$langs->defaultlang]['label'] : (!empty($object->lines[$i]->product_label) ? $object->lines[$i]->product_label : ''));
+		if (!empty($object->lines[$i]->multilangs[$langs->defaultlang]['label']) && $multilangsactive) {
+			$label = $object->lines[$i]->multilangs[$langs->defaultlang]['label'];
+		} else {
+			if (!empty($object->lines[$i]->product_label)) {
+				$label = $object->lines[$i]->product_label;
+			} else {
+				$label = '';
+			}
+		}
 	}
 	//description
 	if (!empty($object->lines[$i]->desc)) {
 		$desc = $object->lines[$i]->desc;
 	} else {
-		$desc = (!empty($object->lines[$i]->multilangs[$langs->defaultlang]['description'] && $multilangsactive) ? $object->lines[$i]->multilangs[$langs->defaultlang]['description'] : (!empty($object->lines[$i]->description) ? $object->lines[$i]->description : ''));
+		if (!empty($object->lines[$i]->multilangs[$langs->defaultlang]['description']) && $multilangsactive) {
+			$desc = $object->lines[$i]->multilangs[$langs->defaultlang]['description'];
+		} else {
+			if (!empty($object->lines[$i]->description)) {
+				$desc = $object->lines[$i]->description;
+			} else {
+				$desc = '';
+			}
+		}
 	}
 	//ref supplier
 	$ref_supplier = (!empty($object->lines[$i]->ref_supplier) ? $object->lines[$i]->ref_supplier : (!empty($object->lines[$i]->ref_fourn) ? $object->lines[$i]->ref_fourn : '')); // TODO Not yet saved for supplier invoices, only supplier orders

From e24da3242440e88a840accf45bd6c805a47001e7 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 16 Jan 2024 14:13:28 +0100
Subject: [PATCH 006/243] Load multilangs in function pdf_getlinedesc()

---
 htdocs/comm/propal/class/propal.class.php     |  2 +-
 htdocs/compta/facture/class/facture.class.php |  2 +-
 htdocs/core/lib/pdf.lib.php                   | 34 ++++++++++++-------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index bdc3ee4d7f1..2dbaeaf056e 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1680,7 +1680,7 @@ class Propal extends CommonObject
 				$this->lines = array();
 
 				// Lines
-				$result = $this->fetch_lines(0, (getDolGlobalInt('MAIN_MULTILANGS') ? 1 : 0));
+				$result = $this->fetch_lines();
 				if ($result < 0) {
 					return -3;
 				}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index a4ba1d4896f..9d96dce5088 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2076,7 +2076,7 @@ class Facture extends CommonInvoice
 				// Lines
 				$this->lines = array();
 
-				$result = $this->fetch_lines(0, (getDolGlobalInt('MAIN_MULTILANGS') ? 1 : 0));
+				$result = $this->fetch_lines();
 				if ($result < 0) {
 					$this->error = $this->db->error();
 					return -3;
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 4b9fdb6e7c3..3cd9a055bac 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1411,8 +1411,29 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	global $db, $conf, $langs;
 
 	$multilangsactive = getDolGlobalInt('MAIN_MULTILANGS');
+
+    if ($issupplierline) {
+        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+        $prodser = new ProductFournisseur($db);
+    } else {
+        include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+        $prodser = new Product($db);
+
+        if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+            include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+        }
+    }
+
 	//id
 	$idprod = (!empty($object->lines[$i]->fk_product) ? $object->lines[$i]->fk_product : false);
+    if($idprod) {
+        $prodser->fetch($idprod);
+        //load multilangs
+        if($multilangsactive){
+            $prodser->getMultiLangs();
+            $object->lines[$i]->multilangs = $prodser->multilangs;
+        }
+    }
 	//label
 	if (!empty($object->lines[$i]->label)) {
 		$label = $object->lines[$i]->label;
@@ -1448,20 +1469,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	//dbatch
 	$dbatch = (!empty($object->lines[$i]->detail_batch) ? $object->lines[$i]->detail_batch : false);
 
-	if ($issupplierline) {
-		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-		$prodser = new ProductFournisseur($db);
-	} else {
-		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-		$prodser = new Product($db);
-
-		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
-			include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
-		}
-	}
-
 	if ($idprod) {
-		$prodser->fetch($idprod);
 		// If a predefined product and multilang and on other lang, we renamed label with label translated
 		if ($multilangsactive && ($outputlangs->defaultlang != $langs->defaultlang)) {
 			$translatealsoifmodified = (!empty($conf->global->MAIN_MULTILANG_TRANSLATE_EVEN_IF_MODIFIED)); // By default if value was modified manually, we keep it (no translation because we don't have it)

From 66a175e48d975e9239cf4874d9864fae6aee80b8 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Mon, 22 Jan 2024 14:52:51 +0100
Subject: [PATCH 007/243] langs of recipient

---
 htdocs/core/lib/pdf.lib.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 3cd9a055bac..6dd5345be66 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1438,8 +1438,8 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	if (!empty($object->lines[$i]->label)) {
 		$label = $object->lines[$i]->label;
 	} else {
-		if (!empty($object->lines[$i]->multilangs[$langs->defaultlang]['label']) && $multilangsactive) {
-			$label = $object->lines[$i]->multilangs[$langs->defaultlang]['label'];
+		if (!empty($object->lines[$i]->multilangs[$outputlangs->defaultlang]['label']) && $multilangsactive) {
+			$label = $object->lines[$i]->multilangs[$outputlangs->defaultlang]['label'];
 		} else {
 			if (!empty($object->lines[$i]->product_label)) {
 				$label = $object->lines[$i]->product_label;
@@ -1452,8 +1452,8 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	if (!empty($object->lines[$i]->desc)) {
 		$desc = $object->lines[$i]->desc;
 	} else {
-		if (!empty($object->lines[$i]->multilangs[$langs->defaultlang]['description']) && $multilangsactive) {
-			$desc = $object->lines[$i]->multilangs[$langs->defaultlang]['description'];
+		if (!empty($object->lines[$i]->multilangs[$outputlangs->defaultlang]['description']) && $multilangsactive) {
+			$desc = $object->lines[$i]->multilangs[$outputlangs->defaultlang]['description'];
 		} else {
 			if (!empty($object->lines[$i]->description)) {
 				$desc = $object->lines[$i]->description;

From 87c16498ca4d93db7ed69f9738182f7b88c33070 Mon Sep 17 00:00:00 2001
From: Kamel Khelifa <kkhelifa@open-dsi.fr>
Date: Fri, 18 Oct 2024 14:26:04 +0200
Subject: [PATCH 008/243] FIX: Fix return value of hook sendMail when hook
 return -1 who must be return false in sendfile() function

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

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index db8b30ed249..34b7c2757e5 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -687,7 +687,7 @@ class CMailFile
 				$this->error = "Error in hook maildao sendMail ".$reshook;
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 
-				return $reshook;
+				return false;
 			}
 			if ($reshook == 1) {	// Hook replace standard code
 				return true;

From 0099fbbd2c4276062e14bd6f010781f4092c97c5 Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Mon, 14 Oct 2024 12:21:59 +0200
Subject: [PATCH 009/243] accountingjournal: add create() method

Adding a create method ensure we create the accountingjournal in a
uniform way, and allow creating the journals in tests without getting
out-of-sync.
---
 .../class/accountingjournal.class.php         | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 4135e982d14..29eb4086fe1 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017-2022  OpenDSI     <support@open-dsi.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * 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
@@ -103,6 +104,50 @@ class AccountingJournal extends CommonObject
 		$this->ismultientitymanaged = 0;
 	}
 
+	/**
+	 * Create a new Accounting Journal.
+	 *
+	 * @param  User	$user the user that created the journal, currently unused
+	 * @return int  Return integer <0 on error, or the ID of the created object
+	 */
+	public function create($user)
+	{
+		$valid_nature = array(1, 2, 3, 4, 5, 8, 9);
+		if (!in_array((int) $this->nature, $valid_nature)) {
+			$this->error = get_class($this)."::Create Error invalid field nature '" . strval($this->nature) . "'";
+			dol_syslog($this->error, LOG_ERR);
+			return -1;
+		}
+
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_journal";
+		$sql .= " (entity, code, label, nature, active)";
+		$sql .= " VALUES ("
+			. ((int) $this->entity)           .",'"
+			. $this->db->escape($this->code)  ."','"
+			. $this->db->escape($this->label) ."',"
+			. ((int) $this->nature)           .","
+			. ((int) $this->active)           .")";
+
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->error = get_class($this)."::Create Error: " . $this->db->lasterror();
+			dol_syslog($this->error, LOG_ERR);
+			return -1;
+		}
+
+		$id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_journal");
+		if ($id <= 0) {
+			$this->error = get_class($this)."::Create Error " . $id . ": " . $this->db->lasterror();
+			dol_syslog($this->error, LOG_ERR);
+			return -2;
+		}
+
+		$this->id = $id;
+		$this->rowid = $id;
+		return $id;
+	}
+
 	/**
 	 * Load an object from database
 	 *

From 9e00b5ec0ecfd29ba94eff7c5a94a261a180ff7e Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Thu, 28 Nov 2024 12:08:22 +0100
Subject: [PATCH 010/243] FIX output dir

---
 .../mymodule/doc/pdf_standard_myobject.modules.php     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index aa2406f6cc8..90eeab74229 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -263,18 +263,18 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		*/
 
 		//if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
-
-		if (getMultidirOutput($object)) {
+		$dir_output = getMultidirOutput($object, $object->module) . '/' . $object->element;
+		if ($dir_output) {
 			$object->fetch_thirdparty();
 
 			$dir = null;
 			// Definition of $dir and $file
 			if ($object->specimen) {
-				$dir = getMultidirOutput($object);
+				$dir = $dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = getMultidirOutput($object)."/".$objectref;
+				$dir = $dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
 			}
 			if ($dir === null) {
@@ -837,7 +837,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Return list of active generation modules
+	 *  Return list of active generation models
 	 *
 	 *  @param  DoliDB  	$db					Database handler
 	 *  @param  int<0,max>	$maxfilenamelength	Max length of value to show

From 98c8a1766689dca350bbfbba7a7162952eace589 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 3 Dec 2024 11:56:36 +0100
Subject: [PATCH 011/243] try to fix phpstan error

---
 .../core/modules/mymodule/doc/pdf_standard_myobject.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index 90eeab74229..c24df9a986e 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -264,7 +264,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 
 		//if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
 		$dir_output = getMultidirOutput($object, $object->module) . '/' . $object->element;
-		if ($dir_output) {
+		if (!empty($dir_output)) {
 			$object->fetch_thirdparty();
 
 			$dir = null;

From 5340f9f8c52c032fe5935e101a85b50b52d4feaa Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Thu, 5 Dec 2024 16:47:34 +0100
Subject: [PATCH 012/243] Update pdf_standard_myobject.modules.php

---
 .../modules/mymodule/doc/pdf_standard_myobject.modules.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index c24df9a986e..f9f2a2762bf 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -263,8 +263,10 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		*/
 
 		//if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
-		$dir_output = getMultidirOutput($object, $object->module) . '/' . $object->element;
+		$dir_output = getMultidirOutput($object, $object->module);
 		if (!empty($dir_output)) {
+			$dir_output .= '/' . $object->element;
+
 			$object->fetch_thirdparty();
 
 			$dir = null;

From a1a102b4e4ba92fd1b674cc7aa96c19c87bac5db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Cendrier?= <noe.cendrier@altairis.fr>
Date: Thu, 12 Dec 2024 14:34:49 +0100
Subject: [PATCH 013/243] FIX: $dir cannot be null, commenting wrong test

---
 .../modules/mymodule/doc/pdf_standard_myobject.modules.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index 3e9bfac76cf..1f227a8be10 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -279,9 +279,9 @@ class pdf_standard_myobject extends ModelePDFMyObject
 				$dir = $dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
 			}
-			if ($dir === null) {
-				return 0;
-			}
+			// if ($dir === null) {
+			// 	return 0;
+			// }
 			if (!file_exists($dir)) {
 				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);

From a4785adb3df9cf7162b21814c4e4204a67ce7ad6 Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Thu, 12 Dec 2024 15:28:19 +0100
Subject: [PATCH 014/243] FIX : display error when loan can't be deleted

---
 htdocs/loan/card.php             | 4 ++--
 htdocs/loan/class/loan.class.php | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 8c4cc3810b8..45e8fe0fd8a 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -82,7 +82,7 @@ if (empty($reshook)) {
 		if ($result > 0) {
 			setEventMessages($langs->trans('LoanPaid'), null, 'mesgs');
 		} else {
-			setEventMessages($loan->error, null, 'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
@@ -95,7 +95,7 @@ if (empty($reshook)) {
 			header("Location: list.php");
 			exit;
 		} else {
-			setEventMessages($loan->error, null, 'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 98051a0d2b6..0f077d0d9ed 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -308,6 +308,7 @@ class Loan extends CommonObject
 				$accountline->fetch($line_url['fk_bank']);
 				$result = $accountline->delete_urls($user);
 				if ($result < 0) {
+					$this->errors = array_merge($this->errors, [$accountline->error], $accountline->errors);
 					$error++;
 				}
 			}

From d9be3efa90a081f6b5c3c64c1e3a36d3432cb2f4 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 13 Dec 2024 06:18:45 +0100
Subject: [PATCH 015/243] FIX #32339 Delete a loan settlement is partial

---
 htdocs/loan/class/paymentloan.class.php | 44 +++++++++----------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index bd02374a24c..77c8b183b87 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2014-2018  Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2018  Frederic France      <frederic.france@netlogic.fr>
- * Copyright (C) 2020       Maxime DEMAREST      <maxime@indelog.fr>
+/* Copyright (C) 2014-2024	Alexandre Spangaro			<alexandre@inovea-conseil.com>
+ * Copyright (C) 2015-2018	Frederic France				<frederic.france@free.fr>
+ * Copyright (C) 2020		Maxime DEMAREST				<maxime@indelog.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
@@ -99,6 +99,11 @@ class PaymentLoan extends CommonObject
 	public $type_code;
 	public $type_label;
 
+	/**
+	 * @var int
+	 */
+	public $bank_line;
+
 
 	/**
 	 *	Constructor
@@ -364,6 +369,7 @@ class PaymentLoan extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
+
 		} else {
 			$this->db->commit();
 			return 1;
@@ -380,19 +386,17 @@ class PaymentLoan extends CommonObject
 	 */
 	public function delete($user, $notrigger = 0)
 	{
-		global $conf, $langs;
 		$error = 0;
 
 		$this->db->begin();
 
-		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
-			$sql .= " WHERE type='payment_loan' AND url_id=".((int) $this->id);
-
-			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		if ($this->bank_line > 0) {
+			$accline = new AccountLine($this->db);
+			$accline->fetch($this->bank_line);
+			$result = $accline->delete($user);
+			if ($result < 0) {
+				$this->errors[] = $accline->error;
+				$error++;
 			}
 		}
 
@@ -422,22 +426,6 @@ class PaymentLoan extends CommonObject
 			}
 		}
 
-		//if (! $error)
-		//{
-		//	if (! $notrigger)
-		//	{
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action call a trigger.
-
-				//// Call triggers
-				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				//$interface=new Interfaces($this->db);
-				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				//// End call triggers
-		//	}
-		//}
-
 		// Commit or rollback
 		if ($error) {
 			foreach ($this->errors as $errmsg) {

From ef090aa895dc7d33482f4bd6d4b1ef9bb8d1d395 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 13 Dec 2024 06:22:44 +0100
Subject: [PATCH 016/243] CI

---
 htdocs/loan/class/paymentloan.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 77c8b183b87..1604383b700 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -369,7 +369,6 @@ class PaymentLoan extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-
 		} else {
 			$this->db->commit();
 			return 1;

From ce06c12da61d778e8004c98748cb6be0e137f51b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina=20JOUM?= <melina.joum@altairis.fr>
Date: Wed, 18 Dec 2024 11:19:56 +0100
Subject: [PATCH 017/243] FIX: GETPOST('private_message')

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

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 265a661448d..3ae08149626 100755
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -458,7 +458,7 @@ if (empty($reshook)) {
 	// Action to add a message (private or not, with email or not).
 	// This may also send an email (concatenated with email_intro and email footer if checkbox was selected)
 	if ($action == 'add_message' && GETPOSTISSET('btn_add_message') && $permissiontoread) {
-		$ret = $object->newMessage($user, $action, (GETPOST('private_message', 'alpha') == "on" ? 1 : 0), 0);
+		$ret = $object->newMessage($user, $action, GETPOSTINT('private_message'), 0);
 
 		if ($ret > 0) {
 			if (!empty($backtopage)) {

From f60f34cdf8cd3c5f67afb7facd8391e389cfde09 Mon Sep 17 00:00:00 2001
From: William Mead <william@inovea-conseil.com>
Date: Thu, 2 Jan 2025 14:07:46 +0100
Subject: [PATCH 018/243] Backport fix for send email to assigned user on
 ticket create

---
 ...terface_50_modTicket_TicketEmail.class.php | 170 ++++++++++++++----
 1 file changed, 137 insertions(+), 33 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 58eeaf18dc3..bead2d3faf6 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -77,45 +77,48 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						if ($res > 0) {
 							// Send email to notification email
 							if (empty($conf->global->TICKET_DISABLE_ALL_MAILS)) {
-								// Init to avoid errors
-								$filepath = array();
-								$filename = array();
-								$mimetype = array();
+//								Init to avoid errors
+//								$filepath = array();
+//								$filename = array();
+//								$mimetype = array();
 
 								// Send email to assigned user
-								$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketAssignedToYou');
-								$message = '<p>'.$langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname))."</p>";
-								$message .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-								$message .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-								$message .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-								$message .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
-								// Extrafields
-								if (is_array($object->array_options) && count($object->array_options) > 0) {
-									foreach ($object->array_options as $key => $value) {
-										$message .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
-									}
-								}
-
-								$message .= '</ul>';
-								$message .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-								$message .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
+//								$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketAssignedToYou');
+//								$message = '<p>'.$langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname))."</p>";
+//								$message .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+//								$message .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+//								$message .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+//								$message .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+//								// Extrafields
+//								if (is_array($object->array_options) && count($object->array_options) > 0) {
+//									foreach ($object->array_options as $key => $value) {
+//										$message .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
+//									}
+//								}
+//
+//								$message .= '</ul>';
+//								$message .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+//								$message .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
 
 								$sendto = $userstat->email;
-								$from = dolGetFirstLastname($user->firstname, $user->lastname).'<'.$user->email.'>';
-
-								$message = dol_nl2br($message);
+								$subject_assignee = 'TicketAssignedToYou';
+								$body_assignee = 'TicketAssignedEmailBody';
+								$see_ticket_assignee = 'SeeThisTicketIntomanagementInterface';
+//								$from = dolGetFirstLastname($user->firstname, $user->lastname).'<'.$user->email.'>';
+//
+//								$message = dol_nl2br($message);
 
 								if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 									$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 									$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 								}
-								include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-								$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
-								if ($mailfile->error) {
-									setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-								} else {
-									$result = $mailfile->sendfile();
-								}
+//								include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+//								$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
+//								if ($mailfile->error) {
+//									setEventMessages($mailfile->error, $mailfile->errors, 'errors');
+//								} else {
+//									$result = $mailfile->sendfile();
+//								}
 								if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 									$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 								}
@@ -173,10 +176,15 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
 				$subject_admin = 'TicketNewEmailSubjectAdmin';
 				$body_admin = 'TicketNewEmailBodyAdmin';
+
 				$subject_customer = 'TicketNewEmailSubjectCustomer';
 				$body_customer = 'TicketNewEmailBodyCustomer';
 				$see_ticket_customer = 'TicketNewEmailBodyInfosTrackUrlCustomer';
 
+				$subject_assignee = 'TicketAssignedToYou';
+				$body_assignee = 'TicketAssignedEmailBody';
+				$see_ticket_assignee = 'SeeThisTicketIntomanagementInterface';
+
 				// Send email to notification email
 				if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) && empty($object->context['disableticketemail'])) {
 					$sendto = empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) ? '' : $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
@@ -185,6 +193,34 @@ class InterfaceTicketEmail extends DolibarrTriggers
 					}
 				}
 
+				// Send email to assignee if an assignee was set at creation
+				if ($object->fk_user_assign > 0 && $object->fk_user_assign != $user->id && empty($object->context['disableticketemail'])) {
+					$userstat = new User($this->db);
+					$res = $userstat->fetch($object->fk_user_assign);
+					if ($res > 0) {
+						// Send email to notification email
+						if (!getDolGlobalString('TICKET_DISABLE_ALL_MAILS')) {
+							// Send email to assigned user
+							$sendto = $userstat->email;
+							if (!getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO')) {
+								$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+								$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
+							}
+
+							if (!empty($sendto)) {
+								$this->composeAndSendAssigneeMessage($sendto, $subject_assignee, $body_assignee, $see_ticket_assignee, $object, $langs);
+							}
+
+							if (!getDolUserString('TICKET_DISABLE_MAIL_AUTOCOPY_TO')) {
+								$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
+							}
+						}
+					} else {
+						$this->error = $userstat->error;
+						$this->errors = $userstat->errors;
+					}
+				}
+
 				// Send email to customer
 				if (empty($conf->global->TICKET_DISABLE_CUSTOMER_MAILS) && empty($object->context['disableticketemail']) && $object->notify_tiers_at_create) {
 					$sendto = '';
@@ -428,9 +464,9 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
 		$trackid = 'tic'.$object->id;
 
-		$old_MAIN_MAIL_AUTOCOPY_TO = getDolGlobalString('MAIN_MAIL_AUTOCOPY_TO');
-
-		if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+		$old_MAIN_MAIL_AUTOCOPY_TO = null;
+		if (getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO')) {
+			$old_MAIN_MAIL_AUTOCOPY_TO = getDolGlobalString('MAIN_MAIL_AUTOCOPY_TO');
 			$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 		}
 
@@ -451,4 +487,72 @@ class InterfaceTicketEmail extends DolibarrTriggers
 			$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 		}
 	}
+
+	/**
+	 * Composes and sends a message concerning a ticket, to be sent to user assigned to the ticket
+	 *
+	 * @param string 	$sendto			Addresses to send the mail, format "first@address.net, second@address.net, " etc.
+	 * @param string 	$base_subject	email subject. Non-translated string.
+	 * @param string	$body			email body (first line). Non-translated string.
+	 * @param string 	$see_ticket		string indicating the ticket public address
+	 * @param Ticket 	$object			the ticket thet the email refers to
+	 * @param Translate $langs			the translation object
+	 * @return void
+	 */
+	private function composeAndSendAssigneeMessage($sendto, $base_subject, $body, $see_ticket, Ticket $object, Translate $langs)
+	{
+		global $conf, $user, $mysoc;
+
+		// Init to avoid errors
+		$filepath = array();
+		$filename = array();
+		$mimetype = array();
+
+		// Send email to assigned user
+		$appli = $mysoc->name;
+
+		$subject = '['.$appli.'] '.$langs->transnoentities($base_subject);
+		$message = '<p>'.$langs->transnoentities($body, $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname))."</p>";
+		$message .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+		$message .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+		$message .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+		$message .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+		// Extrafields
+		if (is_array($object->array_options) && count($object->array_options) > 0) {
+			foreach ($object->array_options as $key => $value) {
+				$message .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
+			}
+		}
+
+		$message .= '</ul>';
+		$message .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+		$message .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans($see_ticket).'</a></p>';
+
+		$from = dolGetFirstLastname($user->firstname, $user->lastname).'<'.$user->email.'>';
+
+		$message = dol_nl2br($message);
+
+		$old_MAIN_MAIL_AUTOCOPY_TO = null;
+		if (getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO')) {
+			$old_MAIN_MAIL_AUTOCOPY_TO = getDolGlobalString('MAIN_MAIL_AUTOCOPY_TO');
+			$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
+		}
+
+		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
+		if ($mailfile->error) {
+			setEventMessages($mailfile->error, $mailfile->errors, 'errors');
+		} else {
+			$result = $mailfile->sendfile();
+			if ($result) {
+				// update last_msg_sent date
+				$object->fetch($object->id);
+				$object->date_last_msg_sent = dol_now();
+				$object->update($user);
+			}
+		}
+		if (!getDolUserString('TICKET_DISABLE_MAIL_AUTOCOPY_TO')) {
+			$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
+		}
+	}
 }

From 37a815af535a485b9865bbedd483eee99c7827a6 Mon Sep 17 00:00:00 2001
From: William Mead <william@inovea-conseil.com>
Date: Thu, 2 Jan 2025 14:50:14 +0100
Subject: [PATCH 019/243] Cleaned code

---
 ...terface_50_modTicket_TicketEmail.class.php | 33 +------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index bead2d3faf6..55f04a9d43e 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -77,48 +77,17 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						if ($res > 0) {
 							// Send email to notification email
 							if (empty($conf->global->TICKET_DISABLE_ALL_MAILS)) {
-//								Init to avoid errors
-//								$filepath = array();
-//								$filename = array();
-//								$mimetype = array();
-
 								// Send email to assigned user
-//								$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketAssignedToYou');
-//								$message = '<p>'.$langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname))."</p>";
-//								$message .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-//								$message .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-//								$message .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-//								$message .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
-//								// Extrafields
-//								if (is_array($object->array_options) && count($object->array_options) > 0) {
-//									foreach ($object->array_options as $key => $value) {
-//										$message .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
-//									}
-//								}
-//
-//								$message .= '</ul>';
-//								$message .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-//								$message .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
-
 								$sendto = $userstat->email;
 								$subject_assignee = 'TicketAssignedToYou';
 								$body_assignee = 'TicketAssignedEmailBody';
 								$see_ticket_assignee = 'SeeThisTicketIntomanagementInterface';
-//								$from = dolGetFirstLastname($user->firstname, $user->lastname).'<'.$user->email.'>';
-//
-//								$message = dol_nl2br($message);
 
 								if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 									$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 									$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 								}
-//								include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-//								$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
-//								if ($mailfile->error) {
-//									setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-//								} else {
-//									$result = $mailfile->sendfile();
-//								}
+
 								if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 									$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 								}

From 4c4b773de5797e69e435dbbe89409cf2ca6220d9 Mon Sep 17 00:00:00 2001
From: William Mead <william@inovea-conseil.com>
Date: Thu, 2 Jan 2025 14:59:44 +0100
Subject: [PATCH 020/243] Fix send on assign

---
 .../triggers/interface_50_modTicket_TicketEmail.class.php     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 55f04a9d43e..00fce02d2c8 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -87,7 +87,9 @@ class InterfaceTicketEmail extends DolibarrTriggers
 									$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 									$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 								}
-
+								if (!empty($sendto)) {
+									$this->composeAndSendAssigneeMessage($sendto, $subject_assignee, $body_assignee, $see_ticket_assignee, $object, $langs);
+								}
 								if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 									$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 								}

From 83abe6aa345a484a7c4c1e4c64cb5d33d2d0d3ff Mon Sep 17 00:00:00 2001
From: Joachim Kueter <priojk@users.noreply.github.com>
Date: Thu, 2 Jan 2025 20:42:43 +0100
Subject: [PATCH 021/243] Fix #29624

Wrong property of commande fournisseur used for substitution.
---
 htdocs/core/lib/functions.lib.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6896113399d..a7cd3d0253b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -20,7 +20,7 @@
  * Copyright (C) 2022       Anthony Berton	         	<anthony.berton@bb2a.fr>
  * Copyright (C) 2022       Ferran Marcet           	<fmarcet@2byte.es>
  * Copyright (C) 2022       Charlene Benke           	<charlene@patas-monkey.com>
- * Copyright (C) 2023       Joachim Kueter              <git-jk@bloxera.com>
+ * Copyright (C) 2023-2024  Joachim Kueter              <git-jk@bloxera.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
@@ -8307,15 +8307,15 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__REF_SUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : null);
 			$substitutionarray['__NOTE_PUBLIC__'] = (isset($object->note_public) ? $object->note_public : null);
 			$substitutionarray['__NOTE_PRIVATE__'] = (isset($object->note_private) ? $object->note_private : null);
-			$substitutionarray['__DATE_DELIVERY__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, 'day', 0, $outputlangs) : '');
-			$substitutionarray['__DATE_DELIVERY_DAY__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, "%d") : '');
-			$substitutionarray['__DATE_DELIVERY_DAY_TEXT__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, "%A") : '');
-			$substitutionarray['__DATE_DELIVERY_MON__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, "%m") : '');
-			$substitutionarray['__DATE_DELIVERY_MON_TEXT__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, "%b") : '');
-			$substitutionarray['__DATE_DELIVERY_YEAR__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, "%Y") : '');
-			$substitutionarray['__DATE_DELIVERY_HH__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, "%H") : '');
-			$substitutionarray['__DATE_DELIVERY_MM__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, "%M") : '');
-			$substitutionarray['__DATE_DELIVERY_SS__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, "%S") : '');
+			$substitutionarray['__DATE_DELIVERY__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, 'day', 0, $outputlangs) : '');
+			$substitutionarray['__DATE_DELIVERY_DAY__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, "%d") : '');
+			$substitutionarray['__DATE_DELIVERY_DAY_TEXT__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, "%A") : '');
+			$substitutionarray['__DATE_DELIVERY_MON__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, "%m") : '');
+			$substitutionarray['__DATE_DELIVERY_MON_TEXT__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, "%b") : '');
+			$substitutionarray['__DATE_DELIVERY_YEAR__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, "%Y") : '');
+			$substitutionarray['__DATE_DELIVERY_HH__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, "%H") : '');
+			$substitutionarray['__DATE_DELIVERY_MM__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, "%M") : '');
+			$substitutionarray['__DATE_DELIVERY_SS__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, "%S") : '');
 
 			// For backward compatibility (deprecated)
 			$substitutionarray['__REFCLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : null));

From 112220da86222ba4cf9054ac53685c735cc4502d Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Fri, 3 Jan 2025 10:08:56 +0100
Subject: [PATCH 022/243] BUG: when there are two identical HTML tags in a
 substitution string, everything is taken between first opening tag and last
 closing tag. Write test to reproduce.

---
 test/phpunit/ODFTest.php | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/test/phpunit/ODFTest.php b/test/phpunit/ODFTest.php
index a7d972bf345..a019d5754e2 100644
--- a/test/phpunit/ODFTest.php
+++ b/test/phpunit/ODFTest.php
@@ -296,33 +296,39 @@ class ODFTest extends PHPUnit\Framework\TestCase
 				'charset' => null,
 				'expected' => utf8_encode('text with <text:span text:style-name="boldText">intricated<text:span text:style-name="underlineText">tags</text:span></text:span>'),
 			],
+			24 => [
+				'to_convert' => "text with <strong>two</strong> (strong) <strong>tags</strong>",
+				'encode' => true,
+				'charset' => null,
+				'expected' => utf8_encode('text with <text:span text:style-name="boldText">two</text:span> (strong) <text:span text:style-name="boldText">tags</text:span>'),
+			],
 
 			// One can also pass html-encoded string to the method
-			24 => [
+			25 => [
 				'to_convert' => 'One&amp;two',
 				'encode' => true,
 				'charset' => null,
 				'expected' => 'One&amp;two',
 			],
-			25 => [
+			26 => [
 				'to_convert' => "text with &lt;strong&gt;strong, &lt;/strong&gt;&lt;em&gt;emphasis&lt;/em&gt; and &lt;u&gt;underlined&lt;/u&gt; words with &lt;i&gt;it@lic sp&amp;ciàlchärs éè l'&lt;/i&gt;",
 				'encode' => false,
 				'charset' => 'UTF-8',
 				'expected' => 'text with <text:span text:style-name="boldText">strong, </text:span><text:span text:style-name="italicText">emphasis</text:span> and <text:span text:style-name="underlineText">underlined</text:span> words with <text:span text:style-name="italicText">it@lic sp&ciàlchärs éè l\'</text:span>',
 			],
-			26 => [
+			27 => [
 				'to_convert' => "text with &lt;strong&gt;strong, &lt;/strong&gt;&lt;em&gt;emphasis&lt;/em&gt; and &lt;u&gt;underlined&lt;/u&gt; words with &lt;i&gt;it@lic sp&amp;ciàlchärs éè l'&lt;/i&gt;",
 				'encode' => true,
 				'charset' => 'UTF-8',
 				'expected' => 'text with <text:span text:style-name="boldText">strong, </text:span><text:span text:style-name="italicText">emphasis</text:span> and <text:span text:style-name="underlineText">underlined</text:span> words with <text:span text:style-name="italicText">it@lic sp&amp;ciàlchärs éè l&apos;</text:span>',
 			],
-			27 => [
+			28 => [
 				'to_convert' => "text with &lt;strong&gt;strong, &lt;/strong&gt;&lt;em&gt;emphasis&lt;/em&gt; and &lt;u&gt;underlined&lt;/u&gt; words with &lt;i&gt;it@lic sp&amp;ciàlchärs éè l'&lt;/i&gt;",
 				'encode' => false,
 				'charset' => null,
 				'expected' => utf8_encode('text with <text:span text:style-name="boldText">strong, </text:span><text:span text:style-name="italicText">emphasis</text:span> and <text:span text:style-name="underlineText">underlined</text:span> words with <text:span text:style-name="italicText">it@lic sp&ciàlchärs éè l\'</text:span>'),
 			],
-			28 => [
+			29 => [
 				'to_convert' => "text with &lt;strong&gt;strong, &lt;/strong&gt;&lt;em&gt;emphasis&lt;/em&gt; and &lt;u&gt;underlined&lt;/u&gt; words with &lt;i&gt;it@lic sp&amp;ciàlchärs éè l'&lt;/i&gt;",
 				'encode' => true,
 				'charset' => null,
@@ -341,20 +347,20 @@ class ODFTest extends PHPUnit\Framework\TestCase
 			// Following tests reflect the current behavior. They may evolve if the method behavior changes.
 
 			// The method removes hyperlinks and tags that are not dealt with.
-			29 => [
+			30 => [
 				'to_convert' => '123 <a href="/test.php">trucmachin > truc < troc > trac</a>bla bla',
 				'encode' => true,
 				'charset' => null,
 				'expected' => "123 trucmachin &gt; truc &lt; troc &gt; tracbla bla",
 			],
-			30 => [
+			31 => [
 				'to_convert' => '123 <h3>Title</h3> bla',
 				'encode' => true,
 				'charset' => null,
 				'expected' => "123 Title bla",
 			],
 			// HTML should not take \n into account, but only <br />.
-			31 => [
+			32 => [
 				'to_convert' => "text with <strong>strong text </strong>, a line\nbreak and <u>underlined</u> words with <i>it@lic sp&ciàlchärs éè l'</i>",
 				'encode' => false,
 				'charset' => 'UTF-8',

From b31962f7e2835a294d3079985ba2fe3426152e59 Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Fri, 3 Jan 2025 10:41:35 +0100
Subject: [PATCH 023/243] fix

---
 htdocs/includes/odtphp/odf.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 5a832234686..17dc178b6a2 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -46,8 +46,8 @@ class Odf
 	public $userdefined=array();
 
 	const PIXEL_TO_CM = 0.026458333;
-	const FIND_TAGS_REGEX = '/<([A-Za-z0-9]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(.*)<\/\1>))/s';
-	const FIND_ENCODED_TAGS_REGEX = '/&lt;([A-Za-z]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/&gt;)|(?:&gt;(.*)&lt;\/\1&gt;))/';
+	const FIND_TAGS_REGEX = '/<([A-Za-z0-9]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>([^(<\1>)]*)<\/\1>))/s';
+	const FIND_ENCODED_TAGS_REGEX = '/&lt;([A-Za-z]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/&gt;)|(?:&gt;([^(&lt;\1&gt;)]*)&lt;\/\1&gt;))/';
 
 
 	/**
@@ -1017,4 +1017,4 @@ IMG;
 		$this->contentXml = preg_replace($searchreg, "", $this->contentXml);
 		return  $matches[1];
 	}
-}
\ No newline at end of file
+}

From 61b03b0c0575456e098c2e7a2628ba385c1d179d Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Fri, 3 Jan 2025 10:50:30 +0100
Subject: [PATCH 024/243] Testing ODF : revert parameters order for
 assertEquals()

---
 test/phpunit/ODFTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/ODFTest.php b/test/phpunit/ODFTest.php
index a019d5754e2..ab1a2c74d48 100644
--- a/test/phpunit/ODFTest.php
+++ b/test/phpunit/ODFTest.php
@@ -377,7 +377,7 @@ class ODFTest extends PHPUnit\Framework\TestCase
 			} else {
 				$res = $odf->convertVarToOdf($case['to_convert'], $case['encode']);
 			}
-			$this->assertEquals($res, $case['expected']);
+			$this->assertEquals($case['expected'], $res);
 		}
 
 		print __METHOD__." result=".$result."\n";

From 78bf506790c18a227c8b9936919f92e4a0b46df4 Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Fri, 3 Jan 2025 11:14:17 +0100
Subject: [PATCH 025/243] fix tests in error

---
 htdocs/includes/odtphp/odf.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 17dc178b6a2..f5678d838a3 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -46,8 +46,8 @@ class Odf
 	public $userdefined=array();
 
 	const PIXEL_TO_CM = 0.026458333;
-	const FIND_TAGS_REGEX = '/<([A-Za-z0-9]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>([^(<\1>)]*)<\/\1>))/s';
-	const FIND_ENCODED_TAGS_REGEX = '/&lt;([A-Za-z]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/&gt;)|(?:&gt;([^(&lt;\1&gt;)]*)&lt;\/\1&gt;))/';
+	const FIND_TAGS_REGEX = '/<([A-Za-z0-9]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(((?!<\1>).)*)<\/\1>))/s';
+	const FIND_ENCODED_TAGS_REGEX = '/&lt;([A-Za-z]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/&gt;)|(?:&gt;(((?!&lt;\1&gt;).)*)&lt;\/\1&gt;))/';
 
 
 	/**

From b7cb799af0245ae3c5737a6bdd9589f9fc5eea7f Mon Sep 17 00:00:00 2001
From: Alexis Thietard <alexis.thietard@rtone.fr>
Date: Mon, 6 Jan 2025 14:23:13 +0100
Subject: [PATCH 026/243] FIX #21294 Stock import sql query
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To respect the PostgreSQL update statement syntax, cf.
https://www.postgresql.org/docs/17/sql-update.html

```
column_name
    The name of a column in the table named by table_name. The column name can
    be qualified with a subfield name or array subscript, if needed. Do not
    include the table's name in the specification of a target column — for
    example, UPDATE table_name SET table_name.col = 1 is invalid.
```

Signed-off-by: Alexis Thietard <alexis.thietard@rtone.fr>
---
 htdocs/core/modules/modStock.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index e9e9ccc79a6..f7def03808c 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -429,7 +429,7 @@ class modStock extends DolibarrModules
 		);
 		$this->import_updatekeys_array[$r] = array('ps.fk_product'=>'Product', 'ps.fk_entrepot'=>"Warehouse");
 		$this->import_run_sql_after_array[$r] = array(    // Because we may change data that are denormalized, we must update dernormalized data after.
-			'UPDATE '.MAIN_DB_PREFIX.'product as p SET p.stock = (SELECT SUM(ps.reel) FROM '.MAIN_DB_PREFIX.'product_stock ps WHERE ps.fk_product = p.rowid);'
+			'UPDATE '.MAIN_DB_PREFIX.'product as p SET stock = (SELECT SUM(ps.reel) FROM '.MAIN_DB_PREFIX.'product_stock ps WHERE ps.fk_product = p.rowid);'
 		);
 	}
 

From 886abc96d16510e48b3bb6eed3cdca1ccf4dcde3 Mon Sep 17 00:00:00 2001
From: Joachim Kueter <priojk@users.noreply.github.com>
Date: Tue, 7 Jan 2025 09:03:17 +0100
Subject: [PATCH 027/243] handle property for delivery date (named differently
 in different objects))

---
 htdocs/core/lib/functions.lib.php | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a7cd3d0253b..b587cba9fe1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8307,20 +8307,27 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__REF_SUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : null);
 			$substitutionarray['__NOTE_PUBLIC__'] = (isset($object->note_public) ? $object->note_public : null);
 			$substitutionarray['__NOTE_PRIVATE__'] = (isset($object->note_private) ? $object->note_private : null);
-			$substitutionarray['__DATE_DELIVERY__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, 'day', 0, $outputlangs) : '');
-			$substitutionarray['__DATE_DELIVERY_DAY__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, "%d") : '');
-			$substitutionarray['__DATE_DELIVERY_DAY_TEXT__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, "%A") : '');
-			$substitutionarray['__DATE_DELIVERY_MON__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, "%m") : '');
-			$substitutionarray['__DATE_DELIVERY_MON_TEXT__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, "%b") : '');
-			$substitutionarray['__DATE_DELIVERY_YEAR__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, "%Y") : '');
-			$substitutionarray['__DATE_DELIVERY_HH__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, "%H") : '');
-			$substitutionarray['__DATE_DELIVERY_MM__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, "%M") : '');
-			$substitutionarray['__DATE_DELIVERY_SS__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, "%S") : '');
+			// handle date_delivery: in customer oder/supplier order, the property name is delivery_date, in shipment/reception it is date_delivery
+			$date_delivery = null;
+			if (property_exists($object, 'date_delivery')) {
+				$date_delivery =  $object->date_delivery;
+			} elseif (property_exists($object, delivery_date')) {
+  				$date_delivery =  $object->delivery_date;
+			}
+			$substitutionarray['__DATE_DELIVERY__'] = (isset($date_delivery) ? dol_print_date($date_delivery, 'day', 0, $outputlangs) : '');
+			$substitutionarray['__DATE_DELIVERY_DAY__'] = (isset($date_delivery) ? dol_print_date($date_delivery, "%d") : '');
+			$substitutionarray['__DATE_DELIVERY_DAY_TEXT__'] = (isset($date_delivery) ? dol_print_date($date_delivery, "%A") : '');
+			$substitutionarray['__DATE_DELIVERY_MON__'] = (isset($date_delivery) ? dol_print_date($date_delivery, "%m") : '');
+			$substitutionarray['__DATE_DELIVERY_MON_TEXT__'] = (isset($date_delivery) ? dol_print_date($date_delivery, "%b") : '');
+			$substitutionarray['__DATE_DELIVERY_YEAR__'] = (isset($date_delivery) ? dol_print_date($date_delivery, "%Y") : '');
+			$substitutionarray['__DATE_DELIVERY_HH__'] = (isset($date_delivery) ? dol_print_date($date_delivery, "%H") : '');
+			$substitutionarray['__DATE_DELIVERY_MM__'] = (isset($date_delivery) ? dol_print_date($date_delivery, "%M") : '');
+			$substitutionarray['__DATE_DELIVERY_SS__'] = (isset($date_delivery) ? dol_print_date($date_delivery, "%S") : '');
 
 			// For backward compatibility (deprecated)
 			$substitutionarray['__REFCLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : null));
 			$substitutionarray['__REFSUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : null);
-			$substitutionarray['__SUPPLIER_ORDER_DATE_DELIVERY__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, 'day', 0, $outputlangs) : '');
+			$substitutionarray['__SUPPLIER_ORDER_DATE_DELIVERY__'] = (isset($date_delivery) ? dol_print_date($date_delivery, 'day', 0, $outputlangs) : '');
 			$substitutionarray['__SUPPLIER_ORDER_DELAY_DELIVERY__'] = (isset($object->availability_code) ? ($outputlangs->transnoentities("AvailabilityType".$object->availability_code) != 'AvailabilityType'.$object->availability_code ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '')) : '');
 			$substitutionarray['__EXPIRATION_DATE__'] = (isset($object->fin_validite) ? dol_print_date($object->fin_validite, 'daytext') : '');
 

From 21607b4f28f20af36d9c03d56b52752b6d90f623 Mon Sep 17 00:00:00 2001
From: Joachim Kueter <priojk@users.noreply.github.com>
Date: Tue, 7 Jan 2025 09:11:01 +0100
Subject: [PATCH 028/243] Update functions.lib.php

---
 htdocs/core/lib/functions.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b587cba9fe1..53c326c22fa 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8307,12 +8307,12 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__REF_SUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : null);
 			$substitutionarray['__NOTE_PUBLIC__'] = (isset($object->note_public) ? $object->note_public : null);
 			$substitutionarray['__NOTE_PRIVATE__'] = (isset($object->note_private) ? $object->note_private : null);
-			// handle date_delivery: in customer oder/supplier order, the property name is delivery_date, in shipment/reception it is date_delivery
+			// handle date_delivery: in customer order/supplier order, the property name is delivery_date, in shipment/reception it is date_delivery
 			$date_delivery = null;
 			if (property_exists($object, 'date_delivery')) {
 				$date_delivery =  $object->date_delivery;
 			} elseif (property_exists($object, delivery_date')) {
-  				$date_delivery =  $object->delivery_date;
+   				$date_delivery =  $object->delivery_date;
 			}
 			$substitutionarray['__DATE_DELIVERY__'] = (isset($date_delivery) ? dol_print_date($date_delivery, 'day', 0, $outputlangs) : '');
 			$substitutionarray['__DATE_DELIVERY_DAY__'] = (isset($date_delivery) ? dol_print_date($date_delivery, "%d") : '');

From 0158b2b8324ffb13299a61cab959f8bcb0c020fd Mon Sep 17 00:00:00 2001
From: Joachim Kueter <priojk@users.noreply.github.com>
Date: Tue, 7 Jan 2025 09:17:00 +0100
Subject: [PATCH 029/243] Update functions.lib.php

trying to solve indentation issue
---
 htdocs/core/lib/functions.lib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 53c326c22fa..b3f54ea2d54 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8307,6 +8307,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__REF_SUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : null);
 			$substitutionarray['__NOTE_PUBLIC__'] = (isset($object->note_public) ? $object->note_public : null);
 			$substitutionarray['__NOTE_PRIVATE__'] = (isset($object->note_private) ? $object->note_private : null);
+			
 			// handle date_delivery: in customer order/supplier order, the property name is delivery_date, in shipment/reception it is date_delivery
 			$date_delivery = null;
 			if (property_exists($object, 'date_delivery')) {

From 48a33932644f4377e775a3c9e53dbc1fe12a2e47 Mon Sep 17 00:00:00 2001
From: Joachim Kueter <priojk@users.noreply.github.com>
Date: Tue, 7 Jan 2025 09:21:46 +0100
Subject: [PATCH 030/243] Update functions.lib.php

trying to solve indentation
---
 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 b3f54ea2d54..82b983e1026 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8312,7 +8312,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$date_delivery = null;
 			if (property_exists($object, 'date_delivery')) {
 				$date_delivery =  $object->date_delivery;
-			} elseif (property_exists($object, delivery_date')) {
+			} else if (property_exists($object, delivery_date')) {
    				$date_delivery =  $object->delivery_date;
 			}
 			$substitutionarray['__DATE_DELIVERY__'] = (isset($date_delivery) ? dol_print_date($date_delivery, 'day', 0, $outputlangs) : '');

From dd41f3f47d5e391848cad4564309a20f1688a24e Mon Sep 17 00:00:00 2001
From: Joachim Kueter <priojk@users.noreply.github.com>
Date: Tue, 7 Jan 2025 09:25:00 +0100
Subject: [PATCH 031/243] Update functions.lib.php

trying to solve whitespace/indentation issues
---
 htdocs/core/lib/functions.lib.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 82b983e1026..47d7dccd6eb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8307,12 +8307,11 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__REF_SUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : null);
 			$substitutionarray['__NOTE_PUBLIC__'] = (isset($object->note_public) ? $object->note_public : null);
 			$substitutionarray['__NOTE_PRIVATE__'] = (isset($object->note_private) ? $object->note_private : null);
-			
 			// handle date_delivery: in customer order/supplier order, the property name is delivery_date, in shipment/reception it is date_delivery
 			$date_delivery = null;
-			if (property_exists($object, 'date_delivery')) {
+				if (property_exists($object, 'date_delivery')) {
 				$date_delivery =  $object->date_delivery;
-			} else if (property_exists($object, delivery_date')) {
+			} elseif (property_exists($object, delivery_date')) {
    				$date_delivery =  $object->delivery_date;
 			}
 			$substitutionarray['__DATE_DELIVERY__'] = (isset($date_delivery) ? dol_print_date($date_delivery, 'day', 0, $outputlangs) : '');

From 7689e0b210e0744b4258b21f6140625554f78a44 Mon Sep 17 00:00:00 2001
From: Joachim Kueter <priojk@users.noreply.github.com>
Date: Tue, 7 Jan 2025 09:28:17 +0100
Subject: [PATCH 032/243] Update functions.lib.php

solve indentation
---
 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 47d7dccd6eb..53c326c22fa 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8309,7 +8309,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__NOTE_PRIVATE__'] = (isset($object->note_private) ? $object->note_private : null);
 			// handle date_delivery: in customer order/supplier order, the property name is delivery_date, in shipment/reception it is date_delivery
 			$date_delivery = null;
-				if (property_exists($object, 'date_delivery')) {
+			if (property_exists($object, 'date_delivery')) {
 				$date_delivery =  $object->date_delivery;
 			} elseif (property_exists($object, delivery_date')) {
    				$date_delivery =  $object->delivery_date;

From 259088c28056ce6c0d29064ce4696b5344e57553 Mon Sep 17 00:00:00 2001
From: Joachim Kueter <priojk@users.noreply.github.com>
Date: Tue, 7 Jan 2025 09:35:37 +0100
Subject: [PATCH 033/243] Update functions.lib.php

fixed typo...
---
 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 53c326c22fa..3ea1c942c5a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8311,7 +8311,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$date_delivery = null;
 			if (property_exists($object, 'date_delivery')) {
 				$date_delivery =  $object->date_delivery;
-			} elseif (property_exists($object, delivery_date')) {
+			} elseif (property_exists($object, 'delivery_date')) {
    				$date_delivery =  $object->delivery_date;
 			}
 			$substitutionarray['__DATE_DELIVERY__'] = (isset($date_delivery) ? dol_print_date($date_delivery, 'day', 0, $outputlangs) : '');

From c218eaa6ed6ca5e97ddbdaa6c68a8934bede5831 Mon Sep 17 00:00:00 2001
From: uvaldenaire-opendsi <uvaldenaire@easya.solutions>
Date: Tue, 7 Jan 2025 12:10:40 +0100
Subject: [PATCH 034/243] fix join societe_commerciaux in societe list

---
 htdocs/societe/list.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 21e811c25c8..59c79e2ec95 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -516,7 +516,7 @@ if ($search_sale == -2) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
 	//elseif ($search_sale || (empty($user->rights->societe->client->voir) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->societe->client->readallthirdparties_advance)) && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 } elseif (!empty($search_sale) && $search_sale != '-1' || (empty($user->rights->societe->client->voir) && !$socid)) {
-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux AS sc ON s.rowid = sc.fk_soc";
 }
 // Add table from hooks
 $parameters = array();
@@ -527,9 +527,6 @@ $sql .= " WHERE s.entity IN (".getEntity('societe').")";
 if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
-if ($search_sale && $search_sale != '-1' && $search_sale != '-2') {
-	$sql .= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-}
 if (empty($user->rights->fournisseur->lire)) {
 	$sql .= " AND (s.fournisseur <> 1 OR s.client <> 0)"; // client=0, fournisseur=0 must be visible
 }

From 92d448cfe61b8eb3a51715a76411abf35fe6a9ac Mon Sep 17 00:00:00 2001
From: Joachim Kueter <priojk@users.noreply.github.com>
Date: Tue, 7 Jan 2025 14:02:47 +0100
Subject: [PATCH 035/243] Update functions.lib.php

fixed spaces

From 5c7fd531db29488801bb1b659a4d33ab4d6ba76e Mon Sep 17 00:00:00 2001
From: Joachim Kueter <priojk@users.noreply.github.com>
Date: Tue, 7 Jan 2025 15:01:50 +0100
Subject: [PATCH 036/243] Update functions.lib.php

white space

From ec58ee940a8de664875d826f2c9ac3eca4b612d5 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Tue, 7 Jan 2025 17:09:48 +0100
Subject: [PATCH 037/243] FIX: product variants copy: also copy multiprice
 variations

---
 .../class/ProductCombination.class.php        | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 42e3bdc1530..fa642dc2765 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -702,16 +702,16 @@ class ProductCombination
 	 * [...]
 	 * )
 	 *
-	 * @param User 			$user 				Object user
-	 * @param Product 		$product 			Parent product
-	 * @param array 		$combinations 		Attribute and value combinations.
-	 * @param array 		$variations 		Price and weight variations
-	 * @param bool|array 	$price_var_percent 	Is the price variation a relative variation?
-	 * @param bool|float 	$forced_pricevar 	If the price variation is forced
-	 * @param bool|float 	$forced_weightvar 	If the weight variation is forced
-	 * @param bool|string 	$forced_refvar 		If the reference is forced
-	 * @param string 	    $ref_ext            External reference
-	 * @return int 								<0 KO, >0 OK
+	 * @param User 				$user 				Object user
+	 * @param Product 			$product 			Parent product
+	 * @param array 			$combinations 		Attribute and value combinations.
+	 * @param array 			$variations 		Price and weight variations
+	 * @param bool|array		$price_var_percent 	Is the price variation a relative variation?
+	 * @param bool|float|array	$forced_pricevar 	If the price variation is forced
+	 * @param bool|float 		$forced_weightvar 	If the weight variation is forced
+	 * @param bool|string 		$forced_refvar 		If the reference is forced
+	 * @param string 	    	$ref_ext            External reference
+	 * @return int 									<0 KO, >0 OK
 	 */
 	public function createProductCombination(User $user, Product $product, array $combinations, array $variations, $price_var_percent = false, $forced_pricevar = false, $forced_weightvar = false, $forced_refvar = false, $ref_ext = '')
 	{
@@ -752,8 +752,8 @@ class ProductCombination
 			$price_impact = $forced_pricevar;
 		}
 
-		if (!array($price_var_percent)) {
-			$price_var_percent[1] = (float) $price_var_percent;
+		if (!is_array($price_var_percent)) {
+			$price_var_percent = array(1 => (float) $price_var_percent);
 		}
 
 		$newcomb = new ProductCombination($this->db);
@@ -840,12 +840,7 @@ class ProductCombination
 				$productCombinationLevel->fk_product_attribute_combination = $newcomb->id;
 				$productCombinationLevel->fk_price_level = $i;
 				$productCombinationLevel->variation_price = $price_impact[$i];
-
-				if (is_array($price_var_percent)) {
-					$productCombinationLevel->variation_price_percentage = (empty($price_var_percent[$i]) ? false : $price_var_percent[$i]);
-				} else {
-					$productCombinationLevel->variation_price_percentage = $price_var_percent;
-				}
+				$productCombinationLevel->variation_price_percentage = (empty($price_var_percent[$i]) ? false : $price_var_percent[$i]);
 
 				$newcomb->combination_price_levels[$i] = $productCombinationLevel;
 			}
@@ -955,13 +950,26 @@ class ProductCombination
 				$variations[$tmp_pc2v->fk_prod_attr] = $tmp_pc2v->fk_prod_attr_val;
 			}
 
+            $variation_price_percentage = $combination->variation_price_percentage;
+            $variation_price = $combination->variation_price;
+
+			if (getDolGlobalInt('PRODUIT_MULTIPRICES') && getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT') > 1) {
+				$variation_price_percentage = [ ];
+				$variation_price = [ ];
+
+				foreach ($combination->combination_price_levels as $productCombinationLevel) {
+					$variation_price_percentage[$productCombinationLevel->fk_price_level] = $productCombinationLevel->variation_price_percentage;
+					$variation_price[$productCombinationLevel->fk_price_level] = $productCombinationLevel->variation_price;
+				}
+			}
+
 			if ($this->createProductCombination(
 				$user,
 				$destProduct,
 				$variations,
 				array(),
-				$combination->variation_price_percentage,
-				$combination->variation_price,
+				$variation_price_percentage,
+				$variation_price,
 				$combination->variation_weight
 			) < 0) {
 				return -1;

From 3ef6299c839aa0e1ae473e65942a6ace54dc6644 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Tue, 7 Jan 2025 17:20:57 +0100
Subject: [PATCH 038/243] FIX: phpcs

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

diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index fa642dc2765..e41325f6efb 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -950,8 +950,8 @@ class ProductCombination
 				$variations[$tmp_pc2v->fk_prod_attr] = $tmp_pc2v->fk_prod_attr_val;
 			}
 
-            $variation_price_percentage = $combination->variation_price_percentage;
-            $variation_price = $combination->variation_price;
+			$variation_price_percentage = $combination->variation_price_percentage;
+			$variation_price = $combination->variation_price;
 
 			if (getDolGlobalInt('PRODUIT_MULTIPRICES') && getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT') > 1) {
 				$variation_price_percentage = [ ];

From ef564caf28bafb827aec71697e58f2a0e4302fca Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Tue, 7 Jan 2025 17:37:30 +0100
Subject: [PATCH 039/243] FIX: qual

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

diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index e41325f6efb..163ea7be5bd 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -753,7 +753,7 @@ class ProductCombination
 		}
 
 		if (!is_array($price_var_percent)) {
-			$price_var_percent = array(1 => (float) $price_var_percent);
+			$price_var_percent = array(1 => (bool) $price_var_percent);
 		}
 
 		$newcomb = new ProductCombination($this->db);
@@ -840,7 +840,7 @@ class ProductCombination
 				$productCombinationLevel->fk_product_attribute_combination = $newcomb->id;
 				$productCombinationLevel->fk_price_level = $i;
 				$productCombinationLevel->variation_price = $price_impact[$i];
-				$productCombinationLevel->variation_price_percentage = (empty($price_var_percent[$i]) ? false : $price_var_percent[$i]);
+				$productCombinationLevel->variation_price_percentage = $price_var_percent[$i];
 
 				$newcomb->combination_price_levels[$i] = $productCombinationLevel;
 			}

From 169b2ce4e81977278b96ee9976635cc340b2045f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 7 Jan 2025 21:52:26 +0100
Subject: [PATCH 040/243] Update functions.lib.php

---
 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 3ea1c942c5a..d2e1d11a6d8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8312,7 +8312,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			if (property_exists($object, 'date_delivery')) {
 				$date_delivery =  $object->date_delivery;
 			} elseif (property_exists($object, 'delivery_date')) {
-   				$date_delivery =  $object->delivery_date;
+				$date_delivery =  $object->delivery_date;
 			}
 			$substitutionarray['__DATE_DELIVERY__'] = (isset($date_delivery) ? dol_print_date($date_delivery, 'day', 0, $outputlangs) : '');
 			$substitutionarray['__DATE_DELIVERY_DAY__'] = (isset($date_delivery) ? dol_print_date($date_delivery, "%d") : '');

From 3737f3c0cd5f8cca1d2f73e506bcaa463971318e Mon Sep 17 00:00:00 2001
From: GregM <gregory.maza@atm-consulting.fr>
Date: Wed, 8 Jan 2025 12:30:46 +0100
Subject: [PATCH 041/243] FIX select 2 no record found

---
 htdocs/core/class/html.form.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index aaf856152b7..329017cc3b2 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8890,7 +8890,8 @@ class Form
 								escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work
 								// Specify format function for selected item
 								formatSelection: formatSelection,
-							 	templateSelection: formatSelection		/* For 4.0 */
+							 	templateSelection: formatSelection,		/* For 4.0 */
+							 	language: select2arrayoflanguage
 							});
 
 							/* Add also morecss to the css .select2 that is after the #htmlname, for component that are show dynamically after load, because select2 set

From 0c05b8110f3d8f3c3054bb76be3464fbffa6f001 Mon Sep 17 00:00:00 2001
From: Hystepik <lmarcouiller@nltechno.com>
Date: Wed, 8 Jan 2025 16:19:06 +0100
Subject: [PATCH 042/243] Fix fatal error on sprintf with translate

---
 htdocs/core/class/translate.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 92b32d2f257..3916ef277d6 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -699,6 +699,10 @@ class Translate
 				$str
 			);
 
+			if (preg_match('/%\)/', $str)) {
+				$str = preg_replace('/%\)/', '__percent__)', $str);
+			}
+
 			if (strpos($key, 'Format') !== 0) {
 				try {
 					// @phan-suppress-next-line PhanPluginPrintfVariableFormatString
@@ -708,6 +712,8 @@ class Translate
 				}
 			}
 
+			$str = str_replace('__percent__', '%', $str);
+
 			// Encode string into HTML
 			$str = htmlentities($str, ENT_COMPAT, $this->charset_output); // Do not convert simple quotes in translation (strings in html are embraced by "). Use dol_escape_htmltag around text in HTML content
 

From 8e427353e08c5ec6f18ce7a7adc948af2cf80f9c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Thu, 9 Jan 2025 07:39:24 +0100
Subject: [PATCH 043/243] FIX avoid to show html entities

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 7c6ad95a238..1b0b28bbb83 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2063,7 +2063,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '<td>';
 				if (!empty($object->api_key)) {
 					print '<span class="opacitymedium">';
-					print showValueWithClipboardCPButton($object->api_key, 1, $langs->trans("Hidden"));		// TODO Add an option to also reveal the hash, not only copy paste
+					print showValueWithClipboardCPButton($object->api_key, 1, $langs->transnoentities("Hidden"));		// TODO Add an option to also reveal the hash, not only copy paste
 					print '</span>';
 				}
 				print '</td></tr>';

From 3fcdba2bc3e1fd5db1d2aa0110c473ee62c0ffde Mon Sep 17 00:00:00 2001
From: Hystepik <lmarcouiller@nltechno.com>
Date: Thu, 9 Jan 2025 09:21:45 +0100
Subject: [PATCH 044/243] better fix for performance

---
 htdocs/core/class/translate.class.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 3916ef277d6..905ccf9349b 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -699,9 +699,7 @@ class Translate
 				$str
 			);
 
-			if (preg_match('/%\)/', $str)) {
-				$str = preg_replace('/%\)/', '__percent__)', $str);
-			}
+			$str = preg_replace('/%\)/', '__percent__)', $str);
 
 			if (strpos($key, 'Format') !== 0) {
 				try {

From f0449e349f0adb37cdea60f1268b93232386f93a Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 9 Jan 2025 09:59:23 +0100
Subject: [PATCH 045/243] fix: php warning

---
 htdocs/core/modules/commande/mod_commande_marbre.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index e5e2e525342..e229e17f89e 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -57,7 +57,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 	{
 		global $conf, $mysoc;
 
-		if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 16.0 && $mysoc->country_code != 'FR') {
+		if ((float) getDolGlobalString('MAIN_VERSION_LAST_INSTALL') >= 16.0 && $mysoc->country_code != 'FR') {
 			$this->prefix = 'SO'; // We use correct standard code "SO = Sale Order"
 		}
 	}

From 4934a335b0bed1d8a36c1808c606d119b277a42d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Thu, 9 Jan 2025 10:09:23 +0100
Subject: [PATCH 046/243] FIX use transnoentities to avoid html entities

---
 htdocs/user/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 1b0b28bbb83..b1f82031b6b 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1211,7 +1211,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			// We do not use a field password but a field text to show new password to use.
 			$valuetoshow .= ($valuetoshow ? ' + '.$langs->trans("DolibarrPassword") : '').'<input class="minwidth300 maxwidth400 widthcentpercentminusx" maxlength="128" type="text" id="password" name="password" value="'.dol_escape_htmltag($password).'" autocomplete="new-password">';
 			if (!empty($conf->use_javascript_ajax)) {
-				$valuetoshow .= img_picto($langs->trans('Generate'), 'refresh', 'id="generate_password" class="linkobject paddingleft"');
+				$valuetoshow .= img_picto($langs->transnoentities('Generate'), 'refresh', 'id="generate_password" class="linkobject paddingleft"');
 			}
 		}
 	}
@@ -1235,7 +1235,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 		print '<td>';
 		print '<input class="minwidth300 maxwidth400 widthcentpercentminusx" minlength="12" maxlength="128" type="text" id="api_key" name="api_key" value="'.GETPOST('api_key', 'alphanohtml').'" autocomplete="off">';
 		if (!empty($conf->use_javascript_ajax)) {
-			print img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject paddingleft"');
+			print img_picto($langs->transnoentities('Generate'), 'refresh', 'id="generate_api_key" class="linkobject paddingleft"');
 		}
 		print '</td></tr>';
 	} else {
@@ -2626,7 +2626,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				if ($permissiontoeditpasswordandsee) {
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<input maxlength="128" type="password" class="flat" id="password" name="password" value="'.dol_escape_htmltag($object->pass).'" autocomplete="new-password">';
 					if (!empty($conf->use_javascript_ajax)) {
-						$valuetoshow .= img_picto((getDolGlobalString('USER_PASSWORD_GENERATED') === 'none' ? $langs->trans('NoPasswordGenerationRuleConfigured') : $langs->trans('Generate')), 'refresh', 'id="generate_password" class="paddingleft'.(getDolGlobalString('USER_PASSWORD_GENERATED') === 'none' ? ' opacitymedium' : ' linkobject').'"');
+						$valuetoshow .= img_picto((getDolGlobalString('USER_PASSWORD_GENERATED') === 'none' ? $langs->transnoentities('NoPasswordGenerationRuleConfigured') : $langs->transnoentities('Generate')), 'refresh', 'id="generate_password" class="paddingleft'.(getDolGlobalString('USER_PASSWORD_GENERATED') === 'none' ? ' opacitymedium' : ' linkobject').'"');
 					}
 				} else {
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);

From 029569954358539998885ce37cbd1288f3eaf7f4 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 9 Jan 2025 10:21:20 +0100
Subject: [PATCH 047/243] fix: avoid php8 warning/error on failed notification

---
 .../interface_50_modNotification_Notification.class.php        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index 8fceee8e47a..d1095b14745 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -96,6 +96,9 @@ class InterfaceNotification extends DolibarrTriggers
 		$notify = new Notify($this->db);
 		$resultSend = $notify->send($action, $object);
 		if ($resultSend < 0) {
+			if (!isset($this->errors)) {
+				$this->errors = [];
+			}
 			$this->errors = array_merge($this->errors, $notify->errors);
 			return $resultSend;
 		}

From 41b07d1630a9707f0cc201f70ef2b06cd98ee40a Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Thu, 9 Jan 2025 10:36:48 +0100
Subject: [PATCH 048/243] FIX compatibility with externals modules

---
 htdocs/user/card.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index b1f82031b6b..9ee8f3d2b91 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1980,7 +1980,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</tr>';
 
 			// Date login validity
-			print '<tr class="nooddeven"><td class="titlefieldmax45">'.$langs->trans("RangeOfLoginValidity").'</td>';
+			print '<tr class="nooddeven"><td class="titlefieldmax45 nowraponall">'.$langs->trans("RangeOfLoginValidity").'</td>';
 			print '<td>';
 			if ($object->datestartvalidity) {
 				print '<span class="opacitymedium">'.$langs->trans("FromDate").'</span> ';
@@ -2043,9 +2043,9 @@ if ($action == 'create' || $action == 'adduserldap') {
 			// Other form for user password
 			$parameters = array('valuetoshow' => $valuetoshow, 'caneditpasswordandsee' => $permissiontoeditpasswordandsee, 'caneditpasswordandsend' => $permissiontoeditpasswordandsend);
 			$reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			if ($reshook > 0) {
+			if ($reshook === 1) {
 				$valuetoshow = $hookmanager->resPrint; // to replace
-			} else {
+			} elseif (empty($reshook)) {
 				$valuetoshow .= $hookmanager->resPrint; // to add
 			}
 
@@ -2057,6 +2057,11 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '</tr>'."\n";
 			}
 
+			// for compatibility with externals modules
+			if ($reshook > 1) {
+				print $hookmanager->resPrint;
+			}
+
 			// API key
 			if (isModEnabled('api') && ($user->id == $id || $user->admin || $user->hasRight("api", "apikey", "generate"))) {
 				print '<tr class="nooddeven"><td>'.$langs->trans("ApiKey").'</td>';

From e612bb05599deaf712b5158d980251c1bd223273 Mon Sep 17 00:00:00 2001
From: atm-florian <florian.mortgat@atm-consulting.fr>
Date: Thu, 9 Jan 2025 10:50:47 +0100
Subject: [PATCH 049/243] FIX 20.0 - PHP8 fatal when creating a reception if no
 corresponding PDF model enabled

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

diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 488fef75ffe..b1791d3da04 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -947,7 +947,7 @@ if ($action == 'create') {
 			include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
 			$list = ModelePdfReception::liste_modeles($db);
 
-			if (count($list) > 1) {
+			if (is_array($list) && count($list) > 1) {
 				print "<tr><td>".$langs->trans("DefaultModel")."</td>";
 				print '<td colspan="3">';
 				print $form->selectarray('model', $list, $conf->global->RECEPTION_ADDON_PDF);

From 7618df8726d9564d60b1f70cf28263e9fe1d2f05 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Thu, 9 Jan 2025 11:04:32 +0100
Subject: [PATCH 050/243] FIX remove html entities

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 9ee8f3d2b91..816cd95db31 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2656,7 +2656,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				if ($permissiontoeditpasswordandsee || $user->hasRight("api", "apikey", "generate")) {
 					print '<input class="minwidth300 maxwidth400 widthcentpercentminusx" minlength="12" maxlength="128" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';
 					if (!empty($conf->use_javascript_ajax)) {
-						print img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject paddingleft"');
+						print img_picto($langs->transnoentities('Generate'), 'refresh', 'id="generate_api_key" class="linkobject paddingleft"');
 					}
 				}
 				print '</td></tr>';

From 7e82f70c77aa42718cb6009d72cb5d806ca7175e Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Thu, 9 Jan 2025 11:05:45 +0100
Subject: [PATCH 051/243] add case when HTML tags contain attributes

---
 htdocs/includes/odtphp/odf.php |  4 ++--
 test/phpunit/ODFTest.php       | 22 ++++++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index f5678d838a3..39f595f4934 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -46,8 +46,8 @@ class Odf
 	public $userdefined=array();
 
 	const PIXEL_TO_CM = 0.026458333;
-	const FIND_TAGS_REGEX = '/<([A-Za-z0-9]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(((?!<\1>).)*)<\/\1>))/s';
-	const FIND_ENCODED_TAGS_REGEX = '/&lt;([A-Za-z]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/&gt;)|(?:&gt;(((?!&lt;\1&gt;).)*)&lt;\/\1&gt;))/';
+	const FIND_TAGS_REGEX = '/<([A-Za-z0-9]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(((?!<\1(\s.*)?>).)*)<\/\1>))/s';
+	const FIND_ENCODED_TAGS_REGEX = '/&lt;([A-Za-z]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/&gt;)|(?:&gt;(((?!&lt;\1(\s.*)?&gt;).)*)&lt;\/\1&gt;))/';
 
 
 	/**
diff --git a/test/phpunit/ODFTest.php b/test/phpunit/ODFTest.php
index ab1a2c74d48..2badd77baf6 100644
--- a/test/phpunit/ODFTest.php
+++ b/test/phpunit/ODFTest.php
@@ -302,33 +302,39 @@ class ODFTest extends PHPUnit\Framework\TestCase
 				'charset' => null,
 				'expected' => utf8_encode('text with <text:span text:style-name="boldText">two</text:span> (strong) <text:span text:style-name="boldText">tags</text:span>'),
 			],
+			25 => [
+				'to_convert' => "text with <strong class=\"whatever\">two</strong> (strong) <strong class=\"the weather\">tags and <u>intricated</u> underline </strong>",
+				'encode' => true,
+				'charset' => null,
+				'expected' => utf8_encode('text with <text:span text:style-name="boldText">two</text:span> (strong) <text:span text:style-name="boldText">tags and <text:span text:style-name="underlineText">intricated</text:span> underline </text:span>'),
+			],
 
 			// One can also pass html-encoded string to the method
-			25 => [
+			26 => [
 				'to_convert' => 'One&amp;two',
 				'encode' => true,
 				'charset' => null,
 				'expected' => 'One&amp;two',
 			],
-			26 => [
+			27 => [
 				'to_convert' => "text with &lt;strong&gt;strong, &lt;/strong&gt;&lt;em&gt;emphasis&lt;/em&gt; and &lt;u&gt;underlined&lt;/u&gt; words with &lt;i&gt;it@lic sp&amp;ciàlchärs éè l'&lt;/i&gt;",
 				'encode' => false,
 				'charset' => 'UTF-8',
 				'expected' => 'text with <text:span text:style-name="boldText">strong, </text:span><text:span text:style-name="italicText">emphasis</text:span> and <text:span text:style-name="underlineText">underlined</text:span> words with <text:span text:style-name="italicText">it@lic sp&ciàlchärs éè l\'</text:span>',
 			],
-			27 => [
+			28 => [
 				'to_convert' => "text with &lt;strong&gt;strong, &lt;/strong&gt;&lt;em&gt;emphasis&lt;/em&gt; and &lt;u&gt;underlined&lt;/u&gt; words with &lt;i&gt;it@lic sp&amp;ciàlchärs éè l'&lt;/i&gt;",
 				'encode' => true,
 				'charset' => 'UTF-8',
 				'expected' => 'text with <text:span text:style-name="boldText">strong, </text:span><text:span text:style-name="italicText">emphasis</text:span> and <text:span text:style-name="underlineText">underlined</text:span> words with <text:span text:style-name="italicText">it@lic sp&amp;ciàlchärs éè l&apos;</text:span>',
 			],
-			28 => [
+			29 => [
 				'to_convert' => "text with &lt;strong&gt;strong, &lt;/strong&gt;&lt;em&gt;emphasis&lt;/em&gt; and &lt;u&gt;underlined&lt;/u&gt; words with &lt;i&gt;it@lic sp&amp;ciàlchärs éè l'&lt;/i&gt;",
 				'encode' => false,
 				'charset' => null,
 				'expected' => utf8_encode('text with <text:span text:style-name="boldText">strong, </text:span><text:span text:style-name="italicText">emphasis</text:span> and <text:span text:style-name="underlineText">underlined</text:span> words with <text:span text:style-name="italicText">it@lic sp&ciàlchärs éè l\'</text:span>'),
 			],
-			29 => [
+			30 => [
 				'to_convert' => "text with &lt;strong&gt;strong, &lt;/strong&gt;&lt;em&gt;emphasis&lt;/em&gt; and &lt;u&gt;underlined&lt;/u&gt; words with &lt;i&gt;it@lic sp&amp;ciàlchärs éè l'&lt;/i&gt;",
 				'encode' => true,
 				'charset' => null,
@@ -347,20 +353,20 @@ class ODFTest extends PHPUnit\Framework\TestCase
 			// Following tests reflect the current behavior. They may evolve if the method behavior changes.
 
 			// The method removes hyperlinks and tags that are not dealt with.
-			30 => [
+			31 => [
 				'to_convert' => '123 <a href="/test.php">trucmachin > truc < troc > trac</a>bla bla',
 				'encode' => true,
 				'charset' => null,
 				'expected' => "123 trucmachin &gt; truc &lt; troc &gt; tracbla bla",
 			],
-			31 => [
+			32 => [
 				'to_convert' => '123 <h3>Title</h3> bla',
 				'encode' => true,
 				'charset' => null,
 				'expected' => "123 Title bla",
 			],
 			// HTML should not take \n into account, but only <br />.
-			32 => [
+			33 => [
 				'to_convert' => "text with <strong>strong text </strong>, a line\nbreak and <u>underlined</u> words with <i>it@lic sp&ciàlchärs éè l'</i>",
 				'encode' => false,
 				'charset' => 'UTF-8',

From 90713d7773ed8cf46592f26c2e6c757a5fbf865a Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Thu, 9 Jan 2025 12:07:03 +0100
Subject: [PATCH 052/243] FIX wrong alias table

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

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index e5119d46c56..9968411c62e 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -444,7 +444,7 @@ if (isModEnabled('don') && $user->hasRight('don', 'lire')) {
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedDonations", $max);
-		print '<a href="'.DOL_URL_ROOT.'/don/list.php?sortfield=f.tms&sortorder=desc"><span class="badge marginleftonly">...</span></a>';
+		print '<a href="'.DOL_URL_ROOT.'/don/list.php?sortfield=d.tms&sortorder=desc"><span class="badge marginleftonly">...</span></a>';
 		print '</th>';
 		print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
 		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';

From 0912b3b04f026f668a527cc99cbbc9ccf341752e Mon Sep 17 00:00:00 2001
From: uvaldenaire-opendsi <uvaldenaire@easya.solutions>
Date: Thu, 9 Jan 2025 15:04:37 +0100
Subject: [PATCH 053/243] fix selectcontacts  param

---
 htdocs/comm/action/card.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 99d330b745a..0310ac0b225 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1181,8 +1181,14 @@ if ($action == 'create') {
 			$preselectedids[GETPOST('contactid', 'int')] = GETPOST('contactid', 'int');
 		}
 		if ($origin=='contact') $preselectedids[GETPOST('originid', 'int')] = GETPOST('originid', 'int');
+		// select "all" or "none" contact by default
+		if (getDolGlobalInt('MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT')) {
+			$select_contact_default = 0; // select "all" contacts by default : avoid to use it if there is a lot of contacts
+		} else {
+			$select_contact_default = -1; // select "none" by default
+		}
 		print img_picto('', 'contact', 'class="paddingrightonly"');
-		print $form->selectcontacts(GETPOST('socid', 'int'), $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'minwidth300 quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid');
+		print $form->selectcontacts(GETPOSTISSET('socid') ? GETPOSTINT('socid') : $select_contact_default, $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'minwidth300 quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid');
 		print '</td></tr>';
 	}
 

From e37b6fac4d54cd73f509ee889c1bc5335f6ec135 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 9 Jan 2025 20:26:22 +0100
Subject: [PATCH 054/243] Fix pb in output of label of email

---
 htdocs/core/lib/company.lib.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 39b3037aea5..30a8242a7ec 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -2119,11 +2119,13 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 				$out .= dol_trunc($libelle, 120);
 			}
 			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') {
-				$out .= '<a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"), "email").' ';
 				$transcode = $langs->trans("Action".$histo[$key]['acode']);
 				$libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : 'Send mass mailing');
+				$out .= '<a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'"';
 				$out .= ' title="'.dol_escape_htmltag($libelle).'">';
+				$out .= img_object($langs->trans("ShowEMailing"), "email").' ';
 				$out .= dol_trunc($libelle, 120);
+				$out .= '</a>';
 			}
 			$out .= '</td>';
 

From 3f7d5cf790b9f5d074e02f71bd0301b3d0cff4c1 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 10 Jan 2025 00:33:51 +0100
Subject: [PATCH 055/243] NEW add hook 'addMoreInformationsBlock'

---
 htdocs/user/card.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 816cd95db31..84da0249955 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2088,6 +2088,13 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</table>';
 			print '</div>';
 
+			// Other informations block
+			$parameters = array('caneditpasswordandsee' => $permissiontoeditpasswordandsee, 'caneditpasswordandsend' => $permissiontoeditpasswordandsend);
+			$reshook = $hookmanager->executeHooks('addMoreInformationsBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			if ($reshook > 0) {
+				print $hookmanager->resPrint;
+			}
+
 			print '</div>';
 
 			print '</div>';

From 8d11c1625f366601d5708631e2096c6494440c94 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 10 Jan 2025 03:04:55 +0100
Subject: [PATCH 056/243] FIX wrong hook name

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 84da0249955..3a5987bf59f 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2088,9 +2088,9 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</table>';
 			print '</div>';
 
-			// Other informations block
+			// Other informations bloc
 			$parameters = array('caneditpasswordandsee' => $permissiontoeditpasswordandsee, 'caneditpasswordandsend' => $permissiontoeditpasswordandsend);
-			$reshook = $hookmanager->executeHooks('addMoreInformationsBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			$reshook = $hookmanager->executeHooks('addMoreInformationBloc', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			if ($reshook > 0) {
 				print $hookmanager->resPrint;
 			}

From f8b957fd0d68a7366e44da455d2f7f5a1f5f5862 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 10 Jan 2025 03:10:01 +0100
Subject: [PATCH 057/243] FIX tu veux ou tu veux pas ?

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 3a5987bf59f..7db5b6ba454 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2090,7 +2090,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 			// Other informations bloc
 			$parameters = array('caneditpasswordandsee' => $permissiontoeditpasswordandsee, 'caneditpasswordandsend' => $permissiontoeditpasswordandsend);
-			$reshook = $hookmanager->executeHooks('addMoreInformationBloc', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			$reshook = $hookmanager->executeHooks('addMoreInformationBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			if ($reshook > 0) {
 				print $hookmanager->resPrint;
 			}

From 5ab7e9ec3fdaa634de7e92d72cec94ed423bcbe6 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 10 Jan 2025 03:21:20 +0100
Subject: [PATCH 058/243] FIX use the right hook name

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 7db5b6ba454..e2992a25f46 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2088,9 +2088,9 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</table>';
 			print '</div>';
 
-			// Other informations bloc
+			// Add more object block
 			$parameters = array('caneditpasswordandsee' => $permissiontoeditpasswordandsee, 'caneditpasswordandsend' => $permissiontoeditpasswordandsend);
-			$reshook = $hookmanager->executeHooks('addMoreInformationBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			$reshook = $hookmanager->executeHooks('addMoreObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			if ($reshook > 0) {
 				print $hookmanager->resPrint;
 			}

From bbcb43e27d1570d89012ec3a2b1df3c69e6714b7 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 10 Jan 2025 06:25:47 +0100
Subject: [PATCH 059/243] FIX Loan - Insurance amount need decimals

---
 htdocs/loan/card.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 61f0823560d..02e44ce2e73 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2014-2023  Alexandre Spangaro   <aspangaro@easya.solutions>
- * Copyright (C) 2015       Frederic France      <frederic.france@free.fr>
- * Copyright (C) 2017       Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2020       Maxime DEMAREST      <maxime@indelog.fr>
+/* Copyright (C) 2014-2025	Alexandre Spangaro			<alexandre@inovea-conseil.com>
+ * Copyright (C) 2015		Frederic France				<frederic.france@free.fr>
+ * Copyright (C) 2017		Laurent Destailleur			<eldy@users.sourceforge.net>
+ * Copyright (C) 2020		Maxime DEMAREST				<maxime@indelog.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
@@ -106,7 +106,7 @@ if (empty($reshook)) {
 		if (!$cancel) {
 			$datestart = dol_mktime(12, 0, 0, GETPOSTINT('startmonth'), GETPOSTINT('startday'), GETPOSTINT('startyear'));
 			$dateend = dol_mktime(12, 0, 0, GETPOSTINT('endmonth'), GETPOSTINT('endday'), GETPOSTINT('endyear'));
-			$capital = price2num(GETPOST('capital'));
+			$capital = price2num(GETPOSTFLOAT('capital'));
 			$rate = price2num(GETPOST('rate'));
 
 			if (!$capital) {
@@ -141,7 +141,7 @@ if (empty($reshook)) {
 				$object->note_private = GETPOST('note_private', 'restricthtml');
 				$object->note_public = GETPOST('note_public', 'restricthtml');
 				$object->fk_project = GETPOSTINT('projectid');
-				$object->insurance_amount = GETPOSTINT('insurance_amount');
+				$object->insurance_amount = GETPOSTFLOAT('insurance_amount');
 
 				$accountancy_account_capital = GETPOST('accountancy_account_capital');
 				$accountancy_account_insurance = GETPOST('accountancy_account_insurance');
@@ -181,7 +181,7 @@ if (empty($reshook)) {
 
 			$datestart = dol_mktime(12, 0, 0, GETPOSTINT('startmonth'), GETPOSTINT('startday'), GETPOSTINT('startyear'));
 			$dateend = dol_mktime(12, 0, 0, GETPOSTINT('endmonth'), GETPOSTINT('endday'), GETPOSTINT('endyear'));
-			$capital = price2num(GETPOST('capital'));
+			$capital = price2num(GETPOSTFLOAT('capital'));
 
 			if (!$capital) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
@@ -192,7 +192,7 @@ if (empty($reshook)) {
 				$object->capital = $capital;
 				$object->nbterm = GETPOSTINT("nbterm");
 				$object->rate = price2num(GETPOST("rate", 'alpha'));
-				$object->insurance_amount = price2num(GETPOSTINT('insurance_amount'));
+				$object->insurance_amount = price2num(GETPOSTFLOAT('insurance_amount'));
 
 				$accountancy_account_capital = GETPOST('accountancy_account_capital');
 				$accountancy_account_insurance = GETPOST('accountancy_account_insurance');

From 3854719ee9fa46aff19ef75e5345f98ec0fd2290 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 10 Jan 2025 06:58:51 +0100
Subject: [PATCH 060/243] FIX phpstan

---
 htdocs/public/payment/paymentko.php | 1 +
 htdocs/public/payment/paymentok.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index f8460f8a799..6c63bc291ab 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -145,6 +145,7 @@ $object = new stdClass(); // For triggers
  */
 
 // Check if we have redirtodomain to do.
+$doactionsthenredirect = 0;
 if ($ws) {
 	$doactionsthenredirect = 1;
 }
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index b70871bdf2d..907d6fc0505 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -174,6 +174,7 @@ $error = 0;
 
 // Check if we have redirtodomain to do.
 $ws_virtuelhost = null;
+$doactionsthenredirect = 0;
 if ($ws) {
 	$doactionsthenredirect = 1;
 	include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';

From aa438e29be1e4cd58ea5224b6f758c3729f3b524 Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Thu, 9 Jan 2025 17:30:07 +0100
Subject: [PATCH 061/243] fix: avoid duplicate lines in inventory

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

diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 890bce9870c..559ac2cd859 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -274,7 +274,7 @@ class Inventory extends CommonObject
 			// Scan existing stock to prefill the inventory
 			$sql = "SELECT ps.rowid, ps.fk_entrepot as fk_warehouse, ps.fk_product, ps.reel,";
 			if (isModEnabled('productbatch')) {
-				$sql .= " pb.batch as batch, pb.qty as qty,";
+				$sql .= " COALESCE(pb.batch, '') as batch, pb.qty as qty,";
 			} else {
 				$sql .= " '' as batch, 0 as qty,";
 			}

From 0fe484ecd6ceec5eb3a284f4d2f875b31522f62d Mon Sep 17 00:00:00 2001
From: Hystepik <lmarcouiller@nltechno.com>
Date: Fri, 10 Jan 2025 13:00:11 +0100
Subject: [PATCH 062/243] better fix

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

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 905ccf9349b..2e7db582b5f 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -699,7 +699,7 @@ class Translate
 				$str
 			);
 
-			$str = preg_replace('/%\)/', '__percent__)', $str);
+			$str = preg_replace('/%\)/', '__percent_parentesis__', $str);
 
 			if (strpos($key, 'Format') !== 0) {
 				try {
@@ -710,7 +710,7 @@ class Translate
 				}
 			}
 
-			$str = str_replace('__percent__', '%', $str);
+			$str = str_replace('__percent_parentesis__', '%)', $str);
 
 			// Encode string into HTML
 			$str = htmlentities($str, ENT_COMPAT, $this->charset_output); // Do not convert simple quotes in translation (strings in html are embraced by "). Use dol_escape_htmltag around text in HTML content

From 49af0a49dd1bf71996bf468ff0a11088fd3a96f5 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 10 Jan 2025 14:14:00 +0100
Subject: [PATCH 063/243] Remove price2num on GETPOSTFLOAT

---
 htdocs/loan/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 02e44ce2e73..f806f9d6f84 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -106,7 +106,7 @@ if (empty($reshook)) {
 		if (!$cancel) {
 			$datestart = dol_mktime(12, 0, 0, GETPOSTINT('startmonth'), GETPOSTINT('startday'), GETPOSTINT('startyear'));
 			$dateend = dol_mktime(12, 0, 0, GETPOSTINT('endmonth'), GETPOSTINT('endday'), GETPOSTINT('endyear'));
-			$capital = price2num(GETPOSTFLOAT('capital'));
+			$capital = GETPOSTFLOAT('capital');
 			$rate = price2num(GETPOST('rate'));
 
 			if (!$capital) {
@@ -181,7 +181,7 @@ if (empty($reshook)) {
 
 			$datestart = dol_mktime(12, 0, 0, GETPOSTINT('startmonth'), GETPOSTINT('startday'), GETPOSTINT('startyear'));
 			$dateend = dol_mktime(12, 0, 0, GETPOSTINT('endmonth'), GETPOSTINT('endday'), GETPOSTINT('endyear'));
-			$capital = price2num(GETPOSTFLOAT('capital'));
+			$capital = GETPOSTFLOAT('capital');
 
 			if (!$capital) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
@@ -192,7 +192,7 @@ if (empty($reshook)) {
 				$object->capital = $capital;
 				$object->nbterm = GETPOSTINT("nbterm");
 				$object->rate = price2num(GETPOST("rate", 'alpha'));
-				$object->insurance_amount = price2num(GETPOSTFLOAT('insurance_amount'));
+				$object->insurance_amount = GETPOSTFLOAT('insurance_amount');
 
 				$accountancy_account_capital = GETPOST('accountancy_account_capital');
 				$accountancy_account_insurance = GETPOST('accountancy_account_insurance');

From 30168c5445c7af9be332c4ddb0622175ac9e0d28 Mon Sep 17 00:00:00 2001
From: Hystepik <lmarcouiller@nltechno.com>
Date: Fri, 10 Jan 2025 15:09:20 +0100
Subject: [PATCH 064/243] fix tipo

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

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 2e7db582b5f..0560bd5be94 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -699,7 +699,7 @@ class Translate
 				$str
 			);
 
-			$str = preg_replace('/%\)/', '__percent_parentesis__', $str);
+			$str = preg_replace('/%\)/', '__percent_parenthesis__', $str);
 
 			if (strpos($key, 'Format') !== 0) {
 				try {
@@ -710,7 +710,7 @@ class Translate
 				}
 			}
 
-			$str = str_replace('__percent_parentesis__', '%)', $str);
+			$str = str_replace('__percent_parenthesis__', '%)', $str);
 
 			// Encode string into HTML
 			$str = htmlentities($str, ENT_COMPAT, $this->charset_output); // Do not convert simple quotes in translation (strings in html are embraced by "). Use dol_escape_htmltag around text in HTML content

From 1cdcf9beb452430587e2570ccb92e0dfb719b09e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 10 Jan 2025 15:17:06 +0100
Subject: [PATCH 065/243] FIX #32611

---
 htdocs/user/bank.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index c7dcfc05cc3..8f534756aa4 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -94,6 +94,8 @@ $permissiontoreadhr = $user->hasRight('hrm', 'read_personal_information', 'read'
 $permissiontowritehr = $user->hasRight('hrm', 'write_personal_information', 'write');
 $permissiontosimpleedit = ($selfpermission || $canadduser);
 
+$childids = $user->getAllChildIds(1);
+
 // Ok if user->hasRight('salaries', 'readall') or user->hasRight('hrm', 'read')
 //$result = restrictedArea($user, 'salaries|hrm', $object->id, 'user&user', $feature2);
 $ok = false;
@@ -106,9 +108,13 @@ if ($user->hasRight('salaries', 'readall')) {
 if ($user->hasRight('hrm', 'read')) {
 	$ok = true;
 }
-if ($user->hasRight('expensereport', 'lire') && ($user->id == $object->id || $user->hasRight('expensereport', 'readall'))) {
+if ($user->hasRight('expensereport', 'readall') || ($user->hasRight('expensereport', 'readall') && in_array($object->id, $childids))) {
 	$ok = true;
 }
+if ($user->hasRight('holiday', 'readall') || ($user->hasRight('holiday', 'read') && in_array($object->id, $childids))) {
+	$ok = true;
+}
+var_dump($ok);
 if (!$ok) {
 	accessforbidden();
 }
@@ -277,8 +283,6 @@ if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 
-$childids = $user->getAllChildIds(1);
-
 $person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
 $title = $person_name." - ".$langs->trans('BankAccounts');
 $help_url = '';

From 796b8552e3a713afdb064db128ea4846eb51d120 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 10 Jan 2025 15:23:26 +0100
Subject: [PATCH 066/243] Fix var_dump

---
 htdocs/user/bank.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 8f534756aa4..15117a5daec 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -114,7 +114,6 @@ if ($user->hasRight('expensereport', 'readall') || ($user->hasRight('expenserepo
 if ($user->hasRight('holiday', 'readall') || ($user->hasRight('holiday', 'read') && in_array($object->id, $childids))) {
 	$ok = true;
 }
-var_dump($ok);
 if (!$ok) {
 	accessforbidden();
 }

From 77f982d1a8c3fa490c40c95e06d39f51731da055 Mon Sep 17 00:00:00 2001
From: atm-florian <florian.mortgat@atm-consulting.fr>
Date: Fri, 10 Jan 2025 16:25:27 +0100
Subject: [PATCH 067/243] FIX 17.0 - collisions in cache for dol_getIdFromCode

---
 htdocs/core/lib/functions.lib.php | 49 ++++++++++++++++---------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7fe94ff83c4..61bb1c78a2e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8876,12 +8876,13 @@ function dol_osencode($str)
  * 		@param	string	$fieldid		Field to get
  *      @param  int		$entityfilter	Filter by entity
  *      @param	string	$filters		Filters to add. WARNING: string must be escaped for SQL and not coming from user input.
+ *      @param	bool    $useCache       If true (default), cache will be queried and updated.
  *      @return int						<0 if KO, Id of code if OK
  *      @see $langs->getLabelFromKey
  */
-function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0, $filters = '')
+function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0, $filters = '', $useCache = true)
 {
-	global $cache_codes;
+	static $cache_codes = array();
 
 	// If key empty
 	if ($key == '') {
@@ -8889,8 +8890,8 @@ function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid =
 	}
 
 	// Check in cache
-	if (isset($cache_codes[$tablename][$key][$fieldid])) {	// Can be defined to 0 or ''
-		return $cache_codes[$tablename][$key][$fieldid]; // Found in cache
+	if ($useCache && isset($cache_codes[$tablename][$fieldkey][$fieldid][$entityfilter][$filters][$key])) {	// Can be defined to 0 or ''
+		return $cache_codes[$tablename][$fieldkey][$fieldid][$entityfilter][$filters][$key]; // Found in cache
 	}
 
 	dol_syslog('dol_getIdFromCode (value for field '.$fieldid.' from key '.$key.' not found into cache)', LOG_DEBUG);
@@ -8908,13 +8909,15 @@ function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid =
 	$resql = $db->query($sql);
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
+		$valuetoget = '';
 		if ($obj) {
-			$cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;
-		} else {
-			$cache_codes[$tablename][$key][$fieldid] = '';
+			$valuetoget = $obj->valuetoget;
 		}
 		$db->free($resql);
-		return $cache_codes[$tablename][$key][$fieldid];
+		if ($useCache) {
+			$cache_codes[$tablename][$fieldkey][$fieldid][$entityfilter][$filters][$key] = $valuetoget;
+		}
+		return $valuetoget;
 	} else {
 		return -1;
 	}
@@ -10839,21 +10842,21 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
  * @param int|boolean	$userRight  User action right
  * // phpcs:disable
  * @param array 		$params = [ // Various params for future : recommended rather than adding more function arguments
- *                          'attr' => [ // to add or override button attributes
- *                          'xxxxx' => '', // your xxxxx attribute you want
- *                          'class' => 'reposition', // to add more css class to the button class attribute
- *                          'classOverride' => '' // to replace class attribute of the button
- *                          ],
- *                          'confirm' => [
- *                          'url' => 'http://', // Overide Url to go when user click on action btn, if empty default url is $url.?confirm=yes, for no js compatibility use $url for fallback confirm.
- *                          'title' => '', // Overide title of modal,  if empty default title use "ConfirmBtnCommonTitle" lang key
- *                          'action-btn-label' => '', // Overide label of action button,  if empty default label use "Confirm" lang key
- *                          'cancel-btn-label' => '', // Overide label of cancel button,  if empty default label use "CloseDialog" lang key
- *                          'content' => '', // Overide text of content,  if empty default content use "ConfirmBtnCommonContent" lang key
- *                          'modal' => true, // true|false to display dialog as a modal (with dark background)
- * 						    'isDropDrown' => false, // true|false to display dialog as a dropdown (with dark background)
- *                          ],
- *                          ]
+ *                              'attr' => [ // to add or override button attributes
+ *                              'xxxxx' => '', // your xxxxx attribute you want
+ *                              'class' => 'reposition', // to add more css class to the button class attribute
+ *                              'classOverride' => '' // to replace class attribute of the button
+ *                              ],
+ *                              'confirm' => [
+ *                              'url' => 'http://', // Overide Url to go when user click on action btn, if empty default url is $url.?confirm=yes, for no js compatibility use $url for fallback confirm.
+ *                              'title' => '', // Overide title of modal,  if empty default title use "ConfirmBtnCommonTitle" lang key
+ *                              'action-btn-label' => '', // Overide label of action button,  if empty default label use "Confirm" lang key
+ *                              'cancel-btn-label' => '', // Overide label of cancel button,  if empty default label use "CloseDialog" lang key
+ *                              'content' => '', // Overide text of content,  if empty default content use "ConfirmBtnCommonContent" lang key
+ *                              'modal' => true, // true|false to display dialog as a modal (with dark background)
+ *                              'isDropDrown' => false, // true|false to display dialog as a dropdown (with dark background)
+ *                              ],
+ *                              ]
  * // phpcs:enable
  * @return string               	html button
  */

From ef4697cba31b703933eb8ac640edd14534fe7369 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 10 Jan 2025 16:54:21 +0100
Subject: [PATCH 068/243] FIX phpstan: wrong case

---
 htdocs/public/payment/newpayment.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index fcff7afc7d6..78f321ba802 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -232,7 +232,7 @@ $urlko = $urlwithroot.'/public/payment/paymentko.php?';
 
 if ($ws && !defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {	// So defined('USEEXTERNALSERVER') should be set but is not always
 	include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
-	$tmpwebsite = new WebSite($db);
+	$tmpwebsite = new Website($db);
 	$tmpwebsite->fetch(0, $ws);
 	$urlok = $tmpwebsite->virtualhost.'/public/payment/paymentok.php?';
 	$urlko = $tmpwebsite->virtualhost.'/public/payment/paymentko.php?';

From ba2dab2a443bb0b1e94780aaf524d4ce1b22cec3 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 10 Jan 2025 16:56:14 +0100
Subject: [PATCH 069/243] =?UTF-8?q?NEW=20:=20auto-detect=20country=20from?=
 =?UTF-8?q?=20code=20in=20creation=09(follow-up=E2=81=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/adherents/class/adherent.class.php     |  5 +++++
 htdocs/compta/bank/class/account.class.php    | 10 ++++++++++
 htdocs/contact/class/contact.class.php        |  5 +++++
 htdocs/product/class/product.class.php        |  4 ++++
 htdocs/product/stock/class/entrepot.class.php |  9 +++++++++
 htdocs/societe/class/societe.class.php        | 10 +++++-----
 htdocs/user/class/user.class.php              |  5 +++++
 7 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 0e168adddb2..78d9e15da87 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -761,6 +761,11 @@ class Adherent extends CommonObject
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
+		if (empty($this->country_id) && !empty($this->country_code)) {
+			$country_id = getCountry($this->country_code, '3');
+			$this->country_id = is_int($country_id) ? $country_id : 0;
+		}
+
 		$nbrowsaffected = 0;
 		$error = 0;
 
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index d3d0c3c2ddf..45a30fdef82 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -760,6 +760,11 @@ class Account extends CommonObject
 			$this->status = $this->clos;
 		}
 
+		if (empty($this->country_id) && !empty($this->country_code)) {
+			$country_id = getCountry($this->country_code, '3');
+			$this->country_id = is_int($country_id) ? $country_id : 0;
+		}
+
 		// Load the library to validate/check a BAN account
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 
@@ -900,6 +905,11 @@ class Account extends CommonObject
 	{
 		global $langs, $conf;
 
+		if (empty($this->country_id) && !empty($this->country_code)) {
+			$country_id = getCountry($this->country_code, '3');
+			$this->country_id = is_int($country_id) ? $country_id : 0;
+		}
+
 		$error = 0;
 
 		$this->db->begin();
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index f6acb419e47..83693e150ae 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -605,6 +605,11 @@ class Contact extends CommonObject
 	{
 		global $conf;
 
+		if (empty($this->country_id) && !empty($this->country_code)) {
+			$country_id = getCountry($this->country_code, '3');
+			$this->country_id = is_int($country_id) ? $country_id : 0;
+		}
+
 		$error = 0;
 
 		$this->id = $id;
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 0862b6b1d93..bc6f1df89f2 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1423,6 +1423,10 @@ class Product extends CommonObject
 		if (empty($this->country_id)) {
 			$this->country_id = 0;
 		}
+		if (empty($this->country_id) && !empty($this->country_code)) {
+			$country_id = getCountry($this->country_code, '3');
+			$this->country_id = is_int($country_id) ? $country_id : 0;
+		}
 
 		if (empty($this->state_id)) {
 			$this->state_id = 0;
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 3ca48bbd39d..76ddc84ecfb 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -255,6 +255,10 @@ class Entrepot extends CommonObject
 			$this->error = "ErrorFieldRequired";
 			return 0;
 		}
+		if (empty($this->country_id) && !empty($this->country_code)) {
+			$country_id = getCountry($this->country_code, '3');
+			$this->country_id = is_int($country_id) ? $country_id : 0;
+		}
 
 		$now = dol_now();
 
@@ -325,6 +329,11 @@ class Entrepot extends CommonObject
 	 */
 	public function update($id, $user, $notrigger = 0)
 	{
+		if (empty($this->country_id) && !empty($this->country_code)) {
+			$country_id = getCountry($this->country_code, '3');
+			$this->country_id = is_int($country_id) ? $country_id : 0;
+		}
+
 		$error = 0;
 
 		if (empty($id)) {
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 1d7278399d1..26ec7f44992 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1010,11 +1010,6 @@ class Societe extends CommonObject
 			$this->fk_multicurrency = 0;
 		}
 
-		if (empty($this->country_id) && !empty($this->country_code)) {
-			$country_id = getCountry($this->country_code, '3');
-			$this->country_id = is_int($country_id) ? $country_id : 0;
-		}
-
 		dol_syslog(get_class($this)."::create ".$this->name);
 
 		$now = dol_now();
@@ -1441,6 +1436,11 @@ class Societe extends CommonObject
 			$id = $this->id;
 		}
 
+		if (empty($this->country_id) && !empty($this->country_code)) {
+			$country_id = getCountry($this->country_code, '3');
+			$this->country_id = is_int($country_id) ? $country_id : 0;
+		}
+
 		$error = 0;
 
 		dol_syslog(get_class($this)."::Update id=".$id." call_trigger=".$call_trigger." allowmodcodeclient=".$allowmodcodeclient." allowmodcodefournisseur=".$allowmodcodefournisseur);
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 1ea16d01c17..549bbb4454d 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2096,6 +2096,11 @@ class User extends CommonObject
 	{
 		global $conf, $langs;
 
+		if (empty($this->country_id) && !empty($this->country_code)) {
+			$country_id = getCountry($this->country_code, '3');
+			$this->country_id = is_int($country_id) ? $country_id : 0;
+		}
+
 		$nbrowsaffected = 0;
 		$error = 0;
 

From 762e4ec8d1c720785a4f4adb309798acd7f12959 Mon Sep 17 00:00:00 2001
From: atm-florian <florian.mortgat@atm-consulting.fr>
Date: Fri, 10 Jan 2025 17:01:59 +0100
Subject: [PATCH 070/243] updated local pre-commit hook -> fix typo

---
 htdocs/core/lib/functions.lib.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 61bb1c78a2e..610e19b293a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -10848,11 +10848,11 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
  *                              'classOverride' => '' // to replace class attribute of the button
  *                              ],
  *                              'confirm' => [
- *                              'url' => 'http://', // Overide Url to go when user click on action btn, if empty default url is $url.?confirm=yes, for no js compatibility use $url for fallback confirm.
- *                              'title' => '', // Overide title of modal,  if empty default title use "ConfirmBtnCommonTitle" lang key
- *                              'action-btn-label' => '', // Overide label of action button,  if empty default label use "Confirm" lang key
- *                              'cancel-btn-label' => '', // Overide label of cancel button,  if empty default label use "CloseDialog" lang key
- *                              'content' => '', // Overide text of content,  if empty default content use "ConfirmBtnCommonContent" lang key
+ *                              'url' => 'http://', // Override Url to go when user click on action btn, if empty default url is $url.?confirm=yes, for no js compatibility use $url for fallback confirm.
+ *                              'title' => '', // Override title of modal,  if empty default title use "ConfirmBtnCommonTitle" lang key
+ *                              'action-btn-label' => '', // Override label of action button,  if empty default label use "Confirm" lang key
+ *                              'cancel-btn-label' => '', // Override label of cancel button,  if empty default label use "CloseDialog" lang key
+ *                              'content' => '', // Override text of content,  if empty default content use "ConfirmBtnCommonContent" lang key
  *                              'modal' => true, // true|false to display dialog as a modal (with dark background)
  *                              'isDropDrown' => false, // true|false to display dialog as a dropdown (with dark background)
  *                              ],

From 62c543ef1782c7d26ae91785ddea1e3f75c54eda Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 10 Jan 2025 23:34:45 +0100
Subject: [PATCH 071/243] FIX remove specific hook return

---
 htdocs/user/card.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index e2992a25f46..d535cc0ddc6 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2043,9 +2043,9 @@ if ($action == 'create' || $action == 'adduserldap') {
 			// Other form for user password
 			$parameters = array('valuetoshow' => $valuetoshow, 'caneditpasswordandsee' => $permissiontoeditpasswordandsee, 'caneditpasswordandsend' => $permissiontoeditpasswordandsend);
 			$reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			if ($reshook === 1) {
+			if ($reshook > 0) {
 				$valuetoshow = $hookmanager->resPrint; // to replace
-			} elseif (empty($reshook)) {
+			} else {
 				$valuetoshow .= $hookmanager->resPrint; // to add
 			}
 
@@ -2057,11 +2057,6 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '</tr>'."\n";
 			}
 
-			// for compatibility with externals modules
-			if ($reshook > 1) {
-				print $hookmanager->resPrint;
-			}
-
 			// API key
 			if (isModEnabled('api') && ($user->id == $id || $user->admin || $user->hasRight("api", "apikey", "generate"))) {
 				print '<tr class="nooddeven"><td>'.$langs->trans("ApiKey").'</td>';

From 39fe6c20b61df23e14eba9664ad886cdc5aa95c1 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 11 Jan 2025 04:55:51 +0100
Subject: [PATCH 072/243] FIX #32339 Delete a loan settlement is partial

---
 htdocs/loan/class/paymentloan.class.php | 41 ++++++++-----------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 08346ad502b..4ba09c30bd4 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2014-2018  Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2023 Frederic France      <frederic.france@netlogic.fr>
- * Copyright (C) 2020       Maxime DEMAREST      <maxime@indelog.fr>
+/* Copyright (C) 2014-2025	Alexandre Spangaro			<alexandre@inovea-conseil.com>
+ * Copyright (C) 2015-2023	Frederic France				<frederic.france@netlogic.fr>
+ * Copyright (C) 2020		Maxime DEMAREST				<maxime@indelog.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
@@ -102,6 +102,10 @@ class PaymentLoan extends CommonObject
 	public $label;
 	public $paymenttype;
 	public $bank_account;
+
+	/**
+	 * @var int
+	 */
 	public $bank_line;
 
 
@@ -386,20 +390,17 @@ class PaymentLoan extends CommonObject
 	 */
 	public function delete($user, $notrigger = 0)
 	{
-		global $conf, $langs;
 		$error = 0;
 
 		$this->db->begin();
 
-		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
-			$sql .= " WHERE type='payment_loan' AND url_id=".((int) $this->id);
-
-			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if (!$resql) {
+		if ($this->bank_line > 0) {
+			$accline = new AccountLine($this->db);
+			$accline->fetch($this->bank_line);
+			$result = $accline->delete($user);
+			if ($result < 0) {
+				$this->errors[] = $accline->error;
 				$error++;
-				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -430,22 +431,6 @@ class PaymentLoan extends CommonObject
 			}
 		}
 
-		//if (! $error)
-		//{
-		//	if (! $notrigger)
-		//	{
-		// Uncomment this and change MYOBJECT to your own tag if you
-		// want this action call a trigger.
-
-		//// Call triggers
-		//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		//$interface=new Interfaces($this->db);
-		//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-		//if ($result < 0) { $error++; $this->errors=$interface->errors; }
-		//// End call triggers
-		//	}
-		//}
-
 		// Commit or rollback
 		if ($error) {
 			foreach ($this->errors as $errmsg) {

From eebea4ad80c698f3d9fd79820949ef781d4bc532 Mon Sep 17 00:00:00 2001
From: PsyCrow <93346975+PsyCrow-code@users.noreply.github.com>
Date: Sat, 11 Jan 2025 00:22:47 -0600
Subject: [PATCH 073/243] Update modAdherent.class.php

PHP Warning: Deprecated dynamic property $enabled
---
 htdocs/core/modules/modAdherent.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index fa4289e3174..0994133905a 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -414,7 +414,7 @@ class modAdherent extends DolibarrModules
 				'unitfrequency'=> 3600 * 24,
 				'priority'=>50,
 				'status'=>1,
-				'test'=>'$conf->adherent->enabled',
+				'test'=>'isModEnabled("adherent")',
 				'datestart'=>$datestart
 			),
 		);

From e53260c00b129d5ad63c91eabf338bb48f570d7e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 11 Jan 2025 07:55:52 +0100
Subject: [PATCH 074/243] VAT - Edit look

---
 htdocs/admin/dict.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 360488a2410..fdd05bfcb00 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -2786,12 +2786,11 @@ function dictFieldList($fieldlist, $obj = null, $tabname = '', $context = '')
 			print '</td>';
 		} elseif ($value == 'department_buyer') {
 			if ($context == 'edit') {
-				print '<td>';
+				print '<td class="nowraponall">';
 				// show department buyer list
 				$country_code = (!empty($obj->country_code) ? $obj->country_code : '');
 				$department_buyer_id = (!empty($obj->department_buyer_id) ? (int) $obj->department_buyer_id : 0);
 				if ($country_code != '') {
-					print img_picto('', 'state', 'class="pictofixedwidth"');
 					print $formcompany->select_state($department_buyer_id, $country_code, 'department_buyer_id', 'minwidth100 maxwidth150 maxwidthonsmartphone');
 				}
 				print '</td>';

From 2b77879297be45bff7111c6043ef9914b5a3598d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sat, 11 Jan 2025 10:34:01 +0100
Subject: [PATCH 075/243] FIX missing edit extrafields inline for member card

---
 htdocs/adherents/card.php                | 21 +++++++++++++++++++++
 htdocs/core/tpl/extrafields_view.tpl.php |  3 +++
 2 files changed, 24 insertions(+)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index ab5fe37bff3..53aa27fe069 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -846,6 +846,27 @@ if (empty($reshook)) {
 		}
 	}
 
+	if ($action == 'update_extras' && $user->hasRight('adherent', 'creer')) {
+		$object->oldcopy = dol_clone($object, 2);
+		$attribute_name = GETPOST('attribute', 'restricthtml');
+
+		// Fill array 'array_options' with data from update form
+		$ret = $extrafields->setOptionalsFromPost(null, $object, $attribute_name);
+		if ($ret < 0) {
+			$error++;
+		}
+		if (!$error) {
+			$result = $object->updateExtraField($attribute_name, 'MEMBER_MODIFY');
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
+		}
+		if ($error) {
+			$action = 'edit_extras';
+		}
+	}
+
 	// SPIP Management
 	if ($user->hasRight('adherent', 'supprimer') && $action == 'confirm_del_spip' && $confirm == 'yes') {
 		if (!count($object->errors)) {
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 0c9bac901b7..10481b4ad10 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -197,6 +197,9 @@ if (empty($reshook) && !empty($object->table_element) && isset($extrafields->att
 			if ($object->element == 'salary') {
 				$permok = $user->hasRight('salaries', 'read');
 			}
+			if ($object->element == 'member') {
+				$permok = $user->hasRight('adherent', 'creer');
+			}
 
 			$isdraft = ((isset($object->statut) && $object->statut == 0) || (isset($object->status) && $object->status == 0));
 			if (($isdraft || !empty($extrafields->attributes[$object->table_element]['alwayseditable'][$tmpkeyextra]))

From b0b02794ee5df988347faed59e2bc3ebfdcdb89a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 11 Jan 2025 11:55:12 +0100
Subject: [PATCH 076/243] fix phpstan and phan

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

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 6a0e5de24da..b5ed5542749 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -245,7 +245,7 @@ function dolDecrypt($chain, $key = '')
  * 										Use 'md5' if hash is not needed for security purpose. For security need, prefer 'auto'.
  * 	@param 		int 		$nosalt		Do not include any salt
  *  @param		int			$mode		0=Return encoded password, 1=Return array with encoding password + encoding algorithm
- * 	@return		string|array<pass_encrypted:string,pass_encoding:string>			Hash of string or array with pass_encrypted and pass_encoding
+ * 	@return		string|array{pass_encrypted:string,pass_encoding:string}	Hash of string or array with pass_encrypted and pass_encoding
  *  @see getRandomPassword(), dol_verifyHash()
  */
 function dol_hash($chain, $type = '0', $nosalt = 0, $mode = 0)

From 56efa6743248743872739379e24b8adb4a650a7c Mon Sep 17 00:00:00 2001
From: sonikf <93765174+sonikf@users.noreply.github.com>
Date: Sun, 12 Jan 2025 03:31:01 +0200
Subject: [PATCH 077/243] Update box_graph_product_distribution.php

---
 htdocs/core/boxes/box_graph_product_distribution.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 8724b16b02a..f6a8b850b93 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -165,7 +165,7 @@ class box_graph_product_distribution extends ModeleBoxes
 				if (empty($data2)) {
 					$showpointvalue = 0;
 					$nocolor = 1;
-					$data2 = array(array(0=>$langs->trans("None"), 1=>1));
+					$data2 = array(array(0=>$langs->transnoentitiesnoconv("None"), 1=>1));
 				}
 
 				$filenamenb = $dir."/prodserforpropal-".$year.".png";
@@ -228,7 +228,7 @@ class box_graph_product_distribution extends ModeleBoxes
 				if (empty($data3)) {
 					$showpointvalue = 0;
 					$nocolor = 1;
-					$data3 = array(array(0=>$langs->trans("None"), 1=>1));
+					$data3 = array(array(0=>$langs->transnoentitiesnoconv("None"), 1=>1));
 				}
 
 				$filenamenb = $dir."/prodserfororder-".$year.".png";
@@ -293,7 +293,7 @@ class box_graph_product_distribution extends ModeleBoxes
 				if (empty($data1)) {
 					$showpointvalue = 0;
 					$nocolor = 1;
-					$data1 = array(array(0=>$langs->trans("None"), 1=>1));
+					$data1 = array(array(0=>$langs->transnoentitiesnoconv("None"), 1=>1));
 				}
 				$filenamenb = $dir."/prodserforinvoice-".$year.".png";
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=productstats&amp;file=prodserforinvoice-'.$year.'.png';

From 24eef4d54c38648b1df2c70051a8906a8aadba1e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 12 Jan 2025 05:34:53 +0100
Subject: [PATCH 078/243] Fix phpstan & phan

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

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 6a0e5de24da..c5208330d5f 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -245,7 +245,7 @@ function dolDecrypt($chain, $key = '')
  * 										Use 'md5' if hash is not needed for security purpose. For security need, prefer 'auto'.
  * 	@param 		int 		$nosalt		Do not include any salt
  *  @param		int			$mode		0=Return encoded password, 1=Return array with encoding password + encoding algorithm
- * 	@return		string|array<pass_encrypted:string,pass_encoding:string>			Hash of string or array with pass_encrypted and pass_encoding
+ * 	@return		string|array{pass_encrypted:string,pass_encoding:string}			Hash of string or array with pass_encrypted and pass_encoding
  *  @see getRandomPassword(), dol_verifyHash()
  */
 function dol_hash($chain, $type = '0', $nosalt = 0, $mode = 0)

From be6869f388c1ea7029a2df6b180b6ce953a89725 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 13 Jan 2025 01:05:34 +0100
Subject: [PATCH 079/243] Fix date selector html

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d148f8fd784..7a7ebef6936 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7287,7 +7287,7 @@ class Form
 		// You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery'
 		$usecalendar = 'combo';
 		if (!empty($conf->use_javascript_ajax) && (!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') != "none")) {
-			$usecalendar = ((!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') == 'eldy') ? 'jquery' : $conf->global->MAIN_POPUP_CALENDAR);
+			$usecalendar = ((!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') == 'eldy') ? 'jquery' : getDolGlobalString("MAIN_POPUP_CALENDAR"));
 		}
 		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			// If we use a text browser or screen reader, we use the 'combo' date selector
@@ -7317,7 +7317,7 @@ class Form
 					if (!$disabled) {
 						$retstringbuttom = '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons"';
 						$base = DOL_URL_ROOT . '/core/';
-						$retstringbuttom .= ' onClick="showDP(\'' . $base . '\',\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\',\'' . $langs->defaultlang . '\');"';
+						$retstringbuttom .= ' onClick="showDP(\'' . dol_escape_js($base) . '\',\'' . dol_escape_js($prefix) . '\',\'' . dol_escape_js($langs->trans("FormatDateShortJavaInput")) . '\',\'' . dol_escape_js($langs->defaultlang) . '\');"';
 						$retstringbuttom .= '>' . img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"') . '</button>';
 					} else {
 						$retstringbuttom = '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';
@@ -7364,7 +7364,7 @@ class Form
 
 					// Input area to enter date manually
 					$retstring .= '<div class="nowraponall inline-block divfordateinput">';
-					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidthdate center" maxlength="11" value="'.$formated_date.'"';
+					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="'.($usecalendar == 'html' ? "date" : "text").'" class="maxwidthdate center" maxlength="11" value="'.$formated_date.'"';
 					$retstring .= ($disabled ? ' disabled' : '');
 					$retstring .= ($placeholder ? ' placeholder="' . dol_escape_htmltag($placeholder) . '"' : '');
 					$retstring .= ' onChange="dpChangeDay(\'' . dol_escape_js($prefix) . '\',\'' . dol_escape_js($langs->trans("FormatDateShortJavaInput")) . '\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

From 0a80d437dec235b3796a2d51014846e0237dcef3 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 13 Jan 2025 12:31:08 +0100
Subject: [PATCH 080/243] Doc

---
 htdocs/theme/eldy/badges.inc.php             | 3 +++
 htdocs/theme/eldy/btn.inc.php                | 3 ++-
 htdocs/theme/eldy/dropdown.inc.php           | 4 +++-
 htdocs/theme/eldy/emaillayout.inc.php        | 2 ++
 htdocs/theme/eldy/flags-sprite.inc.php       | 2 +-
 htdocs/theme/eldy/global.inc.php             | 2 +-
 htdocs/theme/eldy/info-box.inc.php           | 2 +-
 htdocs/theme/eldy/main_menu_fa_icons.inc.php | 2 +-
 htdocs/theme/eldy/manifest.json.php          | 1 +
 htdocs/theme/eldy/progress.inc.php           | 5 +++--
 htdocs/theme/eldy/timeline.inc.php           | 3 ++-
 htdocs/theme/md/badges.inc.php               | 4 +++-
 htdocs/theme/md/btn.inc.php                  | 3 ++-
 htdocs/theme/md/dropdown.inc.php             | 4 +++-
 htdocs/theme/md/flags-sprite.inc.php         | 3 ++-
 htdocs/theme/md/info-box.inc.php             | 3 ++-
 htdocs/theme/md/main_menu_fa_icons.inc.php   | 3 ++-
 htdocs/theme/md/progress.inc.php             | 3 ---
 htdocs/theme/md/style.css.php                | 3 ++-
 19 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index afd7e020886..01a3f1d4824 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -28,6 +28,9 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 @phan-var-force string $colorblind_deuteranopes_badgeWarning
 ';
 ?>
+
+/* IDE Hack <style type="text/css"> */
+
 /* Badge style is based on bootstrap framework */
 
 .badge {
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 956ddd43e82..60c7cf2d04d 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -16,7 +16,8 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
  * @var string $left
  */
 ?>
-/* <style type="text/css" > */
+
+/* IDE Hack <style type="text/css"> */
 
 :root {
 			--btncolortext: rgb(<?php print $colortextlink; ?>);
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index 976b48977b5..23ea6c34f74 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -4,7 +4,9 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 }
 include_once DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php";
 ?>
-/* <style type="text/css" > don't remove this line it's an ide hack */
+
+/* IDE Hack <style type="text/css"> */
+
 /*
  * Dropdown of user popup
  */
diff --git a/htdocs/theme/eldy/emaillayout.inc.php b/htdocs/theme/eldy/emaillayout.inc.php
index 4d3ef94e84e..486efe15acc 100644
--- a/htdocs/theme/eldy/emaillayout.inc.php
+++ b/htdocs/theme/eldy/emaillayout.inc.php
@@ -3,6 +3,8 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 }
 ?>
+/* IDE Hack <style type="text/css"> */
+
 .template-container {
 	display: flex;
 	justify-content: space-between;
diff --git a/htdocs/theme/eldy/flags-sprite.inc.php b/htdocs/theme/eldy/flags-sprite.inc.php
index 83396574ee4..6eac21c83ee 100644
--- a/htdocs/theme/eldy/flags-sprite.inc.php
+++ b/htdocs/theme/eldy/flags-sprite.inc.php
@@ -28,7 +28,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
  * @var string $path
  */
 ?>
-/* <style type="text/css" > */ /* don't remove this line it's an ide hack */
+/* IDE Hack <style type="text/css"> */
 
 .flag-sprite {
 	background:url(<?php echo dol_buildpath($path.'/theme/common/flags/flag-sprite.png', 1) ?>) no-repeat top left; display:inline-block;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index c1f309ad643..92b1b7df0e0 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -153,7 +153,7 @@ $leftmenuwidth = 240;
 $borderradius = getDolGlobalString('THEME_ELDY_USEBORDERONTABLE') ? getDolGlobalInt('THEME_ELDY_BORDER_RADIUS', 6) : 0;
 
 ?>
-/* <style type="text/css" > */
+/* IDE Hack <style type="text/css"> */
 
 /* ============================================================================== */
 /* Default styles                                                                 */
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 14b631fe9e3..44f1ff7ddd8 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -14,7 +14,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 @phan-var-force string $left
 ';
 ?>
-/* <style type="text/css" > */
+/* IDE Hack <style type="text/css"> */
 
 /*
  * Component: Info Box
diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
index 4e03ea60ce3..6c2a509b648 100644
--- a/htdocs/theme/eldy/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
@@ -25,7 +25,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by stylesheet');
 }
 ?>
-/* <style type="text/css" > */
+/* IDE Hack <style type="text/css"> */
 
 .mainmenu::before{
 	/* font part */
diff --git a/htdocs/theme/eldy/manifest.json.php b/htdocs/theme/eldy/manifest.json.php
index 9ebbc88aa4f..1b01f5c6991 100644
--- a/htdocs/theme/eldy/manifest.json.php
+++ b/htdocs/theme/eldy/manifest.json.php
@@ -55,6 +55,7 @@ if (!defined('NOSESSION')) {
 }
 
 require_once __DIR__.'/../../main.inc.php';
+
 /**
  * @var Conf $conf
  */
diff --git a/htdocs/theme/eldy/progress.inc.php b/htdocs/theme/eldy/progress.inc.php
index 03cee9e6a94..ce8fc4f6362 100644
--- a/htdocs/theme/eldy/progress.inc.php
+++ b/htdocs/theme/eldy/progress.inc.php
@@ -2,7 +2,9 @@
 if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 } ?>
-/* <style type="text/css" > */
+
+/* IDE Hack <style type="text/css"> */
+
 /*
  progress style is based on bootstrap and admin lte framework
  */
@@ -198,4 +200,3 @@ body[class*="colorblind-"] .progress-bar-red, body[class*="colorblind-"] .progre
 .progress-bar-consumed-late {
 	background-color: <?php echo colorAgressiveness($badgeDanger, -95, +70) ?>;
 }
-
diff --git a/htdocs/theme/eldy/timeline.inc.php b/htdocs/theme/eldy/timeline.inc.php
index cee089a246f..abd5b4dda3d 100644
--- a/htdocs/theme/eldy/timeline.inc.php
+++ b/htdocs/theme/eldy/timeline.inc.php
@@ -11,7 +11,8 @@
 if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 } ?>
-/* <style type="text/css" > */
+
+/* IDE Hack <style type="text/css"> */
 
 
 /*
diff --git a/htdocs/theme/md/badges.inc.php b/htdocs/theme/md/badges.inc.php
index 616cc26cf96..c69673d5d97 100644
--- a/htdocs/theme/md/badges.inc.php
+++ b/htdocs/theme/md/badges.inc.php
@@ -18,7 +18,9 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 @phan-var-force string $colorblind_deuteranopes_badgeWarning
 ';
 ?>
-/* <style type="text/css" > */
+
+/* IDE Hack <style type="text/css"> */
+
 /*
  Badge style is based on bootstrap framework
  */
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index e85281e1e96..0177bb20f2f 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -13,7 +13,8 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
  * @var string $textbutaction
  */
 ?>
-/* <style type="text/css" > */
+
+/* IDE Hack <style type="text/css"> */
 
 :root {
 			--btncolortext:rgb(<?php print $colortextlink; ?>);
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index 1b14f471c65..dfb51191ae4 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -7,7 +7,9 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 $atoploginusername = empty($user->photo) ? 52 : 0;
 
 ?>
-/* <style type="text/css" > don't remove this line it's an ide hack */
+
+/* IDE Hack <style type="text/css"> */
+
 /*
  * Dropdown of user popup
  */
diff --git a/htdocs/theme/md/flags-sprite.inc.php b/htdocs/theme/md/flags-sprite.inc.php
index dbc1328a902..2a0bf194c3a 100644
--- a/htdocs/theme/md/flags-sprite.inc.php
+++ b/htdocs/theme/md/flags-sprite.inc.php
@@ -2,7 +2,8 @@
 if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 } ?>
-/* <style type="text/css" > don't remove this line it's an ide hack */
+
+/* IDE Hack <style type="text/css"> */
 
 .flag-sprite {
 	background:url(<?php echo dol_buildpath($path.'/theme/common/flags/flag-sprite.png', 1) ?>) no-repeat top left; display:inline-block;
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index 2e9a50e7406..f2afc753cf4 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -16,7 +16,8 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 @phan-var-force string $left
 ';
 ?>
-/* <style type="text/css" > */
+
+/* IDE Hack <style type="text/css"> */
 
 
 /*
diff --git a/htdocs/theme/md/main_menu_fa_icons.inc.php b/htdocs/theme/md/main_menu_fa_icons.inc.php
index a08b85c27c1..3168d1766e9 100644
--- a/htdocs/theme/md/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/md/main_menu_fa_icons.inc.php
@@ -1,7 +1,8 @@
 <?php if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 } ?>
-/* <style type="text/css" > */
+
+/* IDE Hack <style type="text/css"> */
 
 .mainmenu::before{
 	/* font part */
diff --git a/htdocs/theme/md/progress.inc.php b/htdocs/theme/md/progress.inc.php
index 979f8b8034e..9f6a436c016 100644
--- a/htdocs/theme/md/progress.inc.php
+++ b/htdocs/theme/md/progress.inc.php
@@ -4,6 +4,3 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 }
 
 include dol_buildpath($path.'/theme/eldy/progress.inc.php', 0); // actually md use same style as eldy theme
-
-?>
-/* <style type="text/css" > */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 2a76da44afa..73c8d8f4e2b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -396,7 +396,8 @@ print '*/'."\n";
 $leftmenuwidth = 242;
 
 ?>
-/* <style type="text/css" > */
+
+/* IDE Hack <style type="text/css"> */
 
 
 /* ============================================================================== */

From b05478b2738f2971fdc47d20417cb160cfebb51b Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 13 Jan 2025 12:59:37 +0100
Subject: [PATCH 081/243] Debug v21

---
 htdocs/core/lib/website.lib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 86737d3defc..8c6673a2bbc 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -33,7 +33,7 @@
  */
 function dolStripPhpCode($str, $replacewith = '')
 {
-	$str = str_replace('<?=', '<?php', $str);
+	$str = str_replace('<?=', '<?php echo', $str);	// replace a bad practive
 
 	$newstr = '';
 
@@ -77,9 +77,9 @@ function dolStripPhpCode($str, $replacewith = '')
  */
 function dolKeepOnlyPhpCode($str)
 {
-	$str = str_replace('<?=', '<?php', $str);
+	$str = str_replace('<?=', '<?php echo', $str);
 	$str = str_replace('<?php', '__LTINTPHP__', $str);
-	$str = str_replace('<?', '<?php', $str);			// replace the short_open_tag. It is recommended to set this is Off in php.ini
+	$str = str_replace('<?', '<?php', $str);			// replace the short_open_tag. It is recommended to set this to Off in php.ini
 	$str = str_replace('__LTINTPHP__', '<?php', $str);
 
 	$newstr = '';

From a5fe19212581dcf41883b3e1d7786d9ba3fa0a10 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 13 Jan 2025 13:31:38 +0100
Subject: [PATCH 082/243] FIX country id is not saved when we provide
 country_code only

---
 htdocs/societe/class/societe.class.php | 3 +++
 test/phpunit/SocieteTest.php           | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index df3bfd91a5d..1f6e6377ca0 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1356,6 +1356,9 @@ class Societe extends CommonObject
 		if (empty($id)) {
 			$id = $this->id;
 		}
+		if (empty($this->country_id) && !empty($this->country_code)) {
+			$this->country_id = dol_getIdFromCode($this->db, $this->country_code, 'c_country', 'code', 'rowid');
+		}
 
 		$error = 0;
 
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index ec05bc365a0..cd82b4155d3 100644
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -94,7 +94,12 @@ class SocieteTest extends CommonClassTest
 
 		$localobject = new Societe($db);
 		$localobject->initAsSpecimen();
+
+		$localobject->country_id = 0;
+		$localobject->country_code = 'ES';
+
 		$result = $localobject->create($user);
+		var_dump($localobject);exit;
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThanOrEqual($result, 0);

From 188070729ac5424fc3f5671c51c7bb2a67d08df0 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 13 Jan 2025 14:10:34 +0100
Subject: [PATCH 083/243] FIX avoid php8 warning

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

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index b440a0bd1bc..0f401ef70a8 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2753,8 +2753,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 					$tmpfieldsofline = explode(';', $line);
 					$modulekey = strtolower($tmpfieldsofline[0]);
 					$conf->cache['noncompliantmodules'][$modulekey]['name'] = $tmpfieldsofline[0];
-					$conf->cache['noncompliantmodules'][$modulekey]['id'] = $tmpfieldsofline[1];
-					$conf->cache['noncompliantmodules'][$modulekey]['signature'] = $tmpfieldsofline[2];
+					$conf->cache['noncompliantmodules'][$modulekey]['id'] = (isset($tmpfieldsofline[1]) ? $tmpfieldsofline[1] : '');
+					$conf->cache['noncompliantmodules'][$modulekey]['signature'] = (isset($tmpfieldsofline[2]) ? $tmpfieldsofline[2] : '');
 					$conf->cache['noncompliantmodules'][$modulekey]['message'] = $langs->trans(empty($tmpfieldsofline[3]) ? 'WarningModuleAffiliatedToAReportedCompany' : $tmpfieldsofline[3]);
 					if (!empty($tmpfieldsofline[4])) {
 						$message2 = $langs->trans("WarningModuleAffiliatedToAPiratPlatform", '{s}');

From e5a6f5f9cea60980c6905cacea5f3badc61a0b52 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 13 Jan 2025 14:24:17 +0100
Subject: [PATCH 084/243] FIX avoid "Undefined array key" warning

---
 htdocs/core/actions_setmoduleoptions.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index 8439660f6c8..26e15b7692e 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -58,13 +58,13 @@ if ($action == 'update' && !empty($arrayofparameters) && is_array($arrayofparame
 	foreach ($arrayofparameters as $key => $val) {
 		// Modify constant only if key was posted (avoid resetting key to the null value)
 		if (GETPOSTISSET($key)) {
-			if (!empty($val['type']) && preg_match('/category:/', $val['type'])) {
+			if (isset($val['type']) && preg_match('/category:/', $val['type'])) {
 				if (GETPOSTINT($key) == '-1') {
 					$val_const = '';
 				} else {
 					$val_const = GETPOSTINT($key);
 				}
-			} elseif ($val['type'] == 'html') {
+			} elseif (isset($val['type']) && $val['type'] == 'html') {
 				$val_const = GETPOST($key, 'restricthtml');
 			} else {
 				$val_const = GETPOST($key, 'alpha');

From 3406aebf0f2fd883240478d82f732a595785b8b5 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 13 Jan 2025 16:35:47 +0100
Subject: [PATCH 085/243] Debug v21

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

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 4e46f88bb23..f6719809fbb 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -664,7 +664,7 @@ class Contact extends CommonObject
 		$sql .= ", phone = ".(isset($this->phone_pro) ? "'".$this->db->escape($this->phone_pro)."'" : "NULL");
 		$sql .= ", phone_perso = ".(isset($this->phone_perso) ? "'".$this->db->escape($this->phone_perso)."'" : "NULL");
 		$sql .= ", phone_mobile = ".(isset($this->phone_mobile) ? "'".$this->db->escape($this->phone_mobile)."'" : "NULL");
-		$sql .= ", priv = '".$this->db->escape($this->priv)."'";
+		$sql .= ", priv = ".((int) $this->priv);
 		$sql .= ", fk_prospectlevel = '".$this->db->escape($this->fk_prospectlevel)."'";
 		if (isset($this->stcomm_id)) {
 			$sql .= ", fk_stcommcontact = ".($this->stcomm_id > 0 || $this->stcomm_id == -1 ? $this->stcomm_id : "0");

From d618c3ce73e4d24e89eee57d4ec3dd12520cb560 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 13 Jan 2025 20:01:43 +0100
Subject: [PATCH 086/243] Trans

---
 htdocs/langs/fr_FR/website.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index c8aece70148..24e56e6ac0b 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -257,6 +257,7 @@ logOutFromYourCustomerAccount=Déconnectez-vous de votre compte client
 filteredByVersion=Filtré par version
 removeFilter=Supprimer filtre
 viewMyCart=Voir mon panier
+Shipping=Expédition
 freeShipping=Expédition gratuite !
 noProducts=Aucun produits
 nbrItemsInCart=Il y a <span class="ajax_cart_quantity">0</span> articles dans votre panier.

From 44a5c320fc0a5fe6dccde90db460fe19127de7cc Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 13 Jan 2025 21:20:16 +0100
Subject: [PATCH 087/243] Clean code

---
 .../class/conferenceorboothattendee.class.php             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 8512701a0bb..514218d1d09 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -489,15 +489,15 @@ class ConferenceOrBoothAttendee extends CommonObject
 			if (count($filter) > 0) {
 				foreach ($filter as $key => $value) {
 					if ($key == 't.rowid' || $key == 't.fk_soc' || $key == 't.fk_project' || $key == 't.fk_actioncomm') {
-						$sqlwhere[] = $key.'='.((int) $value);
+						$sqlwhere[] = $this->db->sanitize($key).' = '.((int) $value);
 					} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-						$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
 					} elseif ($key == 'customsql') {
 						$sqlwhere[] = $value;
 					} elseif (strpos($value, '%') === false) {
-						$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+						$sqlwhere[] = $this->db->sanitize($key).' IN ('.$this->db->sanitize($this->db->escape($value)).')';
 					} else {
-						$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+						$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($value)."%'";
 					}
 				}
 			}

From f35c23253055aa9230609eea75b2005dced8bda3 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 13 Jan 2025 21:25:36 +0100
Subject: [PATCH 088/243] Debug v21

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

diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 514218d1d09..ccdb2ade31a 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -490,7 +490,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 				foreach ($filter as $key => $value) {
 					if ($key == 't.rowid' || $key == 't.fk_soc' || $key == 't.fk_project' || $key == 't.fk_actioncomm') {
 						$sqlwhere[] = $this->db->sanitize($key).' = '.((int) $value);
-					} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+					} elseif (!empty($this->fields[$key]) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
 					} elseif ($key == 'customsql') {
 						$sqlwhere[] = $value;

From a25ea27c6b59c13795caaf78ddb074412fedd549 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 13 Jan 2025 21:25:36 +0100
Subject: [PATCH 089/243] Debug v21

---
 .../class/conferenceorboothattendee.class.php               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 8512701a0bb..8a7fd4a3b91 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -489,9 +489,9 @@ class ConferenceOrBoothAttendee extends CommonObject
 			if (count($filter) > 0) {
 				foreach ($filter as $key => $value) {
 					if ($key == 't.rowid' || $key == 't.fk_soc' || $key == 't.fk_project' || $key == 't.fk_actioncomm') {
-						$sqlwhere[] = $key.'='.((int) $value);
-					} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-						$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
+						$sqlwhere[] = $this->db->sanitize($key).' = '.((int) $value);
+					} elseif (!empty($this->fields[$key]) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
 					} elseif ($key == 'customsql') {
 						$sqlwhere[] = $value;
 					} elseif (strpos($value, '%') === false) {

From 620dea9e29e09f2b9ed1f791fd2fb85a687bbe95 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 13 Jan 2025 00:28:00 +0100
Subject: [PATCH 090/243] Qual: Fix ci by correcting PHPDoc typing

# Qual: Fix ci by correcting PHPDoc typing

Fix the return type, while reviewing the typing, also made some
PHPDoc more specific
---
 htdocs/core/lib/security.lib.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index b5ed5542749..92afd4da700 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -1,8 +1,9 @@
 <?php
+
 /* Copyright (C) 2008-2021 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2008-2021 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2020	   Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -234,15 +235,15 @@ function dolDecrypt($chain, $key = '')
  *  If constant MAIN_SECURITY_SALT is defined, we use it as a salt (used only if hashing algorithm is something else than 'password_hash').
  *
  * 	@param 		string		$chain		String to hash
- * 	@param		string		$type		Type of hash:
- *                                      'auto' or '0': will use MAIN_SECURITY_HASH_ALGO else md5
- *                                      'sha1' or '1': sha1
- *                                      'sha1md5' or '2': sha1md5
- *                                      'md5' or '3': md5
- *                                      'openldapxxx' or '4': for OpenLdap
- *                                      'sha256' or '5': sha256
- *                                      'password_hash' or '6': password_hash
- * 										Use 'md5' if hash is not needed for security purpose. For security need, prefer 'auto'.
+ * 	@param		'auto'|'0'|'sha1'|'1'|'sha1md5'|'2'|'md5'|'3'|'openldap'|'4'|'sha256'|'5'|'password_hash'|'6'	$type		Type of hash:
+ *                                                                                                                          'auto' or '0': will use MAIN_SECURITY_HASH_ALGO else md5
+ *                                                                                                                          'sha1' or '1': sha1
+ *                                                                                                                          'sha1md5' or '2': sha1md5
+ *                                                                                                                          'md5' or '3': md5
+ *                                                                                                                          'openldapxxx' or '4': for OpenLdap
+ *                                                                                                                          'sha256' or '5': sha256
+ *                                                                                                                          'password_hash' or '6': password_hash
+ *                                                                                                                          Use 'md5' if hash is not needed for security purpose. For security need, prefer 'auto'.
  * 	@param 		int 		$nosalt		Do not include any salt
  *  @param		int			$mode		0=Return encoded password, 1=Return array with encoding password + encoding algorithm
  * 	@return		string|array{pass_encrypted:string,pass_encoding:string}	Hash of string or array with pass_encrypted and pass_encoding

From d32ba0f1e161775ffb4c408b88741754f39b8581 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 13 Jan 2025 02:10:37 +0100
Subject: [PATCH 091/243] Fix: Correct $search_ref typo into $search_ref_ext

---
 htdocs/contact/list.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 48d54d40f5f..9661927d240 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2019-2024	Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2019		Josep Lluís Amador			<joseplluis@lliuretic.cat>
  * Copyright (C) 2020		Open-Dsi					<support@open-dsi.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Benjamin Falière			<benjamin.faliere@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -368,7 +368,7 @@ if (empty($reshook)) {
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {	// All tests are required to be compatible with all browsers
 		$search_all = "";
 		$search_id = '';
-		$search_ref = '';
+		$search_ref_ext = '';
 		$search_firstlast_only = "";
 		$search_lastname = "";
 		$search_firstname = "";
@@ -866,8 +866,8 @@ if ($search_all != '') {
 if ($search_id > 0) {
 	$param .= "&search_id=".((int) $search_id);
 }
-if ($search_ref) {
-	$param .= "&search_ref=".urlencode($search_ref);
+if ($search_ref_ext) {
+	$param .= "&search_ref_ext=".urlencode($search_ref_ext);
 }
 if ($search_lastname != '') {
 	$param .= '&search_lastname='.urlencode($search_lastname);

From d8824dd141136bfeb0cf31182675745e273c54de Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 13 Jan 2025 02:15:26 +0100
Subject: [PATCH 092/243] Fix: Change hash type to 'md5' which was used for
 invalid 'master' type

---
 htdocs/public/eventorganization/attendee_new.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index d3099bbc36b..fa7613e14db 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2021		Dorian Vabre			<dorian.vabre@gmail.com>
  * Copyright (C) 2023		Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -362,7 +362,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 
 		// If the registration has already been paid for this attendee
 		if (!empty($confattendee->date_subscription) && !empty($confattendee->amount)) {
-			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 'master');
+			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 'md5');
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.((int) $id).'&securekey='.urlencode($securekeyurl);
 
 			$mesg = $langs->trans("RegistrationAndPaymentWereAlreadyRecorded", $email);

From da62fa9edf4a86a3ed7f8f353a4aaf44e3165489 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 14 Jan 2025 07:36:46 +0100
Subject: [PATCH 093/243] FIX the rules for rowid (fk_pays+'1') is no longer
 used (Multicompany)

---
 htdocs/install/mysql/data/llx_c_tva.sql | 474 ++++++++++++------------
 1 file changed, 236 insertions(+), 238 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index e00828f78b7..86509c45b67 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -3,7 +3,7 @@
 -- Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
 -- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
--- Copyright (C) 2005-2024 Regis Houssin        <regis.houssin@inodbox.com>
+-- Copyright (C) 2005-2025 Regis Houssin        <regis.houssin@inodbox.com>
 -- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
 -- Copyright (C) 2010-2016 Juanjo Menent        <jmenent@2byte.es>
 -- Copyright (C) 2012      Sebastian Neuwert    <sebastian.neuwert@modula71.de>
@@ -39,383 +39,381 @@
 -- Source:  https://en.wikipedia.org/wiki/Value-added_tax
 --
 
+-- Warning : the rules for rowid (fk_pays+'1') is no longer used (Multicompany compatibility)
 
 -- delete from llx_c_tva;
 
 -- ALGERIA (id country=13)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 131, 13,     '0','0','TVA 0%',   1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 132, 13,  '9','0','TVA 9%',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 133, 13,     '19','0','TVA 19%',   1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (13,     '0','0','TVA 0%',   1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (13,  '9','0','TVA 9%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (13,     '19','0','TVA 19%',   1,__ENTITY__);
 
 -- ANGOLA (id country=35)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 351,  35,   '0','0','VAT rate 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 352,  35,   '7','0','VAT rate - reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 353,  35,  '14','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (35,   '0','0','VAT rate 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (35,   '7','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (35,  '14','0','VAT rate - standard',1,__ENTITY__);
 
 -- ARGENTINA (id country=23)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (231, 23,   '0','0','IVA Rate 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (232, 23,'10.5','0','IVA reduced rate',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (233, 23,  '21','0','IVA standard rate',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (23,   '0','0','IVA Rate 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (23,'10.5','0','IVA reduced rate',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (23,  '21','0','IVA standard rate',1,__ENTITY__);
 
 -- AUSTRALIA (id country=28)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (281, 28,   '0','0','VAT rate 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (282, 28,  '10','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (28,   '0','0','VAT rate 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (28,  '10','0','VAT rate - standard',1,__ENTITY__);
 
 -- AUSTRIA (id country=41)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (411, 41,   '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (412, 41,  '10','0','VAT rate - reduced', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (413, 41,  '20','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (41,   '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (41,  '10','0','VAT rate - reduced', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (41,  '20','0','VAT rate - standard',1,__ENTITY__);
 
 -- BRASIL (id country=56)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (561, 56,  '0','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (56,  '0','0','VAT rate - reduced',1,__ENTITY__);
 
 -- BULGARIA (id country=59)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (591, 59,   '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (592, 59,   '7','0','VAT rate - reduced', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (593, 59,  '20','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (59,   '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (59,   '7','0','VAT rate - reduced', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (59,  '20','0','VAT rate - standard',1,__ENTITY__);
 
 -- BELGIUM (id country=2)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 21,  2,   '0','0','VAT rate 0 ou non applicable',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 22,  2,   '6','0','VAT rate - reduced', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 23,  2,  '21','0','VAT rate - standard',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 24,  2,  '12','0','VAT rate - reduced', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (2,   '0','0','VAT rate 0 ou non applicable',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (2,   '6','0','VAT rate - reduced', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (2,  '21','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (2,  '12','0','VAT rate - reduced', 1,__ENTITY__);
 
 -- CANADA (id country=14)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (141, 14,   '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (142, 14,   '7','0','VAT rate - standard',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active,entity) values (143, 14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Province',1,__ENTITY__);
--- insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active,entity) values (143, 14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Quebec',1,__ENTITY__);
--- insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active,entity) values (144, 14,'5','0','7','1','GST/TPS and PST/TVQ rate for British Columbia',1,__ENTITY__);
--- insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active,entity) values (149, 14,'5','0',null,null,'GST/TPS and PST/TVQ rate for Yukon',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (14,   '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (14,   '7','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active,entity) values (14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Province',1,__ENTITY__);
+-- insert into llx_c_tva(fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active,entity) values (14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Quebec',1,__ENTITY__);
+-- insert into llx_c_tva(fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active,entity) values (14,'5','0','7','1','GST/TPS and PST/TVQ rate for British Columbia',1,__ENTITY__);
+-- insert into llx_c_tva(fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active,entity) values (14,'5','0',null,null,'GST/TPS and PST/TVQ rate for Yukon',1,__ENTITY__);
 
 
 -- CAMEROUN (id country=24)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (241, 24,     '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (242, 24, '19.25','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (24,     '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (24, '19.25','0','VAT rate - standard',1,__ENTITY__);
 
 -- CHILE (id country=67)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (671, 67,   '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (672, 67,  '19','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (67,   '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (67,  '19','0','VAT rate - standard',1,__ENTITY__);
 
 -- CHINA (id country=9)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 91,  9,    '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 92,  9,   '13','0','VAT rate - reduced 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 93,  9,    '3','0','VAT rate -  super-reduced 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 94,  9,   '17','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (9,    '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (9,   '13','0','VAT rate - reduced 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (9,    '3','0','VAT rate -  super-reduced 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (9,   '17','0','VAT rate - standard',1,__ENTITY__);
 
 -- CONGO = REPUBLIQUE DU CONGO (id country=72)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (721, 72,    '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active,entity) values (722, 72,   '18','0', '0.9', '1', 'VAT rate 18+0.9', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (72,    '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active,entity) values (72,   '18','0', '0.9', '1', 'VAT rate 18+0.9', 1,__ENTITY__);
 
 -- CROATIA (id country=76)
-insert into llx_c_tva(rowid,fk_pays,taux,note,active,entity) values (761, 76, '25','PDV 25%', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,note,active,entity) values (762, 76, '13','PDV 13%', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,note,active,entity) values (763, 76,  '5', 'PDV 5%', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,note,active,entity) values (764, 76,  '0', 'PDV 0%', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,note,active,entity) values (76, '25','PDV 25%', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,note,active,entity) values (76, '13','PDV 13%', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,note,active,entity) values (76,  '5', 'PDV 5%', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,note,active,entity) values (76,  '0', 'PDV 0%', 1,__ENTITY__);
 
 -- CYPRUS (id country=78)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (781, 78,    '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (782, 78,    '9','0','VAT rate 9',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (783, 78,    '5','0','VAT rate 5',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (784, 78,   '19','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (78,    '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (78,    '9','0','VAT rate 9',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (78,    '5','0','VAT rate 5',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (78,   '19','0','VAT rate - standard',1,__ENTITY__);
 
 -- DANMERK (id country=80)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (801, 80,    '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (802, 80,   '25','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (80,    '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (80,   '25','0','VAT rate - standard',1,__ENTITY__);
 
 -- FRANCE (id country=1)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 11,  1,   '0','0','VAT rate 0 ou non applicable',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 12,  1,  '20','0','VAT rate - standard (France hors DOM-TOM)',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 13,  1,  '10','0','VAT rate - reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 14,  1, '5.5','0','VAT rate - reduced (France hors DOM-TOM)',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 15,  1, '2.1','0','VAT rate - super-reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,code,recuperableonly,note,active,entity)                                                   values (16, 1, '8.5', '85',         '0', 'VAT rate - standard (DOM sauf Guyane et Saint-Martin)',0,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,code,recuperableonly,note,active,entity)                                                   values (17, 1, '8.5', '85NPR',      '1', 'VAT rate - standard (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,note,active,entity)                          values (18, 1, '8.5', '85NPROM',    '1', 2, 3, 'VAT rate - standard (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer',0,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active,entity) values (19, 1, '8.5', '85NPROMOMR', '1', 2, 3, 2.5, 3, 'VAT rate - standard (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer et Octroi de Mer Regional',0,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (1,   '0','0','VAT rate 0 ou non applicable',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (1,  '20','0','VAT rate - standard (France hors DOM-TOM)',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (1,  '10','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (1, '5.5','0','VAT rate - reduced (France hors DOM-TOM)',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (1, '2.1','0','VAT rate - super-reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,note,active,entity)                                                   values (1, '8.5', '85',         '0', 'VAT rate - standard (DOM sauf Guyane et Saint-Martin)',0,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,note,active,entity)                                                   values (1, '8.5', '85NPR',      '1', 'VAT rate - standard (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,note,active,entity)                          values (1, '8.5', '85NPROM',    '1', 2, 3, 'VAT rate - standard (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer',0,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active,entity) values (1, '8.5', '85NPROMOMR', '1', 2, 3, 2.5, 3, 'VAT rate - standard (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer et Octroi de Mer Regional',0,__ENTITY__);
 
 -- GABON (id country=16)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (161, 16,    '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (162, 16, 'TPS95',  10,   0, '0', 0, '0', 0, 'VAT 9.5', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (163, 16, 'TPS95C', 10,   1, '1', 0, '0', 0, 'VAT 9.5+CSS', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (164, 16, 'TPS10',  10,   0, '0', 0, '0', 0, 'VAT 10', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (165, 16, 'TPS10C', 10,   1, '1', 0, '0', 0, 'VAT 10+CSS', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (166, 16, 'TPS18',  18,   0, '0', 0, '0', 0, 'VAT 18', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (167, 16, 'TPS18C', 18,   1, '1', 0, '0', 0, 'VAT 18+CSS', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values ( 16,    '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (16, 'TPS95',  10,   0, '0', 0, '0', 0, 'VAT 9.5', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (16, 'TPS95C', 10,   1, '1', 0, '0', 0, 'VAT 9.5+CSS', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (16, 'TPS10',  10,   0, '0', 0, '0', 0, 'VAT 10', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (16, 'TPS10C', 10,   1, '1', 0, '0', 0, 'VAT 10+CSS', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (16, 'TPS18',  18,   0, '0', 0, '0', 0, 'VAT 18', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (16, 'TPS18C', 18,   1, '1', 0, '0', 0, 'VAT 18+CSS', 1,__ENTITY__);
 
 
 -- GERMANY (id country=5)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 51,  5,     '0','0','No VAT', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 52,  5,   '7.0','0','ermäßigte USt.', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 54,  5,   '5.5','0','USt. Forst', 0,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 55,  5,  '10.7','0','USt. Landwirtschaft', 0,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 56,  5,  '19.0','0','allgemeine Ust.',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (5,     '0','0','No VAT', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (5,   '7.0','0','ermäßigte USt.', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (5,   '5.5','0','USt. Forst', 0,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (5,  '10.7','0','USt. Landwirtschaft', 0,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (5,  '19.0','0','allgemeine Ust.',1,__ENTITY__);
 
 -- GREECE (id country=102)
-insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (1021, 102,   0, 0, '0', 0, '0', 0, 'Μηδενικό Φ.Π.Α.', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (1022, 102,  24, 0, '0', 0, '0', 0, 'Κανονικός Φ.Π.Α.', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (1023, 102,  13, 0, '0', 0, '0', 0, 'Μειωμένος Φ.Π.Α.', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (1024, 102,   6, 0, '0', 0, '0', 0, 'Υπερμειωμένος Φ.Π.Α.', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (1025, 102,   3, 0, '0', 0, '0', 0, 'Νήσων υπερμειωμένος Φ.Π.Α.', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (1026, 102,   9, 0, '0', 0, '0', 0, 'Νήσων μειωμένος Φ.Π.Α.', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (1027, 102,   4, 0, '0', 0, '0', 0, 'Νήσων υπερμειωμένος Φ.Π.Α.', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (1028, 102,  17, 0, '0', 0, '0', 0, 'Νήσων υπερμειωμένος Φ.Π.Α.', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (102,   0, 0, '0', 0, '0', 0, 'Μηδενικό Φ.Π.Α.', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (102,  24, 0, '0', 0, '0', 0, 'Κανονικός Φ.Π.Α.', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (102,  13, 0, '0', 0, '0', 0, 'Μειωμένος Φ.Π.Α.', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (102,   6, 0, '0', 0, '0', 0, 'Υπερμειωμένος Φ.Π.Α.', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (102,   3, 0, '0', 0, '0', 0, 'Νήσων υπερμειωμένος Φ.Π.Α.', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (102,   9, 0, '0', 0, '0', 0, 'Νήσων μειωμένος Φ.Π.Α.', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (102,   4, 0, '0', 0, '0', 0, 'Νήσων υπερμειωμένος Φ.Π.Α.', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (102,  17, 0, '0', 0, '0', 0, 'Νήσων υπερμειωμένος Φ.Π.Α.', 1,__ENTITY__);
 
 -- ICELAND (id country=116)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1161, 116,   '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1163, 116,'25.5','0','VAT rate - standard',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1162, 116,   '7','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (116,   '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (116,'25.5','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (116,   '7','0','VAT rate - reduced',1,__ENTITY__);
 
 -- INDIA (id country=117)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1171, 117,    '0','0','VAT rate 0',            0,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (117,    '0','0','VAT rate 0',            0,__ENTITY__);
 
-insert into llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (1172, 117, 'C+S-5' ,  0, 2.5, '1', 2.5, '1', 0, 'CGST+SGST - Same state sales', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (1173, 117, 'I-5'   ,  5,   0, '0',   0, '0', 0, 'IGST',      1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (1174, 117, 'C+S-12',  0,   6, '1',   6, '1', 0, 'CGST+SGST - Same state sales', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (1175, 117, 'I-12'  , 12,   0, '0',   0, '0', 0, 'IGST',      1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (1176, 117, 'C+S-18',  0,   9, '1',   9, '1', 0, 'CGST+SGST - Same state sales', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (1177, 117, 'I-18'  , 18,   0, '0',   0, '0', 0, 'IGST',      1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (1178, 117, 'C+S-28',  0,  14, '1',  14, '1', 0, 'CGST+SGST - Same state sales', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (1179, 117, 'I-28'  , 28,   0, '0',   0, '0', 0, 'IGST',      1,__ENTITY__);
+insert into llx_c_tva(fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (117, 'C+S-5' ,  0, 2.5, '1', 2.5, '1', 0, 'CGST+SGST - Same state sales', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (117, 'I-5'   ,  5,   0, '0',   0, '0', 0, 'IGST',      1,__ENTITY__);
+insert into llx_c_tva(fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (117, 'C+S-12',  0,   6, '1',   6, '1', 0, 'CGST+SGST - Same state sales', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (117, 'I-12'  , 12,   0, '0',   0, '0', 0, 'IGST',      1,__ENTITY__);
+insert into llx_c_tva(fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (117, 'C+S-18',  0,   9, '1',   9, '1', 0, 'CGST+SGST - Same state sales', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (117, 'I-18'  , 18,   0, '0',   0, '0', 0, 'IGST',      1,__ENTITY__);
+insert into llx_c_tva(fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (117, 'C+S-28',  0,  14, '1',  14, '1', 0, 'CGST+SGST - Same state sales', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active,entity) values (117, 'I-28'  , 28,   0, '0',   0, '0', 0, 'IGST',      1,__ENTITY__);
 
 -- IRELAND (id country=8)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 81,     8,    '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 82,     8,   '23','0','VAT rate - standard',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 83,     8, '13.5','0','VAT rate - reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 84,     8,    '9','0','VAT rate - reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 85,     8,  '4.8','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (8,    '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (8,   '23','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (8, '13.5','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (8,    '9','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (8,  '4.8','0','VAT rate - reduced',1,__ENTITY__);
 
 -- ITALY (id country=3)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 31,  3,   '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 32,  3,  '10','0','VAT rate - reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 33,  3,   '4','0','VAT rate - super-reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 34,  3,  '22','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (3,   '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (3,  '10','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (3,   '4','0','VAT rate - super-reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (3,  '22','0','VAT rate - standard',1,__ENTITY__);
 
 -- IVORY COST (id country=21)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active,entity) values (211, 21,  '0','0',0,0,0,0,'IVA Rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active,entity) values (212, 21, '18','0',7.5,2,0,0,'IVA standard rate',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active,entity) values (21,  '0','0',0,0,0,0,'IVA Rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active,entity) values (21, '18','0',7.5,2,0,0,'IVA standard rate',1,__ENTITY__);
 
 -- JAPAN (id country=123)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1231, 123, '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1232, 123, '5','0','VAT rate 5',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (123, '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (123, '5','0','VAT rate 5',1,__ENTITY__);
 
 -- LUXEMBOURG (id country=140)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1401, 140,  '0','0','VAT rate 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1402, 140, '14','0','VAT rate - intermediary',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1403, 140,  '8','0','VAT rate - reduced', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1404, 140,  '3','0','VAT rate - super-reduced', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1405, 140, '16','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (140,  '0','0','VAT rate 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (140, '14','0','VAT rate - intermediary',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (140,  '8','0','VAT rate - reduced', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (140,  '3','0','VAT rate - super-reduced', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (140, '16','0','VAT rate - standard',1,__ENTITY__);
 
 -- MALI (id country=147)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1471, 147,  '0','0','VAT rate 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1472, 147, '18','0','VAT rate - standard', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (147,  '0','0','VAT rate 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (147, '18','0','VAT rate - standard', 1,__ENTITY__);
 
 -- MONACO (id country=27)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 271,  27,   '0','0','VAT rate 0 ou non applicable',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 272,  27, '8.5','0','VAT rate - standard (DOM sauf Guyane et Saint-Martin)',0,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 273,  27, '8.5','1','VAT rate - standard (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 274,  27, '5.5','0','VAT rate - reduced (France hors DOM-TOM)',0,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 275,  27,'19.6','0','VAT rate - standard (France hors DOM-TOM)',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 276,  27, '2.1','0','VAT rate - super-reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 277,  27,   '7','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (27,   '0','0','VAT rate 0 ou non applicable',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (27, '8.5','0','VAT rate - standard (DOM sauf Guyane et Saint-Martin)',0,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (27, '8.5','1','VAT rate - standard (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (27, '5.5','0','VAT rate - reduced (France hors DOM-TOM)',0,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (27,'19.6','0','VAT rate - standard (France hors DOM-TOM)',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (27, '2.1','0','VAT rate - super-reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (27,   '7','0','VAT rate - reduced',1,__ENTITY__);
 
 -- MAROCO (id country=12)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 121,  12,  '0','0','VAT rate 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 122,  12, '14','0','VAT rate - reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 123,  12, '10','0','VAT rate - reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 124,  12,  '7','0','VAT rate - super-reduced', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 125,  12, '20','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (12,  '0','0','VAT rate 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (12, '14','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (12, '10','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (12,  '7','0','VAT rate - super-reduced', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (12, '20','0','VAT rate - standard',1,__ENTITY__);
 
 -- MALTA (id country=148)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1481,  148,  '0','0','VAT rate 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1482,  148,  '7','0','VAT rate - reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1483,  148,  '5','0','VAT rate - super-reduced', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1484,  148, '18','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (148,  '0','0','VAT rate 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (148,  '7','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (148,  '5','0','VAT rate - super-reduced', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (148, '18','0','VAT rate - standard',1,__ENTITY__);
 
 -- NEDERLAND (id country=17)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 171,  17,   '0','0','0 BTW tarief', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 172,  17,   '6','0','Verlaagd BTW tarief', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 173,  17,  '19','0','Algemeen BTW tarief',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 174,  17,  '21','0','Algemeen BTW tarief (vanaf 1 oktober 2012)',0,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (17,   '0','0','0 BTW tarief', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (17,   '6','0','Verlaagd BTW tarief', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (17,  '19','0','Algemeen BTW tarief',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (17,  '21','0','Algemeen BTW tarief (vanaf 1 oktober 2012)',0,__ENTITY__);
 
 -- NEW CALEDONIA (id country=165)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1651, 165,   '0','0','VAT rate 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1652, 165,   '3','0','VAT standard 3', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1653, 165,   '6','0','VAT standard 6', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1654, 165,  '11','0','VAT rate - standard', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1655, 165,  '22','0','VAT standard high', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (165,   '0','0','VAT rate 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (165,   '3','0','VAT standard 3', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (165,   '6','0','VAT standard 6', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (165,  '11','0','VAT rate - standard', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (165,  '22','0','VAT standard high', 1,__ENTITY__);
 
 -- NEW ZEALAND (id country=166)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1661, 166,   '0','0','VAT rate 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1662, 166,  '15','0','VAT rate - standard', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (166,   '0','0','VAT rate 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (166,  '15','0','VAT rate - standard', 1,__ENTITY__);
 
 -- NIGERIA (id country=169)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1691, 169,   '0','0','VAT rate 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1692, 169,   '5','0','VAT rate - standard', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (169,   '0','0','VAT rate 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (169,   '5','0','VAT rate - standard', 1,__ENTITY__);
 
 -- NORWAY (id country=173)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1731, 173,   '0','0','VAT rate 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1732, 173,  '14','0','VAT rate - reduced', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1733, 173,   '8','0','VAT rate - reduced', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1734, 173,  '25','0','VAT rate - standard', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (173,   '0','0','VAT rate 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (173,  '14','0','VAT rate - reduced', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (173,   '8','0','VAT rate - reduced', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (173,  '25','0','VAT rate - standard', 1,__ENTITY__);
 
 -- PANAMA (id country=178)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1781, 178,   '0','0','ITBMS Rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1782, 178,   '7','0','ITBMS standard rate',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (178,   '0','0','ITBMS Rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (178,   '7','0','ITBMS standard rate',1,__ENTITY__);
 
 -- PERU (id country=181)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1811, 181,   '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1818, 181,  '18','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (181,   '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (181,  '18','0','VAT rate - standard',1,__ENTITY__);
 
 -- POLAND (id country=184)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1841, 184,   '0','0','VAT rate 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1842, 184,   '8','0','VAT rate - reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1843, 184,   '3','0','VAT rate - reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1844, 184,  '23','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (184,   '0','0','VAT rate 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (184,   '8','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (184,   '3','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (184,  '23','0','VAT rate - standard',1,__ENTITY__);
 
 -- PORTUGAL (id country=25)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 251,  25,   '0','0','VAT rate 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 252,  25,  '13','0','VAT rate - reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 253,  25,  '23','0','VAT rate - standard',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 254,  25,   '6','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (25,   '0','0','VAT rate 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (25,  '13','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (25,  '23','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (25,   '6','0','VAT rate - reduced',1,__ENTITY__);
 
 -- ROMANIA (id country=188)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1881, 188,   '0','0','VAT rate 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1882, 188,   '9','0','VAT rate - reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1883, 188,  '19','0','VAT rate - standard',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1884, 188,   '5','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (188,   '0','0','VAT rate 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (188,   '9','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (188,  '19','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (188,   '5','0','VAT rate - reduced',1,__ENTITY__);
 
 -- SAUDI ARABIA (id country=26)
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) VALUES ( 261,  26,   '0', '0', 'VAT rate 0', 1,__ENTITY__);
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) VALUES ( 262,  26,   '5', '0', 'VAT rate 5', 1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (26,   '0', '0', 'VAT rate 0', 1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (26,   '5', '0', 'VAT rate 5', 1,__ENTITY__);
 
 -- SAN SALVADOR (id country=86)
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) VALUES ( 861,  86,  '0', '0', 'SIN IVA', 1,__ENTITY__);
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) VALUES ( 862,  86, '13', '0', 'IVA 13', 1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (86,  '0', '0', 'SIN IVA', 1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (86, '13', '0', 'IVA 13', 1,__ENTITY__);
 
 -- SENEGAL (id country=22)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 221,  22,  '0', '0', 'VAT rate 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 222,  22, '10', '0', 'VAT rate - reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 223,  22, '18', '0', 'VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (22,  '0', '0', 'VAT rate 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (22, '10', '0', 'VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (22, '18', '0', 'VAT rate - standard',1,__ENTITY__);
 
 -- SLOVAKIA (id country=201)
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) VALUES (2011, 201,  '0', '0', 'VAT rate 0', 1,__ENTITY__);
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) VALUES (2012, 201, '10', '0', 'VAT rate - reduced', 1,__ENTITY__);
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) VALUES (2013, 201, '20', '0', 'VAT rate - standard', 1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (201,  '0', '0', 'VAT rate 0', 1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (201, '10', '0', 'VAT rate - reduced', 1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (201, '20', '0', 'VAT rate - standard', 1,__ENTITY__);
 
 -- SLOVENIA (id country=202)
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) VALUES (2021, 202,  '0', '0', 'VAT rate 0', 1,__ENTITY__);
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) VALUES (2022, 202,'9.5', '0', 'VAT rate - reduced', 1,__ENTITY__);
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) VALUES (2023, 202, '22', '0', 'VAT rate - standard', 1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (202,  '0', '0', 'VAT rate 0', 1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (202,'9.5', '0', 'VAT rate - reduced', 1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (202, '22', '0', 'VAT rate - standard', 1,__ENTITY__);
 
 -- SOUTH AFRICA (id country=205)
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) VALUES (2051, 205,  '0', '0', 'VAT rate 0', 1,__ENTITY__);
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) VALUES (2052, 205, '15', '0', 'VAT rate - standard', 1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (205,  '0', '0', 'VAT rate 0', 1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES 205, '15', '0', 'VAT rate - standard', 1,__ENTITY__);
 
 -- SPAIN (id country=4)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active,entity) values ( 41, 4, '0','0',  '0','3','-19:-15:-9','5','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active,entity) values ( 42, 4,'10','0','1.4','3','-19:-15:-9','5','VAT rate - reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active,entity) values ( 43, 4, '4','0','0.5','3','-19:-15:-9','5','VAT rate - super-reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active,entity) values ( 44, 4,'21','0','5.2','3','-19:-15:-9','5','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active,entity) values (4, '0','0',  '0','3','-19:-15:-9','5','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active,entity) values (4,'10','0','1.4','3','-19:-15:-9','5','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active,entity) values (4, '4','0','0.5','3','-19:-15:-9','5','VAT rate - super-reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active,entity) values (4,'21','0','5.2','3','-19:-15:-9','5','VAT rate - standard',1,__ENTITY__);
 
 -- SWEDEN (id country=20)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 201,  20,   '0','0','VAT rate 0',  1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 202,  20,  '12','0','VAT rate - reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 203,  20,   '6','0','VAT rate - super-reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 204,  20,  '25','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (20,   '0','0','VAT rate 0',  1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (20,  '12','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (20,   '6','0','VAT rate - super-reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (20,  '25','0','VAT rate - standard',1,__ENTITY__);
 
 -- SWITZERLAND (id country=6)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (  61,   6,   '0','0','VAT rate 0',  1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (  62,   6, '3.8','0','VAT rate - reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (  63,   6, '2.6','0','VAT rate - super-reduced',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (  64,   6, '8.1','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (6,   '0','0','VAT rate 0',  1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (6, '3.8','0','VAT rate - reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (6, '2.6','0','VAT rate - super-reduced',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (6, '8.1','0','VAT rate - standard',1,__ENTITY__);
 
 -- SRI LANKA (id country=207)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2071, 207,   '0','0','VAT 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2072, 207,  '15','0','VAT 15%', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (207,   '0','0','VAT 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (207,  '15','0','VAT 15%', 1,__ENTITY__);
 
 -- TAIWAN (id country=213)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2131, 213,   '0','0','VAT 0', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2132, 213,   '5','0','VAT 5%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (213,   '0','0','VAT 0', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (213,   '5','0','VAT 5%',1,__ENTITY__);
 
 -- TUNISIA (id country=10)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (101,10,    '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (102,10,   '12','0','VAT 12%',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (103,10,   '18','0','VAT 18%',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (104,10,  '7.5','0','VAT 6% Majoré à 25% (7.5%)',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (105,10,   '15','0','VAT 12% Majoré à 25% (15%)',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (106,10, '22.5','0','VAT 18% Majoré à 25% (22.5%)',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (107,10,    '6','0','VAT 6%', 1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type,entity) values (108,10,'18.18','0','VAT 18%+FODEC', 1, 1, '4', 0, 0,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (10,    '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (10,   '12','0','VAT 12%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (10,   '18','0','VAT 18%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (10,  '7.5','0','VAT 6% Majoré à 25% (7.5%)',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (10,   '15','0','VAT 12% Majoré à 25% (15%)',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (10, '22.5','0','VAT 18% Majoré à 25% (22.5%)',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (10,    '6','0','VAT 6%', 1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type,entity) values (10,'18.18','0','VAT 18%+FODEC', 1, 1, '4', 0, 0,__ENTITY__);
 
 -- UKRAINE (id country=226)
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2261,226,   '0','0','VAT rate 0',1,__ENTITY__);
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2262,226,  '20','0','VAT standart rate',1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (226,   '0','0','VAT rate 0',1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (226,  '20','0','VAT standart rate',1,__ENTITY__);
 
 -- UNITED OF KINGDOM (id country=7)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 71, 7,     '0','0','VAT rate 0',   1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 72, 7,  '17.5','0','VAT rate - standard before 2011',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 73, 7,     '5','0','VAT rate - reduced',   1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values ( 74, 7,  	 '20','0','VAT rate - standard',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (7,     '0','0','VAT rate 0',   1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (7,  '17.5','0','VAT rate - standard before 2011',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (7,     '5','0','VAT rate - reduced',   1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (7,  	 '20','0','VAT rate - standard',1,__ENTITY__);
 
 -- UNITED STATES (id country=11)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (111,11,     '0','0','No Sales Tax',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (112,11,     '4','0','Sales Tax 4%',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (113,11,     '6','0','Sales Tax 6%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (11,     '0','0','No Sales Tax',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (11,     '4','0','Sales Tax 4%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (11,     '6','0','Sales Tax 6%',1,__ENTITY__);
 
 
 -- Pour les DOM-TOM, il faut utiliser le pays FRANCE (Sinon pb avec regles de TVA et autres regles propres aux pays et europe)
 
 -- SAINT PIERRE ET MIQUELON (id country=19)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1931,193,  '0','0','No VAT in SPM',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (193,  '0','0','No VAT in SPM',1,__ENTITY__);
 
 -- SAINT MARTIN (id country=24)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2461,246,  '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (246,  '0','0','VAT rate 0',1,__ENTITY__);
 
 
 -- MAURITANIA (id country=151)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1511,151,  '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1512,151, '14','0','VAT rate 14',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (151,  '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (151, '14','0','VAT rate 14',1,__ENTITY__);
 
 -- MAURITIUS (id country=152)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1521,152,  '0','0','VAT rate 0',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1522,152, '15','0','VAT rate 15',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (152,  '0','0','VAT rate 0',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (152, '15','0','VAT rate 15',1,__ENTITY__);
 
 -- HONDURAS (id country=114)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1141,114,     '0','0','No ISV',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1142,114,    '12','0','ISV 12%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (114,     '0','0','No ISV',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (114,    '12','0','ISV 12%',1,__ENTITY__);
 
 -- MEXIQUE (id country=154)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1541,154,     '0','0','No VAT',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1542,154,    '16','0','VAT 16%',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (1543,154,    '10','0','VAT Frontero',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (154,     '0','0','No VAT',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (154,    '16','0','VAT 16%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (154,    '10','0','VAT Frontero',1,__ENTITY__);
 
 -- BARBADOS (id country=46)
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) VALUES ( 461, 46,     '0','0','No VAT',1,__ENTITY__);
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) VALUES ( 462, 46,    '15','0','VAT 15%',1,__ENTITY__);
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) VALUES ( 463, 46,   '7.5','0','VAT 7.5%',1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (46,     '0','0','No VAT',1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (46,    '15','0','VAT 15%',1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (46,   '7.5','0','VAT 7.5%',1,__ENTITY__);
 
 -- VENEZUELA (id country=232)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2321,232,     '0','0','No VAT',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2322,232,    '12','0','VAT 12%',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2323,232,     '8','0','VAT 8%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (232,     '0','0','No VAT',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (232,    '12','0','VAT 12%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (232,     '8','0','VAT 8%',1,__ENTITY__);
 
 -- VIETNAM (id country=233)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2331,233,     '0','0','Thuế GTGT đươc khấu trừ 0%',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2332,233,    '5','0','Thuế GTGT đươc khấu trừ 5%',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2333,233,     '8','0','Thuế GTGT đươc khấu trừ 8%',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2334,233,     '10','0','Thuế GTGT đươc khấu trừ 10%',1,__ENTITY__);
--- Example of code to insert a VAT rate 0 for each country
--- delete from llx_c_tva where rowid = 1181;		-- to delete a record that does not follow rules for rowid (fk_pays+'1')
--- insert into llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active,entity) SELECT CONCAT(c.rowid, '1'), c.rowid, 0, 0, 'No VAT', 1 from llx_c_country as c where c.rowid not in (select fk_pays from llx_c_tva,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (233,     '0','0','Thuế GTGT đươc khấu trừ 0%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (233,    '5','0','Thuế GTGT đươc khấu trừ 5%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (233,     '8','0','Thuế GTGT đươc khấu trừ 8%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (233,     '10','0','Thuế GTGT đươc khấu trừ 10%',1,__ENTITY__);
 
 -- BURUNDI (id country=61) -- https://www.objectif-import-export.fr/fr/marches-internationaux/fiche-pays/burundi/presentation-fiscalite
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2335,61,     '0','0','No VAT',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2336,61,    '10','0','VAT 10%',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (2337,61,    '18','0','VAT 18%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (61,     '0','0','No VAT',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (61,    '10','0','VAT 10%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (61,    '18','0','VAT 18%',1,__ENTITY__);
 
 -- Turkiye (Turkey) (id country=221)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (22101,221,     '0','0','No VAT',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (22102,221,    '1','0','VAT 1%',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (22103,221,    '8','0','VAT 8%',1,__ENTITY__);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,entity) values (22104,221,    '18','0','VAT 18%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (221,     '0','0','No VAT',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (221,    '1','0','VAT 1%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (221,    '8','0','VAT 8%',1,__ENTITY__);
+insert into llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) values (221,    '18','0','VAT 18%',1,__ENTITY__);

From 47a468c9e7e982ab44998634c28f02f17f038269 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 14 Jan 2025 07:45:29 +0100
Subject: [PATCH 094/243] FIX syntax error

---
 htdocs/install/mysql/data/llx_c_tva.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 86509c45b67..88b3afc8d4d 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -311,7 +311,7 @@ INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (2
 
 -- SOUTH AFRICA (id country=205)
 INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (205,  '0', '0', 'VAT rate 0', 1,__ENTITY__);
-INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES 205, '15', '0', 'VAT rate - standard', 1,__ENTITY__);
+INSERT INTO llx_c_tva(fk_pays,taux,recuperableonly,note,active,entity) VALUES (205, '15', '0', 'VAT rate - standard', 1,__ENTITY__);
 
 -- SPAIN (id country=4)
 insert into llx_c_tva(fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active,entity) values (4, '0','0',  '0','3','-19:-15:-9','5','VAT rate 0',1,__ENTITY__);

From 9cd495438aea12bcee9c72806942b6d2d39af67c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 14 Jan 2025 08:35:48 +0100
Subject: [PATCH 095/243] FIX split data and rename files (Multicompany
 compatibility)

---
 .../mysql/data/llx_accounting_journal.sql     | 57 +++++++++++++++++++
 ...ting_abc.sql => llx_accounting_system.sql} | 13 +----
 2 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 htdocs/install/mysql/data/llx_accounting_journal.sql
 rename htdocs/install/mysql/data/{llx_accounting_abc.sql => llx_accounting_system.sql} (91%)

diff --git a/htdocs/install/mysql/data/llx_accounting_journal.sql b/htdocs/install/mysql/data/llx_accounting_journal.sql
new file mode 100644
index 00000000000..fd5e634d66f
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_accounting_journal.sql
@@ -0,0 +1,57 @@
+-- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
+-- Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
+-- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
+-- Copyright (C) 2005-2025 Regis Houssin        <regis.houssin@inodbox.com>
+-- Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
+-- Copyright (C) 2011-2022 Alexandre Spangaro   <aspangaro@open-dsi.fr>
+-- Copyright (C) 2015-2017 Juanjo Menent        <jmenent@2byte.es>
+-- Copyright (C) 2018      Abbes bahfir         <dolipar@dolipar.org>
+-- Copyright (C) 2020      Udo Tamm             <dev@dolibit.de>
+-- Copyright (C) 2023      Nick Fragoulis
+-- Copyright (C) 2023      Santiago Payà        <santiagopim@gmail.com>
+--
+--
+--------------------------------------------------------------------------------------
+-- License
+-- #######
+-- 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/>.
+--
+--------------------------------------------------------------------------------------
+
+-- Comment
+-- #######
+-- (EN)
+-- Do not place a comment at the end of the line, this file is parsed at the end of the line.
+-- from the install and all '--' are removed.
+--
+-- (FR)
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+--------------------------------------------------------------------------------------
+-- PCG = Plan Comptable Général (FR) - General Accounting Plan (EN)
+--------------------------------------------------------------------------------------
+
+
+-- Accounting Journals
+
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('VT',  'ACCOUNTING_SELL_JOURNAL',          2, 1, __ENTITY__);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('AC',  'ACCOUNTING_PURCHASE_JOURNAL',      3, 1, __ENTITY__);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('BQ',  'FinanceJournal',                   4, 1, __ENTITY__);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('OD',  'ACCOUNTING_MISCELLANEOUS_JOURNAL', 1, 1, __ENTITY__);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('AN',  'ACCOUNTING_HAS_NEW_JOURNAL',       9, 1, __ENTITY__);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('ER',  'ExpenseReportsJournal',            5, 1, __ENTITY__);
+INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('INV', 'InventoryJournal',                 8, 1, __ENTITY__);
diff --git a/htdocs/install/mysql/data/llx_accounting_abc.sql b/htdocs/install/mysql/data/llx_accounting_system.sql
similarity index 91%
rename from htdocs/install/mysql/data/llx_accounting_abc.sql
rename to htdocs/install/mysql/data/llx_accounting_system.sql
index d748aa7f4fa..2def811073e 100644
--- a/htdocs/install/mysql/data/llx_accounting_abc.sql
+++ b/htdocs/install/mysql/data/llx_accounting_system.sql
@@ -3,7 +3,7 @@
 -- Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
 -- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
--- Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+-- Copyright (C) 2005-2025 Regis Houssin        <regis.houssin@inodbox.com>
 -- Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
 -- Copyright (C) 2011-2022 Alexandre Spangaro   <aspangaro@open-dsi.fr>
 -- Copyright (C) 2015-2017 Juanjo Menent        <jmenent@2byte.es>
@@ -46,17 +46,6 @@
 --------------------------------------------------------------------------------------
 
 
--- Accounting Journals
-
-INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('VT',  'ACCOUNTING_SELL_JOURNAL',          2, 1, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('AC',  'ACCOUNTING_PURCHASE_JOURNAL',      3, 1, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('BQ',  'FinanceJournal',                   4, 1, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('OD',  'ACCOUNTING_MISCELLANEOUS_JOURNAL', 1, 1, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('AN',  'ACCOUNTING_HAS_NEW_JOURNAL',       9, 1, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('ER',  'ExpenseReportsJournal',            5, 1, 1);
-INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('INV', 'InventoryJournal',                 8, 1, 1);
-
-
 -- Accounting Charts / Plans (Templates) for Countries
 
 -- Description of chart of account FR PCG25-DEV

From 5d6c8690b948aea562b26bfffa1b82928a4f61be Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 14 Jan 2025 09:14:55 +0100
Subject: [PATCH 096/243] FIX to avoid postgresql error

---
 htdocs/install/mysql/tables/llx_blockedlog.key.sql | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_blockedlog.key.sql b/htdocs/install/mysql/tables/llx_blockedlog.key.sql
index 065be82aba1..811a1b1d2b0 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog.key.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog.key.sql
@@ -22,4 +22,6 @@ ALTER TABLE llx_blockedlog ADD INDEX entity (entity);
 ALTER TABLE llx_blockedlog ADD INDEX fk_user (fk_user);
 ALTER TABLE llx_blockedlog ADD INDEX entity_action_certified (entity,action,certified);
 
-ALTER TABLE llx_blockedlog ADD INDEX entity_rowid (entity, rowid);	-- for the "SELECT rowid, signature FROM llx_blockedlog FORCE INDEX entity_rowid WHERE entity = x AND rowid < z ORDER BY rowid DESC"
+-- for the "SELECT rowid, signature FROM llx_blockedlog FORCE INDEX entity_rowid WHERE entity = x AND rowid < z ORDER BY rowid DESC"
+
+ALTER TABLE llx_blockedlog ADD INDEX entity_rowid (entity, rowid);

From ac1077bfe32712d293527f9b22dc4c8f2d934041 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Tue, 14 Jan 2025 09:48:13 +0100
Subject: [PATCH 097/243] FIX : There were many status indicator in the invoice
 linked object block (propal card)

---
 htdocs/compta/facture/tpl/linkedobjectblock.tpl.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index c002e5a7e5f..071403509dd 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -89,11 +89,8 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	$totalallpayments = 0;
 	$totalcalculated = false;
 	if (method_exists($objectlink, 'getSommePaiement')) {
-		print $objectlink->getLibStatut(3, $objectlink->getSommePaiement());
 		$totalcalculated = true;
 		$totalallpayments += $objectlink->getSommePaiement();
-	} else {
-		print $objectlink->getLibStatut(3);
 	}
 	if (method_exists($objectlink, 'getSumDepositsUsed')) {
 		$totalcalculated = true;

From 11d4b973e04727848bfd6d914505f5c89ab9012d Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 14 Jan 2025 10:35:44 +0100
Subject: [PATCH 098/243] Add log

---
 .../modules/security/generate/modGeneratePassNone.class.php     | 2 ++
 .../modules/security/generate/modGeneratePassPerso.class.php    | 2 ++
 .../modules/security/generate/modGeneratePassStandard.class.php | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
index e5f1f77c00c..40817c5ca09 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
@@ -98,6 +98,8 @@ class modGeneratePassNone extends ModeleGenPassword
 	 */
 	public function validatePassword($password)
 	{
+		dol_syslog("modGeneratePassNone::validatePassword");
+
 		return 1;
 	}
 }
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
index de7096bb176..a11f37e4237 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -221,6 +221,8 @@ class modGeneratePassPerso extends ModeleGenPassword
 
 		$this->initAll();	// For the case this method is called alone
 
+		dol_syslog("modGeneratePassPerso::validatePassword");
+
 		$password_a = preg_split('//u', $password, 0, PREG_SPLIT_NO_EMPTY);
 		$maj = preg_split('//u', $this->Maj, 0, PREG_SPLIT_NO_EMPTY);
 		$num = preg_split('//u', $this->Nb, 0, PREG_SPLIT_NO_EMPTY);
diff --git a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
index 53f40260dbc..c363f1c050b 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
@@ -125,6 +125,8 @@ class modGeneratePassStandard extends ModeleGenPassword
 	{
 		global $langs;
 
+		dol_syslog("modGeneratePassStandard::validatePassword");
+
 		if (dol_strlen($password) < $this->length2) {
 			$langs->load("other");
 			$this->error = $langs->trans("YourPasswordMustHaveAtLeastXChars", $this->length2);

From ec639e13555d487d4b25432ba13eada1a9ad2593 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 14 Jan 2025 10:44:46 +0100
Subject: [PATCH 099/243] Fix trans

---
 htdocs/langs/en_US/website.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 63725bae5cc..b839978b0a9 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -307,7 +307,7 @@ yourCompanyInformation=Your company information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s

From 79c55149b2ffc99b7f7178087bb305f77b736cd7 Mon Sep 17 00:00:00 2001
From: Florian Mortgat <50440633+atm-florianm@users.noreply.github.com>
Date: Tue, 14 Jan 2025 11:00:38 +0100
Subject: [PATCH 100/243] Update htdocs/core/lib/functions.lib.php

---
 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 610e19b293a..621b0987b08 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8882,7 +8882,7 @@ function dol_osencode($str)
  */
 function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0, $filters = '', $useCache = true)
 {
-	static $cache_codes = array();
+	global $cache_codes;
 
 	// If key empty
 	if ($key == '') {

From 003424f6cccdae09e8eb7f162f75c663c3562f4d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 13 Jan 2025 02:10:37 +0100
Subject: [PATCH 101/243] Fix: Correct $search_ref typo into $search_ref_ext

---
 htdocs/contact/list.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 48d54d40f5f..9661927d240 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2019-2024	Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2019		Josep Lluís Amador			<joseplluis@lliuretic.cat>
  * Copyright (C) 2020		Open-Dsi					<support@open-dsi.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Benjamin Falière			<benjamin.faliere@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -368,7 +368,7 @@ if (empty($reshook)) {
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {	// All tests are required to be compatible with all browsers
 		$search_all = "";
 		$search_id = '';
-		$search_ref = '';
+		$search_ref_ext = '';
 		$search_firstlast_only = "";
 		$search_lastname = "";
 		$search_firstname = "";
@@ -866,8 +866,8 @@ if ($search_all != '') {
 if ($search_id > 0) {
 	$param .= "&search_id=".((int) $search_id);
 }
-if ($search_ref) {
-	$param .= "&search_ref=".urlencode($search_ref);
+if ($search_ref_ext) {
+	$param .= "&search_ref_ext=".urlencode($search_ref_ext);
 }
 if ($search_lastname != '') {
 	$param .= '&search_lastname='.urlencode($search_lastname);

From 84940c6f84946601d0d3bc3912ab1fedd2f0f456 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 14 Jan 2025 12:02:52 +0100
Subject: [PATCH 102/243] Debug v21

---
 .../eventorganization/class/conferenceorbooth.class.php   | 2 +-
 htdocs/public/eventorganization/attendee_new.php          | 4 ++--
 htdocs/public/eventorganization/subscriptionok.php        | 2 +-
 htdocs/public/project/suggestbooth.php                    | 4 ++--
 htdocs/public/project/suggestconference.php               | 4 ++--
 htdocs/public/project/viewandvote.php                     | 8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 2defceeee72..12245ab9643 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -291,7 +291,7 @@ class ConferenceOrBooth extends ActionComm
 
 		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.urlencode((string) ($id)).'&type=conf';
 
-		$encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.$id, '2');
+		$encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $id), 'md5');
 		$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
 
 		/*$this->fields['pubregister'] = array('type'=>'url', 'label'=>$langs->trans("PublicAttendeeSubscriptionPage"), 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>1);
diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index d3099bbc36b..70a22f644e4 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -362,7 +362,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 
 		// If the registration has already been paid for this attendee
 		if (!empty($confattendee->date_subscription) && !empty($confattendee->amount)) {
-			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 'master');
+			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.((int) $id), 'md5');
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.((int) $id).'&securekey='.urlencode($securekeyurl);
 
 			$mesg = $langs->trans("RegistrationAndPaymentWereAlreadyRecorded", $email);
@@ -698,7 +698,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 				dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 			}
 
-			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, '2');
+			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.((int) $id), 'md5');
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.((int) $id).'&securekey='.urlencode($securekeyurl);
 
 			header("Location: ".$redirection);
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index a1fe0017a3a..5b3be5058eb 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -81,7 +81,7 @@ $error = 0;
 // Security check
 $id = GETPOSTINT("id");
 $securekeyreceived = GETPOST("securekey");
-$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, '2');
+$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.((int) $id), 'md5');
 
 if ($securekeyreceived != $securekeytocompare) {
 	print $langs->trans('MissingOrBadSecureKey');
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 949bb286c48..9247e6d9159 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -94,7 +94,7 @@ if ($resultproject < 0) {
 
 // Security check
 $securekeyreceived = GETPOST('securekey', 'alpha');
-$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 'md5');
+$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.((int) $id), 'md5');
 
 if ($securekeytocompare != $securekeyreceived) {
 	print $langs->trans('MissingOrBadSecureKey');
@@ -550,7 +550,7 @@ if (empty($reshook) && $action == 'add') {	// Test on permission not required he
 			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 		}
 
-		$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, '2');
+		$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.((int) $id), 'md5');
 		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
 		header("Location: ".$redirection);
 		exit;
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index fcc9dfc6025..e3ddf9c4260 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -94,7 +94,7 @@ if ($resultproject < 0) {
 
 // Security check
 $securekeyreceived = GETPOST('securekey', 'alpha');
-$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 'md5');
+$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.((int) $id), 'md5');
 
 if ($securekeytocompare != $securekeyreceived) {
 	print $langs->trans('MissingOrBadSecureKey');
@@ -486,7 +486,7 @@ if (empty($reshook) && $action == 'add') {	// Test on permission not required he
 
 	if (!$error) {
 		$db->commit();
-		$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, '2');
+		$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.((int) $id), 'md5');
 		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.((int) $id).'&securekey='.urlencode($securekeyurl);
 		header("Location: ".$redirection);
 		exit;
diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 5b9404e2515..250a7b4c5df 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -81,7 +81,7 @@ $error = 0;
 $action = GETPOST('action', 'aZ09');
 $id = GETPOST('id');
 $securekeyreceived = GETPOST("securekey");
-$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 'md5');
+$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.((int) $id), 'md5');
 
 if ($securekeytocompare != $securekeyreceived) {
 	print $langs->trans('MissingOrBadSecureKey');
@@ -173,10 +173,10 @@ while ($i < $db->num_rows($result)) {
 */
 
 // Get vote result
-$idvote = GETPOST("vote");
-$hashedvote = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'vote'.$idvote);
+$idvote = GETPOSTINT("vote");
+$hashedvote = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'vote'.$idvote);
 
-if (strlen($idvote)) {
+if ($idvote > 0) {
 	if (in_array($hashedvote, $listofvotes)) {
 		// Has already voted
 		$votestatus = 'ko';

From 5701d5c6f67e130d60dd8274c9aeb7280eaf8418 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 14 Jan 2025 12:02:52 +0100
Subject: [PATCH 103/243] Debug v21

---
 .../eventorganization/class/conferenceorbooth.class.php   | 2 +-
 htdocs/public/eventorganization/attendee_new.php          | 4 ++--
 htdocs/public/eventorganization/subscriptionok.php        | 2 +-
 htdocs/public/project/suggestbooth.php                    | 4 ++--
 htdocs/public/project/suggestconference.php               | 4 ++--
 htdocs/public/project/viewandvote.php                     | 8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 2defceeee72..12245ab9643 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -291,7 +291,7 @@ class ConferenceOrBooth extends ActionComm
 
 		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.urlencode((string) ($id)).'&type=conf';
 
-		$encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.$id, '2');
+		$encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $id), 'md5');
 		$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
 
 		/*$this->fields['pubregister'] = array('type'=>'url', 'label'=>$langs->trans("PublicAttendeeSubscriptionPage"), 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>1);
diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index d3099bbc36b..70a22f644e4 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -362,7 +362,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 
 		// If the registration has already been paid for this attendee
 		if (!empty($confattendee->date_subscription) && !empty($confattendee->amount)) {
-			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 'master');
+			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.((int) $id), 'md5');
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.((int) $id).'&securekey='.urlencode($securekeyurl);
 
 			$mesg = $langs->trans("RegistrationAndPaymentWereAlreadyRecorded", $email);
@@ -698,7 +698,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 				dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 			}
 
-			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, '2');
+			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.((int) $id), 'md5');
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.((int) $id).'&securekey='.urlencode($securekeyurl);
 
 			header("Location: ".$redirection);
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index a1fe0017a3a..5b3be5058eb 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -81,7 +81,7 @@ $error = 0;
 // Security check
 $id = GETPOSTINT("id");
 $securekeyreceived = GETPOST("securekey");
-$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, '2');
+$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.((int) $id), 'md5');
 
 if ($securekeyreceived != $securekeytocompare) {
 	print $langs->trans('MissingOrBadSecureKey');
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 949bb286c48..9247e6d9159 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -94,7 +94,7 @@ if ($resultproject < 0) {
 
 // Security check
 $securekeyreceived = GETPOST('securekey', 'alpha');
-$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 'md5');
+$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.((int) $id), 'md5');
 
 if ($securekeytocompare != $securekeyreceived) {
 	print $langs->trans('MissingOrBadSecureKey');
@@ -550,7 +550,7 @@ if (empty($reshook) && $action == 'add') {	// Test on permission not required he
 			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 		}
 
-		$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, '2');
+		$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.((int) $id), 'md5');
 		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
 		header("Location: ".$redirection);
 		exit;
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index fcc9dfc6025..e3ddf9c4260 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -94,7 +94,7 @@ if ($resultproject < 0) {
 
 // Security check
 $securekeyreceived = GETPOST('securekey', 'alpha');
-$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 'md5');
+$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.((int) $id), 'md5');
 
 if ($securekeytocompare != $securekeyreceived) {
 	print $langs->trans('MissingOrBadSecureKey');
@@ -486,7 +486,7 @@ if (empty($reshook) && $action == 'add') {	// Test on permission not required he
 
 	if (!$error) {
 		$db->commit();
-		$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, '2');
+		$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.((int) $id), 'md5');
 		$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.((int) $id).'&securekey='.urlencode($securekeyurl);
 		header("Location: ".$redirection);
 		exit;
diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 5b9404e2515..250a7b4c5df 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -81,7 +81,7 @@ $error = 0;
 $action = GETPOST('action', 'aZ09');
 $id = GETPOST('id');
 $securekeyreceived = GETPOST("securekey");
-$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 'md5');
+$securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.((int) $id), 'md5');
 
 if ($securekeytocompare != $securekeyreceived) {
 	print $langs->trans('MissingOrBadSecureKey');
@@ -173,10 +173,10 @@ while ($i < $db->num_rows($result)) {
 */
 
 // Get vote result
-$idvote = GETPOST("vote");
-$hashedvote = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'vote'.$idvote);
+$idvote = GETPOSTINT("vote");
+$hashedvote = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'vote'.$idvote);
 
-if (strlen($idvote)) {
+if ($idvote > 0) {
 	if (in_array($hashedvote, $listofvotes)) {
 		// Has already voted
 		$votestatus = 'ko';

From 0f0073b575ceded662b9c996ea4e899cb58de8aa Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 2 Aug 2024 19:24:11 +0200
Subject: [PATCH 104/243] Qual: Improve phpdoc for phan notices

Also changed some `"$var"` to more efficient `(string) $var`.
---
 htdocs/core/lib/functions.lib.php        | 25 ++++++++++++------------
 htdocs/core/menus/standard/eldy.lib.php  |  4 ++--
 htdocs/core/menus/standard/eldy_menu.php |  6 +++---
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index df7b61f06c0..cb73d130f84 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2000-2007	Rodolphe Quiedeville		<rodolphe@quiedeville.org>
  * Copyright (C) 2003		Jean-Louis Bergamo			<jlb@j1b.org>
  * Copyright (C) 2004-2024	Laurent Destailleur			<eldy@users.sourceforge.net>
@@ -21,7 +22,7 @@
  * Copyright (C) 2022       Ferran Marcet           	<fmarcet@2byte.es>
  * Copyright (C) 2022       Charlene Benke           	<charlene@patas-monkey.com>
  * Copyright (C) 2023       Joachim Kueter              <git-jk@bloxera.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Lenin Rivas					<lenin.rivas777@gmail.com>
  * Copyright (C) 2024		Josep Lluís Amador Teruel	<joseplluis@lliuretic.cat>
  * Copyright (C) 2024		Benoît PASCAL				<contact@p-ben.com>
@@ -9686,9 +9687,9 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
  *  $mesg = make_substitutions($mesg, $substitutionarray, $langs);
  *
  *  @param	string		$text	      					Source string in which we must do substitution
- *  @param  array<string,string>	$substitutionarray	Array with key->val to substitute. Example: array('__MYKEY__' => 'MyVal', ...)
+ *  @param  array<string,null|string|float|int>	$substitutionarray	Array with key->val to substitute. Example: array('__MYKEY__' => 'MyVal', ...)
  *  @param	?Translate	$outputlangs					Output language
- *  @param	int			$converttextinhtmlifnecessary	0=Convert only value into HTML if text is already in HTML
+ *  @param	int<0,1>	$converttextinhtmlifnecessary	0=Convert only value into HTML if text is already in HTML
  *  													1=Will also convert initial $text into HTML if we try to insert one value that is HTML
  * 	@return string  		    						Output string after substitutions
  *  @see	complete_substitutions_array(), getCommonSubstitutionArray()
@@ -9736,7 +9737,7 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null, $con
 						$msgishtml = 1;
 					}
 				} else {
-					$value = dol_nl2br("$value");
+					$value = dol_nl2br((string) $value);
 				}
 
 				$text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $value, $text);
@@ -9767,7 +9768,7 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null, $con
 					$msgishtml = 1;
 				}
 			} else {
-				$value = dol_nl2br("$value");
+				$value = dol_nl2br((string) $value);
 			}
 
 			$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $value, $text);
@@ -9785,7 +9786,7 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null, $con
 		}
 
 		if (empty($converttextinhtmlifnecessary)) {
-			$text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example
+			$text = str_replace((string) $key, (string) $value, $text); // Cast to string is needed when value is 123.5 for example
 		} else {
 			if (! $msgishtml) {
 				$valueishtml = dol_textishtml($value, 1);
@@ -9795,9 +9796,9 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null, $con
 					$msgishtml = 1;
 				}
 			} else {
-				$value = dol_nl2br("$value");
+				$value = dol_nl2br((string) $value);
 			}
-			$text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example
+			$text = str_replace((string) $key, (string) $value, $text); // Cast to string is needed 123.5 for example
 		}
 	}
 
@@ -9820,7 +9821,7 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null, $con
 			if (isset($lazy_load_arr[1]) && !empty($lazy_load_arr[1])) {
 				$key_to_substitute = $lazy_load_arr[1];
 				if (preg_match('/' . preg_quote($key_to_substitute, '/') . '/', $text)) {
-					$param_arr = explode(':', $value);
+					$param_arr = explode(':', (string) $value);
 					// path:class:method:id
 					if (count($param_arr) == 4) {
 						$path = $param_arr[0];
@@ -9855,7 +9856,7 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null, $con
 									$valuetouseforsubstitution = $tmpobj->$method($id, $key_to_substitute, true);
 								}
 
-								$text = str_replace("$key_to_substitute", "$valuetouseforsubstitution", $text); // We must keep the " to work when value is 123.5 for example
+								$text = str_replace((string) $key_to_substitute, (string) $valuetouseforsubstitution, $text); // Cast to string in case value is 123.5 for example
 							}
 						}
 					}
@@ -10665,9 +10666,9 @@ function dol_eval($s, $returnvalue = 1, $hideerrors = 1, $onlysimplestring = '1'
 			// Check if there is dynamic call (first we use black list patterns)
 			if (preg_match('/\$[\w]*\s*\(/', $s)) {
 				if ($returnvalue) {
-					return 'Bad string syntax to evaluate (mode '.$onlysimplestring.', found a call using of "$abc(" or "$abc (" instead of using the direct name of the function): '.$s;
+					return 'Bad string syntax to evaluate (mode '.$onlysimplestring.', found a call using "$abc(" or "$abc (" instead of using the direct name of the function): '.$s;
 				} else {
-					dol_syslog('Bad string syntax to evaluate (mode '.$onlysimplestring.', found a call using of "$abc(" or "$abc (" instead of using the direct name of the function): '.$s, LOG_WARNING);
+					dol_syslog('Bad string syntax to evaluate (mode '.$onlysimplestring.', found a call using "$abc(" or "$abc (" instead of using the direct name of the function): '.$s, LOG_WARNING);
 					return '';
 				}
 			}
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index b8499c47305..76040bb5c01 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -731,9 +731,9 @@ function print_end_menu_array()
  * @param	int<0,1>	$noout				Disable output (Initialise &$menu only).
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
  * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not defined in session.
- * @param	?array<string,string>	$moredata	An array with more data to output
+ * @param	?array{searchform?:string,bookmarks?:string}	$moredata	An array with more data to output
  * @param 	int<0,1>	$type_user     		0=Menu for backoffice, 1=Menu for front office
- * @return	int								Nb of menu entries
+ * @return	int<0,max>						Nb of menu entries
  */
 function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null, $type_user = 0)
 {
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index a7e08363ec6..b75471e6d8c 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -148,9 +148,9 @@ class MenuManager
 	 *  Show menu.
 	 *  Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.
 	 *
-	 *	@param	string				$mode			'top', 'topnb', 'left', 'leftdropdown', 'jmobile' (used to get full xml ul/li menu)
-	 *  @param	?array<string,mixed>	$moredata		An array with more data to output
-	 *  @return int                 			    0 or nb of top menu entries if $mode = 'topnb'
+	 *	@param	'top'|'topnb'|'left'|'leftdropdown'|'jmobile'	$mode			'top', 'topnb', 'left', 'leftdropdown', 'jmobile' (used to get full xml ul/li menu)
+	 *  @param	?array<string,string>	$moredata	An array with more data to output
+	 *  @return int<0,max>				0 or nb of top menu entries if $mode = 'topnb'
 	 */
 	public function showmenu($mode, $moredata = null)
 	{

From df992477be752c137e09a3ff9b5455292972c7fd Mon Sep 17 00:00:00 2001
From: atm-florian <florian.mortgat@atm-consulting.fr>
Date: Tue, 14 Jan 2025 14:34:09 +0100
Subject: [PATCH 105/243] Apply suggestion by @mdeweerd to ensure pre-commit
 will pass.

---
 .../DataCollector/PDO/TraceablePDO.php        | 88 +++++++++++--------
 1 file changed, 49 insertions(+), 39 deletions(-)

diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDO.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDO.php
index e448a794ad3..753964a343c 100644
--- a/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDO.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDO.php
@@ -23,13 +23,13 @@ class TraceablePDO extends PDO
         $this->pdo->setAttribute(PDO::ATTR_STATEMENT_CLASS, [TraceablePDOStatement::class, [$this]]);
     }
 
-	/**
-	 * Initiates a transaction
-         *
-	 * @link   http://php.net/manual/en/pdo.begintransaction.php
-	 * @return bool TRUE on success or FALSE on failure.
-	 */
-    public function beginTransaction()
+   /**
+    * Initiates a transaction
+    *
+    * @link   http://php.net/manual/en/pdo.begintransaction.php
+    * @return bool TRUE on success or FALSE on failure.
+    */
+    public function beginTransaction() : bool
     {
         return $this->pdo->beginTransaction();
     }
@@ -40,7 +40,7 @@ class TraceablePDO extends PDO
      * @link   http://php.net/manual/en/pdo.commit.php
      * @return bool TRUE on success or FALSE on failure.
      */
-    public function commit()
+    public function commit() : bool
     {
         return $this->pdo->commit();
     }
@@ -51,6 +51,7 @@ class TraceablePDO extends PDO
      * @link   http://php.net/manual/en/pdo.errorinfo.php
      * @return array PDO::errorInfo returns an array of error information
      */
+    #[\ReturnTypeWillChange]
     public function errorCode()
     {
         return $this->pdo->errorCode();
@@ -62,7 +63,7 @@ class TraceablePDO extends PDO
      * @link   http://php.net/manual/en/pdo.errorinfo.php
      * @return array PDO::errorInfo returns an array of error information
      */
-    public function errorInfo()
+    public function errorInfo() : array
     {
         return $this->pdo->errorInfo();
     }
@@ -77,6 +78,7 @@ class TraceablePDO extends PDO
      * return Boolean FALSE, but may also return a non-Boolean value which evaluates to FALSE.
      * Please read the section on Booleans for more information
      */
+    #[\ReturnTypeWillChange]
     public function exec($statement)
     {
         return $this->profileCall('exec', $statement, func_get_args());
@@ -90,6 +92,7 @@ class TraceablePDO extends PDO
      * @return mixed A successful call returns the value of the requested PDO attribute.
      * An unsuccessful call returns null.
      */
+    #[\ReturnTypeWillChange]
     public function getAttribute($attribute)
     {
         return $this->pdo->getAttribute($attribute);
@@ -101,7 +104,7 @@ class TraceablePDO extends PDO
      * @link   http://php.net/manual/en/pdo.intransaction.php
      * @return bool TRUE if a transaction is currently active, and FALSE if not.
      */
-    public function inTransaction()
+    public function inTransaction() : bool
     {
         return $this->pdo->inTransaction();
     }
@@ -114,36 +117,41 @@ class TraceablePDO extends PDO
      * @return string If a sequence name was not specified for the name parameter, PDO::lastInsertId
      * returns a string representing the row ID of the last row that was inserted into the database.
      */
+    #[\ReturnTypeWillChange]
     public function lastInsertId($name = null)
     {
         return $this->pdo->lastInsertId($name);
     }
 
-	/**
-	 * Prepares a statement for execution and returns a statement object
-   *
-	 * @link   http://php.net/manual/en/pdo.prepare.php
-	 * @param  string $statement This must be a valid SQL statement template for the target DB server.
-	 * @param  array  $driver_options [optional] This array holds one or more key=&gt;value pairs to
-	 * set attribute values for the PDOStatement object that this method returns.
-	 * @return TraceablePDOStatement|bool If the database server successfully prepares the statement,
-   * PDO::prepare returns a PDOStatement object. If the database server cannot successfully prepare
-   * the statement, PDO::prepare returns FALSE or emits PDOException (depending on error handling).
-	 */
+    /**
+     * Prepares a statement for execution and returns a statement object
+     *
+     * @link   http://php.net/manual/en/pdo.prepare.php
+     * @param  string $statement This must be a valid SQL statement template for the target DB server.
+     * @param  array  $driver_options [optional] This array holds one or more key=&gt;value pairs to
+     * set attribute values for the PDOStatement object that this method returns.
+     * @return TraceablePDOStatement|bool If the database server successfully prepares the statement,
+     * PDO::prepare returns a PDOStatement object. If the database server cannot successfully prepare
+     * the statement, PDO::prepare returns FALSE or emits PDOException (depending on error handling).
+     */
+    #[\ReturnTypeWillChange]
     public function prepare($statement, $driver_options = [])
     {
         return $this->pdo->prepare($statement, $driver_options);
     }
 
-	/**
-	 * Executes an SQL statement, returning a result set as a PDOStatement object
-   *
-	 * @link   http://php.net/manual/en/pdo.query.php
-	 * @param  string $statement
-	 * @return TraceablePDOStatement|bool PDO::query returns a PDOStatement object, or FALSE on
-   * failure.
-   */
-    public function query($statement)
+    /**
+     * Executes an SQL statement, returning a result set as a PDOStatement object
+     *
+     * @link   http://php.net/manual/en/pdo.query.php
+     * @param  string $statement
+     * @param  int $fetchMode
+     * @param  mixed ...$fetchModeArgs
+     * @return TraceablePDOStatement|bool PDO::query returns a PDOStatement object, or FALSE on
+     * failure.
+     */
+    #[\ReturnTypeWillChange]
+    public function query($statement, $fetchMode = null, ...$fetchModeArgs)
     {
         return $this->profileCall('query', $statement, func_get_args());
     }
@@ -158,6 +166,7 @@ class TraceablePDO extends PDO
      * @return string|bool A quoted string that is theoretically safe to pass into an SQL statement.
      * Returns FALSE if the driver does not support quoting in this way.
      */
+    #[\ReturnTypeWillChange]
     public function quote($string, $parameter_type = PDO::PARAM_STR)
     {
         return $this->pdo->quote($string, $parameter_type);
@@ -169,7 +178,7 @@ class TraceablePDO extends PDO
      * @link   http://php.net/manual/en/pdo.rollback.php
      * @return bool TRUE on success or FALSE on failure.
      */
-    public function rollBack()
+    public function rollBack() : bool
     {
         return $this->pdo->rollBack();
     }
@@ -182,7 +191,7 @@ class TraceablePDO extends PDO
      * @param  mixed $value
      * @return bool TRUE on success or FALSE on failure.
      */
-    public function setAttribute($attribute, $value)
+    public function setAttribute($attribute, $value) : bool
     {
         return $this->pdo->setAttribute($attribute, $value);
     }
@@ -195,6 +204,7 @@ class TraceablePDO extends PDO
      * @param  array  $args
      * @return mixed  The result of the call
      */
+    #[\ReturnTypeWillChange]
     protected function profileCall($method, $sql, array $args)
     {
         $trace = new TracedStatement($sql);
@@ -226,7 +236,7 @@ class TraceablePDO extends PDO
      *
      * @param TracedStatement $stmt
      */
-    public function addExecutedStatement(TracedStatement $stmt)
+    public function addExecutedStatement(TracedStatement $stmt) : void
     {
         $this->executedStatements[] = $stmt;
     }
@@ -234,9 +244,9 @@ class TraceablePDO extends PDO
     /**
      * Returns the accumulated execution time of statements
      *
-     * @return int
+     * @return float
      */
-    public function getAccumulatedStatementsDuration()
+    public function getAccumulatedStatementsDuration() : float
     {
         return array_reduce($this->executedStatements, function ($v, $s) { return $v + $s->getDuration(); });
     }
@@ -246,7 +256,7 @@ class TraceablePDO extends PDO
      *
      * @return int
      */
-    public function getMemoryUsage()
+    public function getMemoryUsage() : int
     {
         return array_reduce($this->executedStatements, function ($v, $s) { return $v + $s->getMemoryUsage(); });
     }
@@ -256,7 +266,7 @@ class TraceablePDO extends PDO
      *
      * @return int
      */
-    public function getPeakMemoryUsage()
+    public function getPeakMemoryUsage() : int
     {
         return array_reduce($this->executedStatements, function ($v, $s) { $m = $s->getEndMemory(); return $m > $v ? $m : $v; });
     }
@@ -266,7 +276,7 @@ class TraceablePDO extends PDO
      *
      * @return TracedStatement[]
      */
-    public function getExecutedStatements()
+    public function getExecutedStatements() : array
     {
         return $this->executedStatements;
     }
@@ -276,7 +286,7 @@ class TraceablePDO extends PDO
      *
      * @return TracedStatement[]
      */
-    public function getFailedExecutedStatements()
+    public function getFailedExecutedStatements() : array
     {
         return array_filter($this->executedStatements, function ($s) { return !$s->isSuccess(); });
     }

From 79ed9c7e370cec7000434bcc7c6fdfccc4d55d40 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 14 Jan 2025 16:08:40 +0100
Subject: [PATCH 106/243] fix: add entity in where for fetch when fetch by ref

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

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 8af62d14736..32dc9b9a25b 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -619,6 +619,7 @@ class ExpenseReport extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d";
 		if ($ref) {
 			$sql .= " WHERE d.ref = '".$this->db->escape($ref)."'";
+			$sql .= " WHERE d.entity IN (".getEntity('expensereport').")";
 		} else {
 			$sql .= " WHERE d.rowid = ".((int) $id);
 		}

From 9af7eaf08ccae30b58c010754db5f5b89e9ea3f0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 14 Jan 2025 15:32:08 +0100
Subject: [PATCH 107/243] Use PHP version from check.php

---
 .github/workflows/pre-commit.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 1ae4d3387f8..973b2ddbc13 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -62,6 +62,12 @@ jobs:
       #     files: |
       #        **.php
 
+      - name: Extract PHP version
+        id: extract-php-version
+        run: |
+          PHP_VERSION=$(sed -n 's/.*\$arrayphpmaxversionwarning\s*=\s*array\s*(\s*\([0-9]\+\)\s*,\s*\([0-9]\+\).*/\1.\2/p' htdocs/install/check.php)
+          echo "PHP_VERSION=$PHP_VERSION" >> $GITHUB_ENV
+
       - name: Setup PHPCS
         uses: shivammathur/setup-php@v2
         # Install when we're going to run phpcs
@@ -76,7 +82,7 @@ jobs:
             )
           )
         with:
-          php-version: 8.1
+          php-version: ${{ env.PHP_VERSION }}  # Version from check.php
           coverage: none # disable xdebug, pcov
           tools: phpcs
 

From 7869e45954684977b0104d3ac6ade8293c52e919 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 14 Jan 2025 15:39:05 +0100
Subject: [PATCH 108/243] Move installation of php before pre-commit run

---
 .github/workflows/pre-commit.yml | 39 ++++++++++++++++----------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 973b2ddbc13..d83f237e09c 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -42,25 +42,6 @@ jobs:
         with:
           path: ~/.cache/pre-commit/
           key: pre-commit-4|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
-      # Run all the precommit tools (defined into pre-commit-config.yaml).
-      # We can force exclusion of some of them here.
-      - name: Run pre-commit hooks
-        env:
-          # SKIP is used by pre-commit to not execute certain hooks
-          SKIP: no-commit-to-branch,php-cs,php-cbf,trailing-whitespace,end-of-file-fixer,check-json,check-executables-have-shebangs,check-shebang-scripts-are-executable,beautysh,yamllint,shellcheck
-        run: |
-          set -o pipefail
-          pre-commit gc
-          pre-commit run --show-diff-on-failure --color=always --all-files | tee ${RAW_LOG}
-
-      # The next uses git, which is slow for a bit repo.
-      # - name: Get all changed php files (if PR)
-      #   id: changed-php
-      #   uses: tj-actions/changed-files@v42
-      #   if: github.event_name == 'pull_request'
-      #   with:
-      #     files: |
-      #        **.php
 
       - name: Extract PHP version
         id: extract-php-version
@@ -86,6 +67,26 @@ jobs:
           coverage: none # disable xdebug, pcov
           tools: phpcs
 
+      # Run all the precommit tools (defined into pre-commit-config.yaml).
+      # We can force exclusion of some of them here.
+      - name: Run pre-commit hooks
+        env:
+          # SKIP is used by pre-commit to not execute certain hooks
+          SKIP: no-commit-to-branch,php-cs,php-cbf,trailing-whitespace,end-of-file-fixer,check-json,check-executables-have-shebangs,check-shebang-scripts-are-executable,beautysh,yamllint,shellcheck
+        run: |
+          set -o pipefail
+          pre-commit gc
+          pre-commit run --show-diff-on-failure --color=always --all-files | tee ${RAW_LOG}
+
+      # The next uses git, which is slow for a bit repo.
+      # - name: Get all changed php files (if PR)
+      #   id: changed-php
+      #   uses: tj-actions/changed-files@v42
+      #   if: github.event_name == 'pull_request'
+      #   with:
+      #     files: |
+      #        **.php
+
       - name: Run some pre-commit hooks on selected changed files only
         if: steps.changed-php.outputs.any_changed == 'true'
         env:

From 20f2293c013f27c29f557364148135e9ad0528ab Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 14 Jan 2025 15:43:55 +0100
Subject: [PATCH 109/243] Always install expected php version

---
 .github/workflows/pre-commit.yml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index d83f237e09c..ddf13c8a070 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -51,17 +51,7 @@ jobs:
 
       - name: Setup PHPCS
         uses: shivammathur/setup-php@v2
-        # Install when we're going to run phpcs
-        if: |
-          steps.changed-php.outputs.any_changed == 'true'
-          ||
-          (
-            github.event_name == 'push'
-            && (
-                 github.event.ref == 'refs/heads/develop'
-               || endsWith(github.event.ref, '.0')
-            )
-          )
+        # Install proper php version, and also install phpcs which may be needed
         with:
           php-version: ${{ env.PHP_VERSION }}  # Version from check.php
           coverage: none # disable xdebug, pcov

From a34eaa07ed7a7491c82ddb92246c429487ccdf85 Mon Sep 17 00:00:00 2001
From: Irvine Fleith <irvine.fleith@atm-consulting.fr>
Date: Tue, 14 Jan 2025 16:19:52 +0100
Subject: [PATCH 110/243] fix(services-list): search thirdparty by name

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

diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 21f49ebc789..7b75c4aa9d3 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -281,7 +281,7 @@ if ($filter == "notexpired") {
 	$sql .= " AND cd.date_fin_validite >= '".$db->idate($now)."'";
 }
 if ($search_name) {
-	$sql .= natural_search("c.ref", $search_name);
+	$sql .= natural_search("s.nom", $search_name);
 }
 if ($search_contract) {
 	$sql .= natural_search("c.ref", $search_contract);

From 24c482b1505356b5a755eb604185b9dc9722e59e Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 14 Jan 2025 16:51:03 +0100
Subject: [PATCH 111/243] css

---
 htdocs/compta/facture/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index a17d7309b15..238121bb533 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1415,7 +1415,7 @@ if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 }
 // Ref
 if (!empty($arrayfields['f.ref']['checked'])) {
-	print '<td class="liste_titre" align="left">';
+	print '<td class="liste_titre">';
 	print '<input class="flat maxwidth50imp" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 	print '</td>';
 }
@@ -1439,7 +1439,7 @@ if (!empty($arrayfields['f.type']['checked'])) {
 	}
 	//$listtype[Facture::TYPE_PROFORMA]=$langs->trans("InvoiceProForma");     // A proformat invoice is not an invoice but must be an order.
 	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
-	print $form->selectarray('search_type', $listtype, $search_type, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
+	print $form->selectarray('search_type', $listtype, $search_type, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth75');
 	print '</td>';
 }
 // Invoice Subtype
@@ -2505,7 +2505,7 @@ if ($num > 0) {
 
 			// Author
 			if (!empty($arrayfields['u.login']['checked'])) {
-				print '<td class="tdoverflowmax200">';
+				print '<td class="tdoverflowmax125">';
 				if ($userstatic->id) {
 					print $userstatic->getNomUrl(-1);
 				} else {

From 800d16bc187715fde158bdab5cd7d71e9520417e Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 14 Jan 2025 16:57:14 +0100
Subject: [PATCH 112/243] Doc

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

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 030713957a3..31297131479 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -103,7 +103,7 @@ class DolEditor
 	 *  @param 	string				$toolbarname	       		 	Name of the toolbar set to use ('dolibarr_details[_encoded]'=the less featured, 'dolibarr_notes[_encoded]' for notes content, 'dolibarr_mailings[_encoded]' for emailing content, 'dolibarr_readonly').
 	 *  @param  string				$toolbarlocation       			Deprecated. Not used
 	 *  @param  bool				$toolbarstartexpanded  			Bar is visible or not at start
-	 *  @param	bool|int			$uselocalbrowser				Enabled to add links to local object with a local media filemanager. If false, only external images URL can be added into content, or images saved inline with src="data:..." with a cut/paste.
+	 *  @param	bool|int			$uselocalbrowser				Enabled to add links to local object with a local media filemanager. -1=auto, false=only external images URL can be added into content, or images saved inline with src="data:..." with a cut/paste.
 	 *  @param  bool|int|string		$okforextendededitor    		1 or True=Allow usage of extended editor tool if qualified (like ckeditor). If 'textarea', force use of simple textarea. If 'ace', force use of Ace.
 	 *                          	                        		Warning: If you use 'ace', don't forget to also include ace.js in page header. Also, the button "save" must have class="buttonforacesave".
 	 *  @param  int					$rows                   		Size of rows for textarea tool

From 258411e8707c29935e232b837a8babfe0523d5f1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 14 Jan 2025 22:05:08 +0100
Subject: [PATCH 113/243] Debug v21

---
 htdocs/commande/class/commande.class.php |  4 ++--
 htdocs/core/customreports.php            | 11 ++++++-----
 htdocs/core/lib/customreports.lib.php    | 10 ++++++++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index a7f395116b0..630e9fab8d7 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -336,7 +336,7 @@ class Commande extends CommonOrder
 		'fk_mode_reglement' => array('type' => 'integer', 'label' => 'PaymentMode', 'enabled' => 1, 'visible' => -1, 'position' => 185),
 		'date_livraison' => array('type' => 'date', 'label' => 'DateDeliveryPlanned', 'enabled' => 1, 'visible' => -1, 'position' => 190, 'csslist' => 'nowraponall'),
 		'fk_shipping_method' => array('type' => 'integer', 'label' => 'ShippingMethod', 'enabled' => 1, 'visible' => -1, 'position' => 195),
-		'fk_warehouse' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Fk warehouse', 'enabled' => 'isModEnabled("stock")', 'visible' => -1, 'position' => 200),
+		'fk_warehouse' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'DefaultWarehouse', 'enabled' => 'isModEnabled("stock")', 'visible' => -1, 'position' => 200, 'nodepth' => 1),
 		'fk_availability' => array('type' => 'integer', 'label' => 'Availability', 'enabled' => 1, 'visible' => -1, 'position' => 205),
 		'fk_input_reason' => array('type' => 'integer', 'label' => 'InputReason', 'enabled' => 1, 'visible' => -1, 'position' => 210),
 		//'fk_delivery_address' =>array('type'=>'integer', 'label'=>'DeliveryAddress', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
@@ -856,7 +856,7 @@ class Commande extends CommonOrder
 	 */
 	public function cancel($idwarehouse = -1)
 	{
-		global $conf, $user, $langs;
+		global $user, $langs;
 
 		$error = 0;
 
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 59a9f25598c..f0f1cd22712 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -32,7 +32,7 @@
  * include DOL_DOCUMENT_ROOT.'/core/customreports.php';
  */
 
- /**
+/**
  * @var Conf $conf
  * @var DoliDB $db
  * @var HookManager $hookmanager
@@ -322,6 +322,7 @@ $HH = substr($langs->trans("Hour"), 0, 1).substr($langs->trans("Hour"), 0, 1);
 $MI = substr($langs->trans("Minute"), 0, 1).substr($langs->trans("Minute"), 0, 1);
 $SS = substr($langs->trans("Second"), 0, 1).substr($langs->trans("Second"), 0, 1);
 
+$arrayoffilterfields = array();
 $arrayofmesures = array();
 $arrayofxaxis = array();
 $arrayofgroupby = array();
@@ -375,6 +376,10 @@ foreach ($arrayoftype as $key => $val) {
 	}
 }
 
+$count = 0;
+$arrayoffilterfields = fillArrayOfFilterFields($object, 't', $langs->trans($newarrayoftype[$objecttype]['label']), $arrayoffilterfields, 0, $count);
+$arrayoffilterfields = dol_sort_array($arrayoffilterfields, 'position', 'asc', 0, 0, 1);
+
 $count = 0;
 $arrayofmesures = fillArrayOfMeasures($object, 't', $langs->trans($newarrayoftype[$objecttype]['label']), $arrayofmesures, 0, $count);
 $arrayofmesures = dol_sort_array($arrayofmesures, 'position', 'asc', 0, 0, 1);
@@ -387,10 +392,6 @@ $count = 0;
 $arrayofgroupby = fillArrayOfGroupBy($object, 't', $langs->trans($newarrayoftype[$objecttype]['label']), $arrayofgroupby, 0, $count);
 $arrayofgroupby = dol_sort_array($arrayofgroupby, 'position', 'asc', 0, 0, 1);
 
-$count = 0;
-$arrayoffilterfields = fillArrayOfFilterFields($object, 't', $langs->trans($newarrayoftype[$objecttype]['label']), $arrayoffilterfields, 0, $count);
-$arrayoffilterfields = dol_sort_array($arrayoffilterfields, 'position', 'asc', 0, 0, 1);
-
 
 // Check parameters
 if ($action == 'viewgraph') {
diff --git a/htdocs/core/lib/customreports.lib.php b/htdocs/core/lib/customreports.lib.php
index 553e3f3681b..574faafeabb 100644
--- a/htdocs/core/lib/customreports.lib.php
+++ b/htdocs/core/lib/customreports.lib.php
@@ -523,10 +523,12 @@ function fillArrayOfFilterFields($object, $tablealias, $labelofobject, &$arrayof
 {
 	global $langs, $extrafields, $db;
 
+	$MAXLEVEL = 2;
+
 	if (empty($object)) {	// Protection against bad use of method
 		return array();
 	}
-	if ($level >= 3) {	// Limit scan on 2 levels max
+	if ($level > $MAXLEVEL) {	// Limit scan on 2 levels max
 		return $arrayoffields;
 	}
 
@@ -612,7 +614,11 @@ function fillArrayOfFilterFields($object, $tablealias, $labelofobject, &$arrayof
 				if (class_exists($newobject)) {
 					$tmpobject = new $newobject($db);
 					$count++;
-					$arrayoffields = fillArrayOfFilterFields($tmpobject, $tablealias.'__'.$key, $langs->trans($val['label']), $arrayoffields, $level + 1, $count, $tablepath);
+					if (!empty($val['nodepth'])) {
+						$arrayoffields = fillArrayOfFilterFields($tmpobject, $tablealias.'__'.$key, $langs->trans($val['label']), $arrayoffields, $MAXLEVEL, $count, $tablepath);
+					} else {
+						$arrayoffields = fillArrayOfFilterFields($tmpobject, $tablealias.'__'.$key, $langs->trans($val['label']), $arrayoffields, $level + 1, $count, $tablepath);
+					}
 				} else {
 					print 'For property '.$object->element.'->'.$key.', type="'.$val['type'].'": Failed to find class '.$newobject." in file ".$tmptype[2]."<br>\n";
 				}

From 9587403e0abc8d78b5f605823489b73d1897573b Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Tue, 14 Jan 2025 22:16:34 +0100
Subject: [PATCH 114/243] add a hook on vat rate

---
 htdocs/core/class/html.form.class.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 29de7398bac..ede456909d5 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6906,11 +6906,28 @@ class Form
 	public function load_tva($htmlname = 'tauxtva', $selectedrate = '', $societe_vendeuse = null, $societe_acheteuse = null, $idprod = 0, $info_bits = 0, $type = '', $options_only = false, $mode = 0, $type_vat = 0)
 	{
 		// phpcs:enable
-		global $langs, $mysoc;
+		global $langs, $mysoc, $hookmanager;
 
 		$langs->load('errors');
 
 		$return = '';
+		// Bypass the default method
+		$hookmanager->initHooks(array('commonobject'));
+		$info_bits == 1 ? $is_npr = 1 : $is_npr = 0;
+		$parameters = array(
+			'seller' => $societe_vendeuse,
+			'buyer' => $societe_acheteuse,
+			'idprod' => $idprod,
+			'is_npr' => $is_npr,
+			'type' => $type,
+			'options_only' => $options_only,
+			'mode' => $mode,
+			'type_vat' => $type_vat
+		);
+		$reshook = $hookmanager->executeHooks('load_tva', $parameters);
+		if ($reshook > 0) {
+			return $hookmanager->resPrint;
+		}
 
 		// Define defaultnpr, defaultttx and defaultcode
 		$defaultnpr = ($info_bits & 0x01);

From 01be602fb19ec73984056593b008354526c7b057 Mon Sep 17 00:00:00 2001
From: Quentin VIAL--GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Wed, 15 Jan 2025 08:42:14 +0100
Subject: [PATCH 115/243] FIX Issue 32460 db prefix module builder

---
 .../modules/mailings/modules_mailings.php     | 22 +++++++++----------
 htdocs/modulebuilder/template/admin/setup.php |  2 +-
 .../template/class/api_mymodule.class.php     |  8 +++----
 .../template/class/myobject.class.php         |  8 +++----
 .../mailing_mymodule_selector1.modules.php    |  4 ++--
 .../core/modules/modMyModule.class.php        | 18 +++++++--------
 .../mymodule/mod_myobject_standard.php        |  4 ++--
 .../modulebuilder/template/mymoduleindex.php  |  6 ++---
 .../modulebuilder/template/myobject_list.php  | 10 ++++-----
 .../template/scripts/mymodule.php             |  2 +-
 10 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index e45bd655ef3..9605cbe9019 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -169,14 +169,14 @@ class MailingTargets // This can't be abstract as it is used for some method
 	{
 		// phpcs:enable
 		// Mise a jour nombre de destinataire dans table des mailings
-		$sql = "SELECT COUNT(*) nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
+		$sql = "SELECT COUNT(*) nb FROM ".$this->db->prefix()."mailing_cibles";
 		$sql .= " WHERE fk_mailing = ".((int) $mailing_id);
 		$result = $this->db->query($sql);
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
 			$nb = $obj->nb;
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."mailing";
+			$sql = "UPDATE ".$this->db->prefix()."mailing";
 			$sql .= " SET nbemail = ".((int) $nb)." WHERE rowid = ".((int) $mailing_id);
 			if (!$this->db->query($sql)) {
 				dol_syslog($this->db->error());
@@ -208,7 +208,7 @@ class MailingTargets // This can't be abstract as it is used for some method
 		$num = count($cibles);
 		foreach ($cibles as $targetarray) {
 			if (!empty($targetarray['email'])) { // avoid empty email address
-				$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_cibles";
+				$sql = "INSERT INTO ".$this->db->prefix()."mailing_cibles";
 				$sql .= " (fk_mailing,";
 				$sql .= " fk_contact,";
 				$sql .= " lastname, firstname, email, other, source_url, source_id,";
@@ -244,27 +244,27 @@ class MailingTargets // This can't be abstract as it is used for some method
 
 		/*
 		//Update the status to show thirdparty mail that don't want to be contacted anymore'
-		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+		$sql = "UPDATE ".$this->db->prefix()."mailing_cibles";
 		$sql .= " SET statut=3";
-		$sql .= " WHERE fk_mailing = ".((int) $mailing_id)." AND email in (SELECT email FROM ".MAIN_DB_PREFIX."societe where fk_stcomm=-1)";
+		$sql .= " WHERE fk_mailing = ".((int) $mailing_id)." AND email in (SELECT email FROM ".$this->db->prefix()."societe where fk_stcomm=-1)";
 		$sql .= " AND source_type='thirdparty'";
 		dol_syslog(__METHOD__.": mailing update status to display thirdparty mail that do not want to be contacted");
 		$result=$this->db->query($sql);
 
 		//Update the status to show contact mail that don't want to be contacted anymore'
-		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+		$sql = "UPDATE ".$this->db->prefix()."mailing_cibles";
 		$sql .= " SET statut=3";
-		$sql .= " WHERE fk_mailing = ".((int) $mailing_id)." AND source_type='contact' AND (email in (SELECT sc.email FROM ".MAIN_DB_PREFIX."socpeople AS sc ";
-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe s ON s.rowid=sc.fk_soc WHERE s.fk_stcomm=-1 OR no_email=1))";
+		$sql .= " WHERE fk_mailing = ".((int) $mailing_id)." AND source_type='contact' AND (email in (SELECT sc.email FROM ".$this->db->prefix()."socpeople AS sc ";
+		$sql .= " INNER JOIN ".$this->db->prefix()."societe s ON s.rowid=sc.fk_soc WHERE s.fk_stcomm=-1 OR no_email=1))";
 		dol_syslog(__METHOD__.": mailing update status to display contact mail that do not want to be contacted",LOG_DEBUG);
 		$result=$this->db->query($sql);
 		*/
 
 		if (empty($this->evenunsubscribe)) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles as mc";
+			$sql = "UPDATE ".$this->db->prefix()."mailing_cibles as mc";
 			$sql .= " SET mc.statut = 3";
 			$sql .= " WHERE mc.fk_mailing = ".((int) $mailing_id);
-			$sql .= " AND EXISTS (SELECT rowid FROM ".MAIN_DB_PREFIX."mailing_unsubscribe as mu WHERE mu.email = mc.email and mu.entity = ".((int) $conf->entity).")";
+			$sql .= " AND EXISTS (SELECT rowid FROM ".$this->db->prefix()."mailing_unsubscribe as mu WHERE mu.email = mc.email and mu.entity = ".((int) $conf->entity).")";
 
 			dol_syslog(__METHOD__.":mailing update status to display emails that do not want to be contacted anymore", LOG_DEBUG);
 			$result = $this->db->query($sql);
@@ -291,7 +291,7 @@ class MailingTargets // This can't be abstract as it is used for some method
 	public function clear_target($mailing_id)
 	{
 		// phpcs:enable
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles";
+		$sql = "DELETE FROM ".$this->db->prefix()."mailing_cibles";
 		$sql .= " WHERE fk_mailing = ".((int) $mailing_id);
 
 		if (!$this->db->query($sql)) {
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index d7d87fe8f1e..306a28aa5b9 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -478,7 +478,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		// Load array def with activated templates
 		$def = array();
 		$sql = "SELECT nom";
-		$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+		$sql .= " FROM ".$db->prefix()."document_model";
 		$sql .= " WHERE type = '".$db->escape($type)."'";
 		$sql .= " AND entity = ".$conf->entity;
 		$resql = $db->query($sql);
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index 14b89da504c..e67def67c0c 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -136,8 +136,8 @@ class MyModuleApi extends DolibarrApi
 		}
 
 		$sql = "SELECT t.rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$tmpobject->table_element." AS t";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$tmpobject->table_element."_extrafields AS ef ON (ef.fk_object = t.rowid)"; // Modification VMR Global Solutions to include extrafields as search parameters in the API GET call, so we will be able to filter on extrafields
+		$sql .= " FROM ".$this->db->prefix().$tmpobject->table_element." AS t";
+		$sql .= " LEFT JOIN ".$this->db->prefix().$tmpobject->table_element."_extrafields AS ef ON (ef.fk_object = t.rowid)"; // Modification VMR Global Solutions to include extrafields as search parameters in the API GET call, so we will be able to filter on extrafields
 		$sql .= " WHERE 1 = 1";
 		if ($tmpobject->ismultientitymanaged) {
 			$sql .= ' AND t.entity IN ('.getEntity($tmpobject->element).')';
@@ -148,9 +148,9 @@ class MyModuleApi extends DolibarrApi
 		// Search on sale representative
 		if ($search_sale && $search_sale != '-1') {
 			if ($search_sale == -2) {
-				$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = t.fk_soc)";
+				$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".$this->db->prefix()."societe_commerciaux as sc WHERE sc.fk_soc = t.fk_soc)";
 			} elseif ($search_sale > 0) {
-				$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = t.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+				$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".$this->db->prefix()."societe_commerciaux as sc WHERE sc.fk_soc = t.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
 			}
 		}
 		if ($sqlfilters) {
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index f9251809d17..7c43d256d17 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -587,7 +587,7 @@ class MyObject extends CommonObject
 
 		if (!empty($num)) {
 			// Validate
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql = "UPDATE ".$this->db->prefix().$this->table_element;
 			$sql .= " SET ";
 			if (!empty($this->fields['ref'])) {
 				$sql .= " ref = '".$this->db->escape($num)."',";
@@ -625,14 +625,14 @@ class MyObject extends CommonObject
 			// Rename directory if dir was a temporary ref
 			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
 				// Now we rename also files into index
-				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'myobject/".$this->db->escape($this->newref)."'";
+				$sql = 'UPDATE '.$this->db->prefix()."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'myobject/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'myobject/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$error++;
 					$this->error = $this->db->lasterror();
 				}
-				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'myobject/".$this->db->escape($this->newref)."'";
+				$sql = 'UPDATE '.$this->db->prefix()."ecm_files set filepath = 'myobject/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'myobject/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
@@ -1026,7 +1026,7 @@ class MyObject extends CommonObject
 		if (!empty($this->fields['fk_user_valid'])) {
 			$sql .= ", fk_user_valid";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
 		$sql .= " WHERE t.rowid = ".((int) $id);
 
 		$result = $this->db->query($sql);
diff --git a/htdocs/modulebuilder/template/core/modules/mailings/mailing_mymodule_selector1.modules.php b/htdocs/modulebuilder/template/core/modules/mailings/mailing_mymodule_selector1.modules.php
index a14f339306b..b55fa3e6fe3 100644
--- a/htdocs/modulebuilder/template/core/modules/mailings/mailing_mymodule_selector1.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mailings/mailing_mymodule_selector1.modules.php
@@ -111,7 +111,7 @@ class mailing_mailing_mymodule_selector1 extends MailingTargets
 		$j = 0;
 
 		$sql = "SELECT rowid as id, firstname, lastname, email";
-		$sql .= " FROM ".MAIN_DB_PREFIX."myobject";
+		$sql .= " FROM ".$this->db->prefix()."myobject";
 		$sql .= " WHERE email IS NOT NULL AND email <> ''";
 		if (GETPOSTISSET('filter') && GETPOST('filter', 'alphanohtml') != 'none') {
 			$sql .= " AND status = '".$this->db->escape(GETPOST('filter', 'alphanohtml'))."'";
@@ -195,7 +195,7 @@ class mailing_mailing_mymodule_selector1 extends MailingTargets
 	public function getNbOfRecipients($sql = '')
 	{
 		$sql = "SELECT COUNT(DISTINCT(email)) as nb";
-		$sql .= " FROM ".MAIN_DB_PREFIX."myobject as p";
+		$sql .= " FROM ".$this->db->prefix()."myobject as p";
 		$sql .= " WHERE email IS NOT NULL AND email <> ''";
 
 		$a = parent::getNbOfRecipients($sql);
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 9a0e0829972..2a894544b8e 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -228,7 +228,7 @@ class modMyModule extends DolibarrModules
 		 // Label of tables
 		 'tablib' => array("Table1", "Table2", "Table3"),
 		 // Request to select fields
-		 'tabsql' => array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
+		 'tabsql' => array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.$this->db->prefix().'table1 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.$this->db->prefix().'table2 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.$this->db->prefix().'table3 as f'),
 		 // Sort order
 		 'tabsqlsort' => array("label ASC", "label ASC", "label ASC"),
 		 // List of fields (result of select to show dictionary)
@@ -411,8 +411,8 @@ class modMyModule extends DolibarrModules
 		//$this->export_examplevalues_array[$r] = array('t.field' => 'Example');
 		//$this->export_help_array[$r] = array('t.field' => 'FieldDescHelp');
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'mymodule_myobject as t';
-		//$this->export_sql_end[$r]  .=' LEFT JOIN '.MAIN_DB_PREFIX.'mymodule_myobject_line as tl ON tl.fk_myobject = t.rowid';
+		$this->export_sql_end[$r]  =' FROM '.$this->db->prefix().'mymodule_myobject as t';
+		//$this->export_sql_end[$r]  .=' LEFT JOIN '.$this->db->prefix().'mymodule_myobject_line as tl ON tl.fk_myobject = t.rowid';
 		$this->export_sql_end[$r] .=' WHERE 1 = 1';
 		$this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('myobject').')';
 		$r++; */
@@ -426,7 +426,7 @@ class modMyModule extends DolibarrModules
 		$this->import_code[$r] = $this->rights_class.'_'.$r;
 		$this->import_label[$r] = 'MyObjectLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->import_icon[$r] = $this->picto;
-		$this->import_tables_array[$r] = array('t' => MAIN_DB_PREFIX.'mymodule_myobject', 'extra' => MAIN_DB_PREFIX.'mymodule_myobject_extrafields');
+		$this->import_tables_array[$r] = array('t' => $this->db->prefix().'mymodule_myobject', 'extra' => $this->db->prefix().'mymodule_myobject_extrafields');
 		$this->import_tables_creator_array[$r] = array('t' => 'fk_user_author'); // Fields to store import user id
 		$import_sample = array();
 		$keyforclass = 'MyObject'; $keyforclassfile='/mymodule/class/myobject.class.php'; $keyforelement='myobject@mymodule';
@@ -434,7 +434,7 @@ class modMyModule extends DolibarrModules
 		$import_extrafield_sample = array();
 		$keyforselect='myobject'; $keyforaliasextra='extra'; $keyforelement='myobject@mymodule';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinimport.inc.php';
-		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'mymodule_myobject');
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.$this->db->prefix().'mymodule_myobject');
 		$this->import_regex_array[$r] = array();
 		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
 		$this->import_updatekeys_array[$r] = array('t.ref' => 'Ref');
@@ -512,10 +512,10 @@ class modMyModule extends DolibarrModules
 				}
 
 				$sql = array_merge($sql, array(
-					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard_".strtolower($myTmpObjectKey)."' AND type = '".$this->db->escape(strtolower($myTmpObjectKey))."' AND entity = ".((int) $conf->entity),
-					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard_".strtolower($myTmpObjectKey)."', '".$this->db->escape(strtolower($myTmpObjectKey))."', ".((int) $conf->entity).")",
-					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'generic_".strtolower($myTmpObjectKey)."_odt' AND type = '".$this->db->escape(strtolower($myTmpObjectKey))."' AND entity = ".((int) $conf->entity),
-					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('generic_".strtolower($myTmpObjectKey)."_odt', '".$this->db->escape(strtolower($myTmpObjectKey))."', ".((int) $conf->entity).")"
+					"DELETE FROM ".$this->db->prefix()."document_model WHERE nom = 'standard_".strtolower($myTmpObjectKey)."' AND type = '".$this->db->escape(strtolower($myTmpObjectKey))."' AND entity = ".((int) $conf->entity),
+					"INSERT INTO ".$this->db->prefix()."document_model (nom, type, entity) VALUES('standard_".strtolower($myTmpObjectKey)."', '".$this->db->escape(strtolower($myTmpObjectKey))."', ".((int) $conf->entity).")",
+					"DELETE FROM ".$this->db->prefix()."document_model WHERE nom = 'generic_".strtolower($myTmpObjectKey)."_odt' AND type = '".$this->db->escape(strtolower($myTmpObjectKey))."' AND entity = ".((int) $conf->entity),
+					"INSERT INTO ".$this->db->prefix()."document_model (nom, type, entity) VALUES('generic_".strtolower($myTmpObjectKey)."_odt', '".$this->db->escape(strtolower($myTmpObjectKey))."', ".((int) $conf->entity).")"
 				));
 			}
 		}
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
index 4d2329d8a2f..98d9b5fbffe 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
@@ -93,7 +93,7 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 
 		$posindice = strlen($this->prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql .= " FROM ".MAIN_DB_PREFIX."mymodule_myobject";
+		$sql .= " FROM ".$db->prefix()."mymodule_myobject";
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		if ($object->ismultientitymanaged == 1) {
 			$sql .= " AND entity = ".$conf->entity;
@@ -131,7 +131,7 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 		// first we get the max value
 		$posindice = strlen($this->prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql .= " FROM ".MAIN_DB_PREFIX."mymodule_myobject";
+		$sql .= " FROM ".$db->prefix()."mymodule_myobject";
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		if ($object->ismultientitymanaged == 1) {
 			$sql .= " AND entity = ".$conf->entity;
diff --git a/htdocs/modulebuilder/template/mymoduleindex.php b/htdocs/modulebuilder/template/mymoduleindex.php
index 8ac978ddfa6..892231a8f01 100644
--- a/htdocs/modulebuilder/template/mymoduleindex.php
+++ b/htdocs/modulebuilder/template/mymoduleindex.php
@@ -132,8 +132,8 @@ if (isModEnabled('mymodule') && $user->hasRight('mymodule', 'read')) {
 
 	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
 	$sql.= ", s.code_client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
-	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+	$sql.= " FROM ".$db->prefix()."commande as c";
+	$sql.= ", ".$db->prefix()."societe as s";
 	$sql.= " WHERE c.fk_soc = s.rowid";
 	$sql.= " AND c.fk_statut = 0";
 	$sql.= " AND c.entity IN (".getEntity('commande').")";
@@ -204,7 +204,7 @@ print '</div><div class="fichetwothirdright">';
 // Last modified myobject
 if (isModEnabled('mymodule') && $user->hasRight('mymodule', 'read')) {
 	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms";
-	$sql.= " FROM ".MAIN_DB_PREFIX."mymodule_myobject as s";
+	$sql.= " FROM ".$db->prefix()."mymodule_myobject as s";
 	$sql.= " WHERE s.entity IN (".getEntity($myobjectstatic->element).")";
 	//if ($socid)	$sql.= " AND s.rowid = $socid";
 	$sql .= " ORDER BY s.tms DESC";
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 864ad8adf9d..85bf290801a 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -317,10 +317,10 @@ $sql = preg_replace('/,\s*$/', '', $sql);
 
 $sqlfields = $sql; // $sql fields to remove for count total
 
-$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-//$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."anothertable as rc ON rc.parent = t.rowid";
+$sql .= " FROM ".$db->prefix().$object->table_element." as t";
+//$sql .= " LEFT JOIN ".$db->prefix()."anothertable as rc ON rc.parent = t.rowid";
 if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+	$sql .= " LEFT JOIN ".$db->prefix().$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
 // Add table from hooks
 $parameters = array();
@@ -378,9 +378,9 @@ if (!$user->hasRight('societe', 'client', 'voir')) {
 // Search on sale representative
 if ($search_sale && $search_sale != '-1') {
 	if ($search_sale == -2) {
-		$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = t.fk_soc)";
+		$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".$db->prefix()."societe_commerciaux as sc WHERE sc.fk_soc = t.fk_soc)";
 	} elseif ($search_sale > 0) {
-		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = t.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".$db->prefix()."societe_commerciaux as sc WHERE sc.fk_soc = t.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
 	}
 }
 // Search on socid
diff --git a/htdocs/modulebuilder/template/scripts/mymodule.php b/htdocs/modulebuilder/template/scripts/mymodule.php
index 24978ec7f15..8b19deb0a5e 100644
--- a/htdocs/modulebuilder/template/scripts/mymodule.php
+++ b/htdocs/modulebuilder/template/scripts/mymodule.php
@@ -184,7 +184,7 @@ else print "Object with id ".$myobject->id." deleted\n";
 // An example of a direct SQL read without using the fetch method
 /*
 $sql = "SELECT field1, field2";
-$sql.= " FROM ".MAIN_DB_PREFIX."myobject";
+$sql.= " FROM ".$db->prefix()."myobject";
 $sql.= " WHERE field3 = 'xxx'";
 $sql.= " ORDER BY field1 ASC";
 

From 2d1d6f13c9b4fe4c0fe3fb705fd9e17a071b3f26 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 15 Jan 2025 09:10:11 +0100
Subject: [PATCH 116/243] chore: review

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

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 32dc9b9a25b..0a4e590ca79 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -619,7 +619,7 @@ class ExpenseReport extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d";
 		if ($ref) {
 			$sql .= " WHERE d.ref = '".$this->db->escape($ref)."'";
-			$sql .= " WHERE d.entity IN (".getEntity('expensereport').")";
+			$sql .= " AND d.entity IN (".getEntity('expensereport').")";
 		} else {
 			$sql .= " WHERE d.rowid = ".((int) $id);
 		}

From 748dcd088136882906f855de955e1d4a882721d5 Mon Sep 17 00:00:00 2001
From: uvaldenaire-opendsi <uvaldenaire@easya.solutions>
Date: Wed, 15 Jan 2025 10:12:16 +0100
Subject: [PATCH 117/243] FIX selectcontact is loading all contacts if socid is
 empty and MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT is not set

---
 htdocs/comm/action/card.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 0310ac0b225..681a977adb1 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1670,7 +1670,12 @@ if ($id > 0) {
 			// related contact
 			print '<tr><td>'.$langs->trans("ActionOnContact").'</td><td>';
 			print '<div class="maxwidth200onsmartphone">';
-			print img_picto('', 'contact', 'class="paddingrightonly"').$form->selectcontacts($object->socid, array_keys($object->socpeopleassigned), 'socpeopleassigned[]', 1, '', '', 1, 'quatrevingtpercent', false, 0, 0, array(), 'multiple', 'contactid');
+			if (getDolGlobalInt('MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT')) {
+				$select_contact_default = 0; // select "all" contacts by default : avoid to use it if there is a lot of contacts
+			} else {
+				$select_contact_default = -1; // select "none" by default
+			}
+			print img_picto('', 'contact', 'class="paddingrightonly"').$form->selectcontacts(!empty($object->socid) ? $object->socid : $select_contact_default, array_keys($object->socpeopleassigned), 'socpeopleassigned[]', 1, '', '', 1, 'quatrevingtpercent', false, 0, 0, array(), 'multiple', 'contactid');
 			print '</div>';
 			print '</td>';
 			print '</tr>';

From 628189f57f6ecdd89d27d29df65ee35d5a9fd627 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 23 May 2022 00:49:59 +0200
Subject: [PATCH 118/243] Backport of #00e65eb Fix bad management when
 inserting contacts of actioncomm

---
 htdocs/comm/action/class/actioncomm.class.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 9b006c83ab6..9e1e471bbd3 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1203,11 +1203,14 @@ class ActionComm extends CommonObject
 
 				if (!empty($this->socpeopleassigned)) {
 					$already_inserted = array();
-					foreach (array_keys($this->socpeopleassigned) as $id) {
+					foreach (array_keys($this->socpeopleassigned) as $key => $val) {
+						if (!is_array($val)) {	// For backward compatibility when val=id
+							$val = array('id'=>$val);
+						}
 						if (!empty($already_inserted[$val['id']])) continue;
 
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
-						$sql .= " VALUES(".$this->id.", 'socpeople', ".$id.", 0, 0, 0)";
+						$sql .= " VALUES(".((int) $this->id).", 'socpeople', ".((int) $val['id']).", 0, 0, 0)";
 
 						$resql = $this->db->query($sql);
 						if (!$resql) {

From 41bfe889a16c221c685558d481084d8c6f3b8499 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 15 Jan 2025 11:40:37 +0100
Subject: [PATCH 119/243] Try fix br into custom css

---
 htdocs/admin/ihm.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index af9b9ff5eec..ede222b86f3 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -325,7 +325,10 @@ if ($action == 'update') {
 	if ($mode == 'css') {
 		//file_put_contents(DOL_DATA_ROOT.'/admin/customcss.css', $data);
 		//dol_chmod(DOL_DATA_ROOT.'/admin/customcss.css');
-		dolibarr_set_const($db, "MAIN_IHM_CUSTOM_CSS", GETPOST('MAIN_IHM_CUSTOM_CSS', 'restricthtml'), 'chaine', 0, '', $conf->entity);
+		$csscontent = GETPOST('MAIN_IHM_CUSTOM_CSS', 'restricthtml');
+		$csscontent = dol_string_nohtmltag($csscontent, 2);
+
+		dolibarr_set_const($db, "MAIN_IHM_CUSTOM_CSS", $csscontent, 'chaine', 0, '', $conf->entity);
 	}
 
 	$_SESSION["mainmenu"] = ""; // The menu manager may have changed

From 0cf6b8b8a4bf0c53fb1ffac01753241108a26ea2 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 15 Jan 2025 11:40:39 +0100
Subject: [PATCH 120/243] Try fix br into custom css


From 929e7047b9fc247ae47c0b48ac4f354328857144 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 15 Jan 2025 11:44:59 +0100
Subject: [PATCH 121/243] Fix message

---
 htdocs/admin/ihm.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index ede222b86f3..1ec7c21252f 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -329,6 +329,8 @@ if ($action == 'update') {
 		$csscontent = dol_string_nohtmltag($csscontent, 2);
 
 		dolibarr_set_const($db, "MAIN_IHM_CUSTOM_CSS", $csscontent, 'chaine', 0, '', $conf->entity);
+
+		setEventMessages($langs->trans("RecordSaved"), null);
 	}
 
 	$_SESSION["mainmenu"] = ""; // The menu manager may have changed

From 4d4638c75a4a5ecb7bbc805ddcc1632df40f0bf9 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 15 Jan 2025 12:09:49 +0100
Subject: [PATCH 122/243] FIX avoid php warning

---
 htdocs/user/card.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index c09ae7c6985..0f6bb9bc430 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -130,6 +130,9 @@ if ($user->id != $id && !$canreaduser) {
 	accessforbidden();
 }
 
+$caneditpasswordandsee = $canadduser;
+$caneditpasswordandsend = $canadduser;
+
 // Define value to know what current user can do on properties of edited user
 if ($id > 0) {
 	// $user is the current logged user, $id is the user we want to edit

From 9e8c52e2961af41da49fb0f2940786755904cea4 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 15 Jan 2025 12:10:36 +0100
Subject: [PATCH 123/243] Fix function not enabled

---
 htdocs/core/lib/functions.lib.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index df7b61f06c0..0dae150f1f6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8585,17 +8585,19 @@ function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = '
 			// We replace chars from a/A to z/Z encoded with numeric HTML entities with the real char so we won't loose the chars at the next step (preg_replace).
 			// No need to use a loop here, this step is not to sanitize (this is done at next step, this is to try to save chars, even if they are
 			// using a non conventionnal way to be encoded, to not have them sanitized just after)
-			$out = preg_replace_callback(
-				'/&#(x?[0-9][0-9a-f]+;?)/i',
-				/**
-				 * @param string[] $m
-				 * @return string
-				 */
-				static function ($m) {
-					return realCharForNumericEntities($m);
-				},
-				$out
-			);
+			if (function_exists('realCharForNumericEntities')) {	// May not exist when main.inc.php not loaded, for example in a CLI context
+				$out = preg_replace_callback(
+					'/&#(x?[0-9][0-9a-f]+;?)/i',
+					/**
+					 * @param string[] $m
+					 * @return string
+					 */
+					static function ($m) {
+						return realCharForNumericEntities($m);
+					},
+					$out
+				);
+			}
 
 			// Now we remove all remaining HTML entities starting with a number. We don't want such entities.
 			$out = preg_replace('/&#x?[0-9]+/i', '', $out);	// For example if we have j&#x61vascript with an entities without the ; to hide the 'a' of 'javascript'.

From ac049e1f23305fdee24b0d38395f032b0b64fd65 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 15 Jan 2025 12:13:23 +0100
Subject: [PATCH 124/243] Fix test

---
 test/phpunit/AllTests.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 9eb4e51e7fa..06279511286 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -48,7 +48,7 @@ if ($langs->defaultlang != 'en_US') {
 	print "Error: Default language for company to run tests must be set to en_US or auto. Current is ".$langs->defaultlang."\n";
 	exit(1);
 }
-if (!isModEnabled('adherent')) {
+if (!isModEnabled('member')) {
 	print "Error: Module member must be enabled to have significant results.\n";
 	exit(1);
 }

From 1b09d9abf614b69e4cbb32f886517284c11892cf Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 15 Jan 2025 14:00:11 +0100
Subject: [PATCH 125/243] Missing ip in list

---
 htdocs/contact/class/contact.class.php |  2 +-
 htdocs/contact/list.php                | 24 ++++++++++++++++++++-
 htdocs/societe/list.php                | 29 +++++++++++++++++++++++---
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index f6719809fbb..e2961594ea4 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -120,12 +120,12 @@ class Contact extends CommonObject
 		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 3, 'position' => 200, 'searchall' => 1),
 		'default_lang' => array('type' => 'varchar(6)', 'label' => 'Default lang', 'enabled' => 1, 'visible' => 3, 'position' => 205),
 		'canvas' => array('type' => 'varchar(32)', 'label' => 'Canvas', 'enabled' => 1, 'visible' => 3, 'position' => 210),
+		'ip' => array('type' => 'ip', 'label' => 'IPAddress', 'enabled' => '1', 'position' => 700, 'notnull' => 0, 'visible' => '-2', 'comment' => 'ip used to create record (for public submission page)'),
 		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 300),
 		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 305),
 		'fk_user_creat' => array('type' => 'integer', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => 3, 'position' => 310),
 		'fk_user_modif' => array('type' => 'integer', 'label' => 'UserModif', 'enabled' => 1, 'visible' => 3, 'position' => 315),
 		'statut' => array('type' => 'tinyint(4)', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 500),
-		'ip' => array('type' => 'varchar(250)', 'label' => 'Ip', 'enabled' => '1', 'position' => 700, 'notnull' => 0, 'visible' => '0', 'comment' => 'ip used to create record (for public submission page)'),
 		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -1, 'position' => 1000),
 	);
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 9661927d240..527449dec4a 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -486,7 +486,7 @@ if ($resql) {
 $sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias as alias,";
 $sql .= " p.rowid, p.ref_ext, p.lastname as lastname, p.statut, p.firstname, p.address, p.zip, p.town, p.poste, p.email, p.birthday,";
 $sql .= " p.socialnetworks, p.photo,";
-$sql .= " p.phone as phone_pro, p.phone_mobile, p.phone_perso, p.fax, p.fk_pays, p.priv, p.datec as date_creation, p.tms as date_modification,";
+$sql .= " p.phone as phone_pro, p.phone_mobile, p.phone_perso, p.fax, p.fk_pays, p.priv, p.ip, p.datec as date_creation, p.tms as date_modification,";
 $sql .= " p.import_key, p.fk_stcommcontact as stcomm_id, p.fk_prospectlevel,";
 $sql .= " st.libelle as stcomm, st.picto as stcomm_picto,";
 $sql .= " co.label as country, co.code as country_code";
@@ -1240,6 +1240,11 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 $parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
+// IP
+if (!empty($arrayfields['p.ip']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
 // Date creation
 if (!empty($arrayfields['p.datec']['checked'])) {
 	print '<td class="liste_titre">';
@@ -1385,6 +1390,12 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 $parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
+// IP
+if (!empty($arrayfields['p.ip']['checked'])) {
+	print_liste_field_titre($arrayfields['p.ip']['label'], $_SERVER["PHP_SELF"], "p.ip", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	$totalarray['nbfield']++;
+}
+// Date creation
 if (!empty($arrayfields['p.datec']['checked'])) {
 	print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 	$totalarray['nbfield']++;
@@ -1754,6 +1765,17 @@ while ($i < $imaxinloop) {
 		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
+
+		// IP creation
+		if (!empty($arrayfields['p.ip']['checked'])) {
+			print '<td class="center nowraponall">';
+			print dol_print_ip($obj->ip);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
 		// Date creation
 		if (!empty($arrayfields['p.datec']['checked'])) {
 			print '<td class="center nowraponall">';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index ab2571bfcfb..ec7e8ba23a5 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -319,8 +319,9 @@ $arrayfields = array(
 	's.fk_prospectlevel' => array('label' => "ProspectLevel", 'position' => 62, 'checked' => $checkprospectlevel),
 	's.fk_stcomm' => array('label' => "StatusProsp", 'position' => 63, 'checked' => $checkstcomm),
 	's2.nom' => array('label' => 'ParentCompany', 'position' => 64, 'checked' => 0),
-	's.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 500),
-	's.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 500),
+	's.ip' => array('type'=>'ip', 'label' => "IPAddress", 'checked' => -2, 'position' => 500),
+	's.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 501),
+	's.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 505),
 	's.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'position' => 520, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES'))),
 	's.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'position' => 521, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES'))),
 	's.status' => array('label' => "Status", 'checked' => 1, 'position' => 1000),
@@ -569,7 +570,7 @@ $sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.ref_ext, s.barcode, s.add
 $sql .= " s.entity,";
 $sql .= " st.libelle as stcomm, st.picto as stcomm_picto, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status, s.note_private, s.note_public,";
 $sql .= " s.email, s.phone, s.phone_mobile, s.fax, s.url, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4 as idprof4, s.idprof5 as idprof5, s.idprof6 as idprof6, s.tva_intra, s.fk_pays,";
-$sql .= " s.tms as date_modification, s.datec as date_creation, s.import_key,";
+$sql .= " s.ip, s.tms as date_modification, s.datec as date_creation, s.import_key,";
 $sql .= " s.code_compta, s.code_compta_fournisseur, s.parent as fk_parent,s.price_level,";
 $sql .= " s2.nom as name2,";
 $sql .= " typent.code as typent_code,";
@@ -1556,6 +1557,11 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 $parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
+// IP address
+if (!empty($arrayfields['s.ip']['checked'])) {
+	print '<td class="liste_titre center nowraponall">';
+	print '</td>';
+}
 // Creation date
 if (!empty($arrayfields['s.datec']['checked'])) {
 	print '<td class="liste_titre center nowraponall">';
@@ -1773,6 +1779,12 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 $parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
+// IP Address
+if (!empty($arrayfields['s.ip']['checked'])) {
+	print_liste_field_titre($arrayfields['s.ip']['label'], $_SERVER["PHP_SELF"], "s.ip", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	$totalarray['nbfield']++;	// For the column action
+}
+// Date creation
 if (!empty($arrayfields['s.datec']['checked'])) {
 	print_liste_field_titre($arrayfields['s.datec']['label'], $_SERVER["PHP_SELF"], "s.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 	$totalarray['nbfield']++;	// For the column action
@@ -1845,6 +1857,8 @@ while ($i < $imaxinloop) {
 		$companystatic->tva_intra = $obj->tva_intra;
 		$companystatic->country_code = $obj->country_code;
 
+		$companystatic->ip = $obj->ip;
+
 		$companystatic->code_compta_client = $obj->code_compta;
 		$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 		$companystatic->note_public = $obj->note_public;
@@ -2227,6 +2241,15 @@ while ($i < $imaxinloop) {
 		$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
+		// IP
+		if (!empty($arrayfields['s.ip']['checked'])) {
+			print '<td class="center nowraponall">';
+			print dol_print_ip($obj->ip);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 		// Date creation
 		if (!empty($arrayfields['s.datec']['checked'])) {
 			print '<td class="center nowraponall">';

From ac5d29a4f648622a30eacc0e755a043706a31494 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 15 Jan 2025 14:11:57 +0100
Subject: [PATCH 126/243] Fix phpunit

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

diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 0994133905a..51dd74cc117 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -414,7 +414,7 @@ class modAdherent extends DolibarrModules
 				'unitfrequency'=> 3600 * 24,
 				'priority'=>50,
 				'status'=>1,
-				'test'=>'isModEnabled("adherent")',
+				'test'=>'isModEnabled("member")',
 				'datestart'=>$datestart
 			),
 		);

From 0a45c4cad21c9a4d1dd4f28ba4cc3a7666c98111 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 15 Jan 2025 14:16:11 +0100
Subject: [PATCH 127/243] Update card.php

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 0f6bb9bc430..264fa0f0647 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -130,8 +130,8 @@ if ($user->id != $id && !$canreaduser) {
 	accessforbidden();
 }
 
-$caneditpasswordandsee = $canadduser;
-$caneditpasswordandsend = $canadduser;
+$caneditpasswordandsee = false;
+$caneditpasswordandsend = false;
 
 // Define value to know what current user can do on properties of edited user
 if ($id > 0) {

From acf1430bedf51eba495fbc4ed53e5616b661af07 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 15 Jan 2025 14:18:22 +0100
Subject: [PATCH 128/243] Update html.form.class.php

---
 htdocs/core/class/html.form.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ede456909d5..adbc77946c2 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6927,8 +6927,10 @@ class Form
 		$reshook = $hookmanager->executeHooks('load_tva', $parameters);
 		if ($reshook > 0) {
 			return $hookmanager->resPrint;
+		} elseif ($reshook === 0) {
+			$return .= $hookmanager->resPrint;
 		}
-
+		
 		// Define defaultnpr, defaultttx and defaultcode
 		$defaultnpr = ($info_bits & 0x01);
 		$defaultnpr = (preg_match('/\*/', $selectedrate) ? 1 : $defaultnpr);

From fffa47723fc13897629c3e1d0920fc82ecb2f360 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 15 Jan 2025 14:37:24 +0100
Subject: [PATCH 129/243] Qual: Fix ci (pre-commit) Exclude/fix shellcheck
 notices

---
 .github/workflows/pre-commit.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 81ecb17f1cd..ccd276f8a97 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -62,8 +62,9 @@ jobs:
       - name: Extract PHP version
         id: extract-php-version
         run: |
+          # shellcheck disable=SC2016
           PHP_VERSION=$(sed -n 's/.*\$arrayphpmaxversionwarning\s*=\s*array\s*(\s*\([0-9]\+\)\s*,\s*\([0-9]\+\).*/\1.\2/p' htdocs/install/check.php)
-          echo "PHP_VERSION=$PHP_VERSION" >> $GITHUB_ENV
+          echo "PHP_VERSION=$PHP_VERSION" >> "$GITHUB_ENV"
 
       - name: Setup PHPCS
         uses: shivammathur/setup-php@v2

From ac35daf08fbcde6bf1d8beb492e204b6bbec0503 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 15 Jan 2025 14:54:33 +0100
Subject: [PATCH 130/243] Qual: Fix whitespace

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 66008eb07db..e784c59863e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -23,7 +23,7 @@
  * Copyright (C) 2018       Josep Lluis Amador      <joseplluis@lliuretic.cat>
  * Copyright (C) 2023		Joachim Kueter			<git-jk@bloxera.com>
  * Copyright (C) 2023		Nick Fragoulis
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -6930,7 +6930,7 @@ class Form
 		} elseif ($reshook === 0) {
 			$return .= $hookmanager->resPrint;
 		}
-		
+
 		// Define defaultnpr, defaultttx and defaultcode
 		$defaultnpr = ($info_bits & 0x01);
 		$defaultnpr = (preg_match('/\*/', $selectedrate) ? 1 : $defaultnpr);

From 351a7bd6bb81b07b058585e852cbce1bc386c5f2 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Wed, 15 Jan 2025 19:01:18 +0100
Subject: [PATCH 131/243] FIX: #26250 fatal error on kit

---
 htdocs/product/class/product.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index e289762d2a5..ea9c7f6b830 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5016,7 +5016,8 @@ class Product extends CommonObject
 				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty'],2=>$rec['fk_product_type']);
 				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']);
 				if (empty($firstlevelonly)) {
-					$listofchilds = $this->getChildsArbo($rec['rowid'], 0, $level + 1, array_push($parents, $rec['rowid']));
+					array_push($parents, $rec['rowid']);
+					$listofchilds = $this->getChildsArbo($rec['rowid'], 0, $level + 1, $parents);
 					foreach ($listofchilds as $keyChild => $valueChild) {
 						$prods[$rec['rowid']]['childs'][$keyChild] = $valueChild;
 					}

From f757f9c4cc6f34f5ae884100dcbbcf72e140d252 Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Wed, 15 Jan 2025 20:01:40 +0100
Subject: [PATCH 132/243] accounting: fix num_rows without call from $db

$res->num_rows will not work on PostgreSQL. $db->num_rows() must be used
instead to execute the correct procedure depending on the database
backend.
---
 htdocs/core/lib/accounting.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index e3876491055..ff23193441e 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -295,7 +295,7 @@ function getDefaultDatesForTransfer()
 		$sql .= " WHERE date_start < '".$db->idate(dol_now())."' AND date_end > '".$db->idate(dol_now())."'";
 		$sql .= $db->plimit(1);
 		$res = $db->query($sql);
-		if ($res->num_rows > 0) {
+		if ($db->num_rows($res) > 0) {
 			$obj = $db->fetch_object($res);
 
 			$date_start = $db->jdate($obj->date_start);

From bd35af136098dc6a6881110ee07b284c4945b233 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 15 Jan 2025 20:07:31 +0100
Subject: [PATCH 133/243] Fix phpunit

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

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index d6a22f64de5..44ff8a217c9 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -36,7 +36,7 @@
  */
 
 include_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
-
+ 
 
 /**
  *  Return array head with list of tabs to view object informations.

From 8b7eaf360e58693a9365544cb1520f28ced7e626 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 15 Jan 2025 20:08:13 +0100
Subject: [PATCH 134/243] Fix phpunit

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

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 42fee8bfa7b..163fdefb2b0 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1426,7 +1426,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 
 	//id
 	$idprod = (!empty($object->lines[$i]->fk_product) ? $object->lines[$i]->fk_product : false);
-    if($idprod) {
+    if ($idprod) {
         $prodser->fetch($idprod);
         //load multilangs
         if($multilangsactive){

From 4d1cc9c2a103dd7556051633941505a73357bdc6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 15 Jan 2025 14:37:24 +0100
Subject: [PATCH 135/243] Qual: Fix ci (pre-commit) Exclude/fix shellcheck
 notices

---
 .github/workflows/pre-commit.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 81ecb17f1cd..ccd276f8a97 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -62,8 +62,9 @@ jobs:
       - name: Extract PHP version
         id: extract-php-version
         run: |
+          # shellcheck disable=SC2016
           PHP_VERSION=$(sed -n 's/.*\$arrayphpmaxversionwarning\s*=\s*array\s*(\s*\([0-9]\+\)\s*,\s*\([0-9]\+\).*/\1.\2/p' htdocs/install/check.php)
-          echo "PHP_VERSION=$PHP_VERSION" >> $GITHUB_ENV
+          echo "PHP_VERSION=$PHP_VERSION" >> "$GITHUB_ENV"
 
       - name: Setup PHPCS
         uses: shivammathur/setup-php@v2

From d5584f4e3213f2ce5769910d1c82d74bd71daa0a Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Wed, 15 Jan 2025 20:01:40 +0100
Subject: [PATCH 136/243] api_thirdparties: fix num_rows typo

$res->num_rows will not work on PostgreSQL. $db->num_rows() must be used
instead to execute the correct procedure depending on the database
backend.

But the call was not written properly and both were mixed up in commit
25741a618ebc162af25ede4936b8087f580e85bf which used $db->num_rows, and
then fixed in 72c443868c235c31cb192c1202d277b6df4cd380 which used
$db->num_rows($result) where suited, except this location.
---
 htdocs/societe/class/api_thirdparties.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 4461bb644e3..9f1049544cf 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1865,7 +1865,7 @@ class Thirdparties extends DolibarrApi
 		$result = $this->db->query($sql);
 
 		// We do not found an existing SocieteAccount entity for this fk_soc and site ; we then create a new one.
-		if ($result && $this->db->num_rows == 0) {
+		if ($result && $this->db->num_rows($result) == 0) {
 			if (!isset($request_data['key_account'])) {
 				throw new RestException(422, 'Unprocessable Entity: You must pass the key_account attribute in your request data !');
 			}

From 16b28e4d165ce88e7b910f2b15c40131b50d4fa0 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 15 Jan 2025 21:19:18 +0100
Subject: [PATCH 137/243] Debug v21

---
 htdocs/societe/class/societe.class.php | 18 +++++++++++++-----
 htdocs/societe/list.php                |  1 +
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index fa785fc230c..a1a3b9306bb 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2913,7 +2913,7 @@ class Societe extends CommonObject
 			$datas['status'] = ' '.$this->getLibStatut(5);
 		}
 		if (isset($this->client) && isset($this->fournisseur)) {
-			$datas['type'] = ' &nbsp; ' . $this->getTypeUrl(1);
+			$datas['type'] = ' &nbsp; ' . $this->getTypeUrl(1, '', 0, 'span');
 		}
 		$datas['name'] = '<br><b>'.$langs->trans('Name').':</b> '.dol_escape_htmltag(dol_string_nohtmltag($this->name));
 		if (!empty($this->name_alias) && empty($noaliasinname)) {
@@ -3075,7 +3075,8 @@ class Societe extends CommonObject
 		} else {
 			$label = implode($this->getTooltipContentArray($params));
 		}
-
+		print "\n";
+		//var_dump($label);exit;
 		$linkstart = '';
 		$linkend = '';
 
@@ -3183,19 +3184,26 @@ class Societe extends CommonObject
 		$s = '';
 		if (empty($option) || preg_match('/prospect/', $option)) {
 			if (($this->client == 2 || $this->client == 3) && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
-				$s .= '<'.$tag.' class="customer-back opacitymedium" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</'.$tag.'>';
+				$s .= '<'.$tag.' class="customer-back opacitymedium" title="'.dolPrintHTMLForAttribute($langs->trans("Prospect")).'"';
+				$s .= $tag == 'a' ? ' href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id.'"' : '';
+				$s .= '>'.dol_substr($langs->trans("Prospect"), 0, 1).'</'.$tag.'>';
 			}
 		}
 		if (empty($option) || preg_match('/customer/', $option)) {
 			if (($this->client == 1 || $this->client == 3) && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
-				$s .= '<'.$tag.' class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</'.$tag.'>';
+				$s .= '<'.$tag.' class="customer-back" title="'.dolPrintHTMLForAttribute($langs->trans("Customer")).'"';
+				$s.= $tag == 'a' ? ' href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id.'"' : '';
+				$s .= '>'.dol_substr($langs->trans("Customer"), 0, 1).'</'.$tag.'>';
 			}
 		}
 		if (empty($option) || preg_match('/supplier/', $option)) {
 			if ((isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) && $this->fournisseur) {
-				$s .= '<'.$tag.' class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</'.$tag.'>';
+				$s .= '<'.$tag.' class="vendor-back" title="'.dolPrintHTMLForAttribute($langs->trans("Supplier")).'"';
+				$s .= $tag == 'a' ? ' href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id.'"' : '';
+				$s .= '>'.dol_substr($langs->trans("Supplier"), 0, 1).'</'.$tag.'>';
 			}
 		}
+
 		return $s;
 	}
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index ec7e8ba23a5..cce3e430b6c 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -2009,6 +2009,7 @@ while ($i < $imaxinloop) {
 					$userstatic->job = $val['job'];
 					$userstatic->gender = $val['gender'];
 					$userstatic->statut = $val['statut'];
+					$userstatic->status = $val['statut'];
 					print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
 					$j++;
 					if ($j < $nbofsalesrepresentative) {

From c4529ed9869b59d4f34865e79dd5ad419a45c204 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 00:35:38 +0100
Subject: [PATCH 138/243] Clean file

---
 htdocs/core/lib/pdf.lib.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 163fdefb2b0..c2078f2c74a 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -36,7 +36,7 @@
  */
 
 include_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
- 
+
 
 /**
  *  Return array head with list of tabs to view object informations.
@@ -1412,8 +1412,8 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 
 	$multilangsactive = getDolGlobalInt('MAIN_MULTILANGS');
 
-    if ($issupplierline) {
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+	if ($issupplierline) {
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
         $prodser = new ProductFournisseur($db);
     } else {
         include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -1429,7 +1429,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
     if ($idprod) {
         $prodser->fetch($idprod);
         //load multilangs
-        if($multilangsactive){
+        if ($multilangsactive) {
             $prodser->getMultiLangs();
             $object->lines[$i]->multilangs = $prodser->multilangs;
         }

From c2c3879032ac2fe80e397835b2d784168b0f5d57 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 00:36:56 +0100
Subject: [PATCH 139/243] Clean php file

---
 htdocs/core/lib/pdf.lib.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index c2078f2c74a..7bb8e4d8a1e 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1414,26 +1414,26 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 
 	if ($issupplierline) {
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-        $prodser = new ProductFournisseur($db);
-    } else {
-        include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-        $prodser = new Product($db);
+		$prodser = new ProductFournisseur($db);
+	} else {
+		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+		$prodser = new Product($db);
 
-        if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
-            include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
-        }
-    }
+		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+			include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+		}
+	}
 
 	//id
 	$idprod = (!empty($object->lines[$i]->fk_product) ? $object->lines[$i]->fk_product : false);
-    if ($idprod) {
-        $prodser->fetch($idprod);
-        //load multilangs
-        if ($multilangsactive) {
-            $prodser->getMultiLangs();
-            $object->lines[$i]->multilangs = $prodser->multilangs;
-        }
-    }
+	if ($idprod) {
+		$prodser->fetch($idprod);
+		//load multilangs
+		if ($multilangsactive) {
+			$prodser->getMultiLangs();
+			$object->lines[$i]->multilangs = $prodser->multilangs;
+		}
+	}
 	//label
 	if (!empty($object->lines[$i]->label)) {
 		$label = $object->lines[$i]->label;

From a41fe4637dd9c108f8a4c5db384b6f90cb693a8a Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 01:58:13 +0100
Subject: [PATCH 140/243] Debug v21

---
 htdocs/website/index.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index b69a1697d3f..7a8acf4e21b 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2905,7 +2905,7 @@ llxHeader($moreheadcss.$moreheadjs, $langs->trans("Website").(empty($website->re
 
 print "\n";
 print '<!-- Open form for all page -->'."\n";
-print '<form action="'.$_SERVER["PHP_SELF"].($action == 'file_manager' ? '?uploadform=1' : '').'" method="POST" enctype="multipart/form-data" class="websiteformtoolbar">';
+print '<form action="'.$_SERVER["PHP_SELF"].($action == 'file_manager' ? '?uploadform=1' : '').'" method="POST" enctype="multipart/form-data" class="websiteformtoolbar">'."\n";
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 print '<input type="hidden" name="dol_openinpopup" value="'.$dol_openinpopup.'">';
@@ -2947,7 +2947,7 @@ if ($mode) {
 	print '<input type="hidden" name="mode" value="'.$mode.'">';
 }
 
-print '<div>';
+print '<div>'."\n";
 
 // Add a margin under toolbar ?
 $style = '';
@@ -2991,7 +2991,7 @@ if (!GETPOST('hide_websitemenu')) {
 
 
 	//var_dump($objectpage);exit;
-	print '<div class="centpercent websitebar'.(GETPOST('dol_openinpopup', 'aZ09') ? ' hiddenforpopup' : '').'">';
+	print '<div class="centpercent websitebar'.(GETPOST('dol_openinpopup', 'aZ09') ? ' hiddenforpopup' : '').'">'."\n";
 
 	//
 	// Toolbar for websites
@@ -3291,10 +3291,10 @@ if (!GETPOST('hide_websitemenu')) {
 	//
 
 	if ($websitekey && $websitekey != '-1' && (!in_array($action, array('editcss', 'editmenu', 'importsite', 'file_manager', 'replacesite', 'replacesiteconfirm'))) && (!in_array($mode, array('replacesite'))) && !$file_manager) {
-		print '</div>'; // Close current websitebar to open a new one
+		print '</div>'."\n"; // Close current websitebar to open a new one
 
 		print '<!-- Toolbar for websitepage -->';
-		print '<div class="centpercent websitebar"'.($style ? ' style="'.$style.'"' : '').'>';
+		print '<div class="centpercent websitebar"'.($style ? ' style="'.$style.'"' : '').'>'."\n";
 
 		print '<div class="websiteselection hideonsmartphoneimp minwidth75 tdoverflowmax100 inline-block">';
 		print $langs->trans("PageContainer").': ';
@@ -3854,7 +3854,7 @@ if (!GETPOST('hide_websitemenu')) {
 		}
 	}
 
-	print '</div>'; // end current websitebar
+	print '</div>'."\n"; // end current websitebar
 }
 
 
@@ -5537,7 +5537,8 @@ if ((empty($action) || $action == 'preview' || $action == 'createfromclone' || $
 		*/
 
 		$out .= "</head>\n";
-		$out .= "\n<body>";
+		$out .= "\n";
+		$out .= "<body>\n";
 
 
 		$out .= '<div id="websitecontentundertopmenu" class="websitecontentundertopmenu boostrap-iso">'."\n";
@@ -5618,9 +5619,9 @@ if ((empty($action) || $action == 'preview' || $action == 'createfromclone' || $
 		$out .= dolWebsiteReplacementOfLinks($object, $newcontent, 0, 'html', $objectpage->id)."\n";
 		//$out.=$newcontent;
 
-		$out .= '</div>';
+		$out .= '</div>'."\n";
 
-		$out .= '</div> <!-- End div id=websitecontentundertopmenu -->';
+		$out .= '</div> <!-- End div id=websitecontentundertopmenu -->'."\n";
 
 		/*if ($includepageintoaframeoradiv == 'iframe')
 		{

From 0f0617f8f8e23b88dc7b8fe2c8181fe8cd2d343d Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 02:09:34 +0100
Subject: [PATCH 141/243] Debug v21

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 4f25f02093c..08dd5e94151 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -3873,7 +3873,7 @@ function archiveOrBackupFile($srcfile, $max_versions = 5, $archivedir = '', $suf
 	if (count($sorted_files) >= $max_versions) {
 		$oldest_files = array_slice($sorted_files, $max_versions - 1);
 		foreach ($oldest_files as $oldest_file) {
-			dol_delete_file($oldest_file);
+			dol_delete_file($oldest_file, 0, 0, 0, null, false, 0);
 		}
 	}
 

From f88cfae08fa79f28a99f4d7c419145569183756d Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 02:50:23 +0100
Subject: [PATCH 142/243] Debug v21

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

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index f8c77afa6c0..d8df3b68655 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1228,7 +1228,7 @@ class Categorie extends CommonObject
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as c";
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
-			$sql .= " LEFT  JOIN ".MAIN_DB_PREFIX."categorie_lang as t ON t.fk_category=c.rowid AND t.lang='".$this->db->escape($current_lang)."'";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_lang as t ON t.fk_category=c.rowid AND t.lang = '".$this->db->escape($current_lang)."'";
 		}
 		$sql .= " WHERE c.entity IN (".getEntity('category').")";
 		$sql .= " AND c.type = ".(int) $type;

From a82da1cc6cb031c89be880e0937f7ee72954e9bc Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 02:55:00 +0100
Subject: [PATCH 143/243] Must be able to force lang

---
 htdocs/categories/class/categorie.class.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index d8df3b68655..6e1b9083210 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1187,9 +1187,10 @@ class Categorie extends CommonObject
 	 *                                                  - string (categories ids separated by comma)
 	 *                                                  - array (list of categories ids)
 	 * @param   int<0,1>            $include            [=0] Removed or 1=Keep only
+	 * @param	string				$forcelangcode		Lang code to force ('fr_FR', 'en_US', ...)
 	 * @return  int<-1,-1>|array<int,array{rowid:int,id:int,fk_parent:int,label:string,description:string,color:string,position:string,visible:int,ref_ext:string,picto:string,fullpath:string,fulllabel:string,level:?int}>              					Array of categories. this->cats and this->motherof are set, -1 on error
 	 */
-	public function get_full_arbo($type, $fromid = 0, $include = 0)
+	public function get_full_arbo($type, $fromid = 0, $include = 0, $forcelangcode = '')
 	{
 		// phpcs:enable
 		global $langs;
@@ -1219,7 +1220,12 @@ class Categorie extends CommonObject
 
 		// Init this->motherof that is array(id_son=>id_parent, ...)
 		$this->load_motherof();
-		$current_lang = $langs->getDefaultLang();
+
+		if ($forcelangcode) {
+			$current_lang = $forcelangcode;
+		} else {
+			$current_lang = $langs->getDefaultLang();
+		}
 
 		// Init $this->cats array
 		$sql = "SELECT DISTINCT c.rowid, c.label, c.ref_ext, c.description, c.color, c.position, c.fk_parent, c.visible"; // Distinct reduce pb with old tables with duplicates

From 162b3b1d82e018c6104d2373c2e7c4852e2ce431 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 05:13:34 +0100
Subject: [PATCH 144/243] Debug v21

---
 htdocs/public/payment/paymentok.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 3ddf784f0e1..cbfaae76079 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -2140,7 +2140,7 @@ if (!empty($doactionsthenredirect)) {
 		} else {
 			$ext_urlok = DOL_URL_ROOT.'/public/website/index.php?website='.urlencode($ws).'&pageref=paymentok&fulltag='.$FULLTAG;
 		}
-		print "<script>window.top.location.href = '".dol_escape_js($ext_urlok) ."';</script>";
+		print "<!DOCTYPE html><html><head></head><script>window.top.location.href = '".dol_escape_js($ext_urlok) ."';</script></html>";
 	} else {
 		// Redirect to an error page
 		// Paymentko page must be created for the specific website
@@ -2149,6 +2149,6 @@ if (!empty($doactionsthenredirect)) {
 		} else {
 			$ext_urlko = DOL_URL_ROOT.'/public/website/index.php?website='.urlencode($ws).'&pageref=paymentko&fulltag='.$FULLTAG;
 		}
-		print "<script>window.top.location.href = '".dol_escape_js($ext_urlko)."';</script>";
+		print "<!DOCTYPE html><html><head></head><script>window.top.location.href = '".dol_escape_js($ext_urlko)."';</script></html>";
 	}
 }

From 540329340912b56763813e22519d977374306be2 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 16 Jan 2025 06:19:22 +0100
Subject: [PATCH 145/243] Remove inappropriate <td>

---
 htdocs/accountancy/journal/purchasesjournal.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 437b436b733..afe272ba7d9 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2007-2010	Jean Heimburger				<jean@tiaris.info>
  * Copyright (C) 2011		Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2012		Regis Houssin				<regis.houssin@inodbox.com>
- * Copyright (C) 2013-2024	Alexandre Spangaro			<alexandre@inovea-conseil.com>
+ * Copyright (C) 2013-2025	Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2013-2016	Olivier Geffroy				<jeff@jeffinfo.com>
  * Copyright (C) 2013-2016	Florian Henry				<florian.henry@open-concept.pro>
  * Copyright (C) 2018-2024	Frédéric France				<frederic.france@free.fr>
@@ -1276,12 +1276,10 @@ if (empty($action) || $action == 'view') {
 					// Subledger account
 					print "<td>";
 					print '</td>';
-					print "<td>";
 					$tmpvatrate = (empty($def_tva[$key][$k]) ? (empty($arrayofvat[$key][$k]) ? '' : $arrayofvat[$key][$k]) : implode(', ', $def_tva[$key][$k]));
 					$labelvatrate = $langs->trans("Taxes").' '.$tmpvatrate.' %';
 					$labelvatrate .= ($numtax ? ' - Localtax '.$numtax : '');
 					print "<td>" . $bookkeepingstatic->accountingLabelForOperation($companystatic->getNomUrl(0, 'supplier'), $invoicestatic->ref_supplier, $labelvatrate) . "</td>";
-					print "</td>";
 					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
 					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
 					print "</tr>";

From ba4e97f07bb69031deefd9f5fffbb86869bcf609 Mon Sep 17 00:00:00 2001
From: atm-florian <florian.mortgat@atm-consulting.fr>
Date: Thu, 16 Jan 2025 10:37:29 +0100
Subject: [PATCH 146/243] FIX 17.0 API endpoints "PUT": prevent overwriting all
 extrafields if only some are supplied in the request cf. PR #29237 + security
 for Tickets API: disable updating rowid

---
 htdocs/adherents/class/api_members.class.php             | 6 ++++++
 htdocs/adherents/class/api_memberstypes.class.php        | 6 ++++++
 htdocs/adherents/class/api_subscriptions.class.php       | 6 ++++++
 htdocs/bom/class/api_boms.class.php                      | 6 ++++++
 htdocs/categories/class/api_categories.class.php         | 6 ++++++
 htdocs/comm/action/class/api_agendaevents.class.php      | 6 ++++++
 htdocs/comm/propal/class/api_proposals.class.php         | 6 ++++++
 htdocs/commande/class/api_orders.class.php               | 6 ++++++
 htdocs/compta/bank/class/api_bankaccounts.class.php      | 6 ++++++
 htdocs/compta/facture/class/api_invoices.class.php       | 6 ++++++
 htdocs/contrat/class/api_contracts.class.php             | 6 ++++++
 htdocs/don/class/api_donations.class.php                 | 6 ++++++
 htdocs/expedition/class/api_shipments.class.php          | 6 ++++++
 htdocs/expensereport/class/api_expensereports.class.php  | 6 ++++++
 htdocs/fourn/class/api_supplier_invoices.class.php       | 6 ++++++
 htdocs/fourn/class/api_supplier_orders.class.php         | 6 ++++++
 .../class/api_knowledgemanagement.class.php              | 6 ++++++
 .../modulebuilder/template/class/api_mymodule.class.php  | 6 ++++++
 htdocs/mrp/class/api_mos.class.php                       | 6 ++++++
 htdocs/partnership/class/api_partnership.class.php       | 6 ++++++
 htdocs/product/class/api_products.class.php              | 6 ++++++
 htdocs/product/stock/class/api_warehouses.class.php      | 6 ++++++
 htdocs/projet/class/api_projects.class.php               | 6 ++++++
 htdocs/projet/class/api_tasks.class.php                  | 6 ++++++
 htdocs/reception/class/api_receptions.class.php          | 6 ++++++
 htdocs/societe/class/api_contacts.class.php              | 6 ++++++
 htdocs/societe/class/api_thirdparties.class.php          | 6 ++++++
 htdocs/ticket/class/api_tickets.class.php                | 9 +++++++++
 htdocs/user/class/api_users.class.php                    | 6 ++++++
 29 files changed, 177 insertions(+)

diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 4ecf79d9079..a224bbdda44 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -348,6 +348,12 @@ class Members extends DolibarrApi
 					}
 				}
 			} else {
+				if ($field == 'array_options' && is_array($value)) {
+					foreach ($value as $index => $val) {
+						$member->array_options[$index] = $this->_checkValForAPI($field, $val, $member);
+					}
+					continue;
+				}
 				$member->$field = $value;
 			}
 		}
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 8179612d769..46443b7b063 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -193,6 +193,12 @@ class MembersTypes extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$membertype->array_options[$index] = $this->_checkValForAPI($field, $val, $membertype);
+				}
+				continue;
+			}
 			// Process the status separately because it must be updated using
 			// the validate(), resiliate() and exclude() methods of the class AdherentType.
 			$membertype->$field = $value;
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index dfde21dc5a1..be97312280c 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -186,6 +186,12 @@ class Subscriptions extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$subscription->array_options[$index] = $this->_checkValForAPI($field, $val, $subscription);
+				}
+				continue;
+			}
 			$subscription->$field = $value;
 		}
 
diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index 57b0d26e80a..255934368a8 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -237,6 +237,12 @@ class Boms extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->bom->array_options[$index] = $this->_checkValForAPI($field, $val, $this->bom);
+				}
+				continue;
+			}
 			$this->bom->$field = $value;
 		}
 
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 77356ba2a87..44aefd694ba 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -237,6 +237,12 @@ class Categories extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->category->array_options[$index] = $this->_checkValForAPI($field, $val, $this->category);
+				}
+				continue;
+			}
 			$this->category->$field = $value;
 		}
 
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 058de48542d..cfb933ed695 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -270,6 +270,12 @@ class AgendaEvents extends DolibarrApi
 				continue;
 			}
 
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->actioncomm->array_options[$index] = $this->_checkValForAPI($field, $val, $this->actioncomm);
+				}
+				continue;
+			}
 			$this->actioncomm->$field = $this->_checkValForAPI($field, $value, $this->actioncomm);
 		}
 
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index bbdc3cab71d..14ba90aef18 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -696,6 +696,12 @@ class Proposals extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->propal->array_options[$index] = $this->_checkValForAPI($field, $val, $this->propal);
+				}
+				continue;
+			}
 			$this->propal->$field = $value;
 		}
 
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index af460b3b459..b1571052a2b 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -652,6 +652,12 @@ class Orders extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->commande->array_options[$index] = $this->_checkValForAPI($field, $val, $this->commande);
+				}
+				continue;
+			}
 			$this->commande->$field = $value;
 		}
 
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 052c45fbc56..1da37b2c760 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -332,6 +332,12 @@ class BankAccounts extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$account->array_options[$index] = $this->_checkValForAPI($field, $val, $account);
+				}
+				continue;
+			}
 			$account->$field = $this->_checkValForAPI($field, $value, $account);
 		}
 
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 47fd0263d7e..4dfd1f023aa 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -627,6 +627,12 @@ class Invoices extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->invoice->array_options[$index] = $this->_checkValForAPI($field, $val, $this->invoice);
+				}
+				continue;
+			}
 			$this->invoice->$field = $value;
 		}
 
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index 2becf6fcfb7..5bbdf7d1525 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -510,6 +510,12 @@ class Contracts extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->contract->array_options[$index] = $this->_checkValForAPI($field, $val, $this->contract);
+				}
+				continue;
+			}
 			$this->contract->$field = $value;
 		}
 
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index fee513f2ed7..472c5f8d4b2 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -231,6 +231,12 @@ class Donations extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->don->array_options[$index] = $this->_checkValForAPI($field, $val, $this->don);
+				}
+				continue;
+			}
 			$this->don->$field = $value;
 		}
 
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index fea57fbea10..23e1b1d0c84 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -447,6 +447,12 @@ class Shipments extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->shipment->array_options[$index] = $this->_checkValForAPI($field, $val, $this->shipment);
+				}
+				continue;
+			}
 			$this->shipment->$field = $value;
 		}
 
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index c3bfeb2264d..c985c5fe813 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -420,6 +420,12 @@ class ExpenseReports extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->expensereport->array_options[$index] = $this->_checkValForAPI($field, $val, $this->expensereport);
+				}
+				continue;
+			}
 			$this->expensereport->$field = $value;
 		}
 
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index cb7072fdca1..84568f2b13c 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -263,6 +263,12 @@ class SupplierInvoices extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->invoice->array_options[$index] = $this->_checkValForAPI($field, $val, $this->invoice);
+				}
+				continue;
+			}
 			$this->invoice->$field = $value;
 		}
 
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 4ad1f951883..b56c5195ee7 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -277,6 +277,12 @@ class SupplierOrders extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->order->array_options[$index] = $this->_checkValForAPI($field, $val, $this->order);
+				}
+				continue;
+			}
 			$this->order->$field = $value;
 		}
 
diff --git a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
index 6d5c15c0dc6..7d777530166 100644
--- a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
+++ b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
@@ -298,6 +298,12 @@ class KnowledgeManagement extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->knowledgerecord->array_options[$index] = $this->_checkValForAPI($field, $val, $this->knowledgerecord);
+				}
+				continue;
+			}
 			$this->knowledgerecord->$field = $this->_checkValForAPI($field, $value, $this->knowledgerecord);
 		}
 
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index fdb56ff3c67..19bb4f50781 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -255,6 +255,12 @@ class MyModuleApi extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->myobject->array_options[$index] = $this->_checkValForAPI($field, $val, $this->myobject);
+				}
+				continue;
+			}
 			$this->myobject->$field = $this->_checkValForAPI($field, $value, $this->myobject);
 		}
 
diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index 2312f4bd636..c524d5533d6 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -238,6 +238,12 @@ class Mos extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->mo->array_options[$index] = $this->_checkValForAPI($field, $val, $this->mo);
+				}
+				continue;
+			}
 			$this->mo->$field = $value;
 		}
 
diff --git a/htdocs/partnership/class/api_partnership.class.php b/htdocs/partnership/class/api_partnership.class.php
index 13bc447c51d..f5cb7293081 100644
--- a/htdocs/partnership/class/api_partnership.class.php
+++ b/htdocs/partnership/class/api_partnership.class.php
@@ -255,6 +255,12 @@ class PartnershipApi extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->partnership->array_options[$index] = $this->_checkValForAPI($field, $val, $this->partnership);
+				}
+				continue;
+			}
 			$this->partnership->$field = $this->_checkValForAPI($field, $value, $this->partnership);
 		}
 
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index e95db77d0cc..eeb8427596a 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -361,6 +361,12 @@ class Products extends DolibarrApi
 			if ($field == 'stock_reel') {
 				throw new RestException(400, 'Stock reel cannot be updated here. Use the /stockmovements endpoint instead');
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->product->array_options[$index] = $this->_checkValForAPI($field, $val, $this->product);
+				}
+				continue;
+			}
 			$this->product->$field = $value;
 		}
 
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index a0646598d96..f39a9fa88d8 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -206,6 +206,12 @@ class Warehouses extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->warehouse->array_options[$index] = $this->_checkValForAPI($field, $val, $this->warehouse);
+				}
+				continue;
+			}
 			$this->warehouse->$field = $value;
 		}
 
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index f5c23f4b040..9eed224e99a 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -462,6 +462,12 @@ class Projects extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->project->array_options[$index] = $this->_checkValForAPI($field, $val, $this->project);
+				}
+				continue;
+			}
 			$this->project->$field = $value;
 		}
 
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index 80fede57563..bb65cfa31e5 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -460,6 +460,12 @@ class Tasks extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->task->array_options[$index] = $this->_checkValForAPI($field, $val, $this->task);
+				}
+				continue;
+			}
 			$this->task->$field = $value;
 		}
 
diff --git a/htdocs/reception/class/api_receptions.class.php b/htdocs/reception/class/api_receptions.class.php
index 55e3fa59165..70088db3455 100644
--- a/htdocs/reception/class/api_receptions.class.php
+++ b/htdocs/reception/class/api_receptions.class.php
@@ -447,6 +447,12 @@ class Receptions extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->reception->array_options[$index] = $this->_checkValForAPI($field, $val, $this->reception);
+				}
+				continue;
+			}
 			$this->reception->$field = $value;
 		}
 
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index d8839c9a122..efbc1625ea0 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -330,6 +330,12 @@ class Contacts extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->contact->array_options[$index] = $this->_checkValForAPI($field, $val, $this->contact);
+				}
+				continue;
+			}
 			$this->contact->$field = $value;
 		}
 
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index ef54c3a2299..f35521689da 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -301,6 +301,12 @@ class Thirdparties extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->company->array_options[$index] = $this->_checkValForAPI($field, $val, $this->company);
+				}
+				continue;
+			}
 			$this->company->$field = $value;
 		}
 
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index c27d9195683..d07687ff192 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -381,6 +381,15 @@ class Tickets extends DolibarrApi
 		}
 
 		foreach ($request_data as $field => $value) {
+			if ($field == 'id') {
+				continue;
+			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->ticket->array_options[$index] = $this->_checkValForAPI($field, $val, $this->ticket);
+				}
+				continue;
+			}
 			$this->ticket->$field = $value;
 		}
 
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 781de4d23cd..fadcde59d53 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -406,6 +406,12 @@ class Users extends DolibarrApi
 					throw new RestException(500, 'Error when updating status of user: '.$this->useraccount->error);
 				}
 			} else {
+				if ($field == 'array_options' && is_array($value)) {
+					foreach ($value as $index => $val) {
+						$this->useraccount->array_options[$index] = $this->_checkValForAPI($field, $val, $this->useraccount);
+					}
+					continue;
+				}
 				$this->useraccount->$field = $value;
 			}
 		}

From c01e3faea4aa0a73497586f1141d918796cbc584 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 12:09:13 +0100
Subject: [PATCH 147/243] Update eclipse rules

---
 dev/setup/eclipse/PSR-12 [built-in].xml | 455 +++++++++++++-----------
 1 file changed, 243 insertions(+), 212 deletions(-)

diff --git a/dev/setup/eclipse/PSR-12 [built-in].xml b/dev/setup/eclipse/PSR-12 [built-in].xml
index 47925209682..b55c081837c 100644
--- a/dev/setup/eclipse/PSR-12 [built-in].xml	
+++ b/dev/setup/eclipse/PSR-12 [built-in].xml	
@@ -1,215 +1,246 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <profiles>
-<profile name="PSR-12 [built-in]">
-<setting id="indentationChar" value="&#9;"/>
-<setting id="insert_space_after_opening_paren_in_declare" value="false"/>
-<setting id="insert_space_before_closing_paren_in_declare" value="false"/>
-<setting id="insert_space_before_opening_paren_in_declare" value="false"/>
-<setting id="org.eclipse.php.core.formatter.insert_new_line_in_function_invoke" value="3"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_allocation_expression_force_split" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_allocation_expression_indent_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_allocation_expression_line_wrap_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_method_invocation_force_split" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_method_invocation_indent_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_method_invocation_line_wrap_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_assignment_force_split" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_assignment_indent_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_assignment_line_wrap_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_binary_expression_force_split" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_binary_expression_indent_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_binary_expression_line_wrap_policy" value="1"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_compact_if_force_split" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_compact_if_indent_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_compact_if_line_wrap_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_conditional_expression_force_split" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_conditional_expression_indent_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_conditional_expression_line_wrap_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_expressions_in_array_initializer_force_split" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_expressions_in_array_initializer_indent_policy" value="2"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_expressions_in_array_initializer_line_wrap_policy" value="1"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_parameters_in_method_declaration_force_split" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_parameters_in_method_declaration_indent_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_parameters_in_method_declaration_line_wrap_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superclass_in_type_declaration_force_split" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superclass_in_type_declaration_indent_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superclass_in_type_declaration_line_wrap_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superinterfaces_in_type_declaration_force_split" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superinterfaces_in_type_declaration_indent_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superinterfaces_in_type_declaration_line_wrap_policy" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.blank_lines_before_field" value="1"/>
-<setting id="org.eclipse.php.formatter.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.php.formatter.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.php.formatter.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.php.formatter.core.formatter.brace_position_for_block" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.brace_position_for_lambda_function_declaration" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.brace_position_for_method_declaration" value="1"/>
-<setting id="org.eclipse.php.formatter.core.formatter.brace_position_for_switch" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.brace_position_for_type_declaration" value="1"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.format_block_comments" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.format_javadoc_comments" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.format_line_comments" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.insert_new_line_before_root_tags" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.insert_new_line_for_parameter" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.keep_empty_line_for_empty_description" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.line_length" value="1000"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.never_format_unknown_tags" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.continuation_indentation" value="1"/>
-<setting id="org.eclipse.php.formatter.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
-<setting id="org.eclipse.php.formatter.core.formatter.disabling_tag" value="@formatter:off"/>
-<setting id="org.eclipse.php.formatter.core.formatter.enabling_tag" value="@formatter:on"/>
-<setting id="org.eclipse.php.formatter.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.indent_heredocs" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.indentation.size" value="1"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_before_catch_in_try_statement" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_before_else_in_if_statement" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_before_finally_in_try_statement" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_before_while_in_do_statement" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_in_empty_block" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_in_empty_method_body" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_in_empty_type_declaration" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_arrow_in_array_creation" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_arrow_in_field_access" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_arrow_in_foreach" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_arrow_in_method_invocation" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_arrow_in_yield" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_assignment_operator" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_binary_operator" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_closing_brace_in_block" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_closing_paren_in_cast" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_colon_in_conditional" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_coloncolon_in_field_access" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_coloncolon_in_method_invocation" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_array_creation" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_echo" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_for_inits" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_global" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_list" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_multiple_constant_declarations" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_static" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_superinterfaces" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_array_creation" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_cast" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_catch" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_for" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_foreach" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_if" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_list" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_switch" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_while" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_postfix_operator" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_prefix_operator" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_question_in_conditional" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_reference_symbol_in_referenced_expression" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_semicolon_in_for" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_unary_operator" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_arrow_in_array_creation" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_arrow_in_field_access" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_arrow_in_foreach" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_arrow_in_method_invocation" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_arrow_in_yield" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_assignment_operator" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_binary_operator" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_array_creation" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_cast" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_catch" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_for" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_foreach" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_if" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_list" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_switch" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_while" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_colon_in_case" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_colon_in_conditional" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_colon_in_default" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_coloncolon_in_field_access" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_coloncolon_in_method_invocation" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_array_creation" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_echo" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_for_inits" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_global" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_list" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_multiple_constant_declarations" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_static" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_superinterfaces" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_brace_in_block" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_brace_in_switch" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_array_creation" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_catch" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_for" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_foreach" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_if" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_list" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_switch" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_while" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_postfix_operator" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_prefix_operator" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_question_in_conditional" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_semicolon" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_semicolon_in_for" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_unary_operator" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_between_brackets_in_array_type_reference" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.join_lines_in_comments" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.keep_elseif_statement_on_same_line" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.keep_imple_if_on_one_line" value="true"/>
-<setting id="org.eclipse.php.formatter.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.keep_trailing_comma_in_list" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.lineSplit" value="200"/>
-<setting id="org.eclipse.php.formatter.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_after_namespace" value="1"/>
-<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_after_use_statements" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_at_end_of_class_body" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_before_namespace" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_before_use_statements" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_between_namespaces" value="1"/>
-<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_between_use_statements" value="0"/>
-<setting id="org.eclipse.php.formatter.core.formatter.number_of_empty_lines_to_preserve" value="3"/>
-<setting id="org.eclipse.php.formatter.core.formatter.put_empty_statement_on_new_line" value="false"/>
-<setting id="org.eclipse.php.formatter.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.php.formatter.core.formatter.use_on_off_tags" value="false"/>
-</profile>
+    <profile name="PSR-2 [built-in] dolibarr">
+        <setting id="indentationChar" value="&#9;"/>
+        <setting id="insert_space_after_opening_paren_in_declare" value="false"/>
+        <setting id="insert_space_before_closing_paren_in_declare" value="false"/>
+        <setting id="insert_space_before_opening_paren_in_declare" value="false"/>
+        <setting id="org.eclipse.php.core.formatter.insert_new_line_in_function_invoke" value="3"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_allocation_expression_force_split" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_allocation_expression_indent_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_allocation_expression_line_wrap_policy" value="1"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_attribute_group_force_split" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_attribute_group_indent_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_attribute_group_line_wrap_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_match_expression_force_split" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_match_expression_indent_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_match_expression_line_wrap_policy" value="3"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_method_invocation_force_split" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_method_invocation_indent_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_method_invocation_line_wrap_policy" value="1"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_assignment_force_split" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_assignment_indent_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_assignment_line_wrap_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_binary_expression_force_split" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_binary_expression_indent_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_binary_expression_line_wrap_policy" value="1"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_compact_if_force_split" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_compact_if_indent_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_compact_if_line_wrap_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_conditional_expression_force_split" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_conditional_expression_indent_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_conditional_expression_line_wrap_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_expressions_in_array_initializer_force_split" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_expressions_in_array_initializer_indent_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_expressions_in_array_initializer_line_wrap_policy" value="3"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_parameters_in_method_declaration_force_split" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_parameters_in_method_declaration_indent_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_parameters_in_method_declaration_line_wrap_policy" value="1"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superclass_in_type_declaration_force_split" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superclass_in_type_declaration_indent_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superclass_in_type_declaration_line_wrap_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superinterfaces_in_type_declaration_force_split" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superinterfaces_in_type_declaration_indent_policy" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superinterfaces_in_type_declaration_line_wrap_policy" value="1"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.blank_lines_before_enum_case" value="1"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.blank_lines_before_field" value="1"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.blank_lines_before_member_type" value="1"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.blank_lines_before_method" value="1"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.blank_lines_between_type_declarations" value="1"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.brace_position_for_block" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.brace_position_for_lambda_function_declaration" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.brace_position_for_match" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.brace_position_for_method_declaration" value="1"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.brace_position_for_switch" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.brace_position_for_type_declaration" value="1"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.format_block_comments" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.format_header" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.format_html" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.format_javadoc_comments" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.format_line_comments" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.format_source_code" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.indent_parameter_description" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.indent_root_tags" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.insert_new_line_before_root_tags" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.insert_new_line_for_parameter" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.keep_empty_line_for_empty_description" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.line_length" value="9999"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.never_format_unknown_tags" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.continuation_indentation" value="1"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.continuation_indentation_for_array_initializer" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.disabling_tag" value="@formatter:off"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.enabling_tag" value="@formatter:on"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.indent_empty_lines" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.indent_heredocs" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.indent_match_arms_compare_to_match" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.indent_statements_compare_to_block" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.indent_statements_compare_to_body" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.indentation.size" value="1"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_before_catch_in_try_statement" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_before_else_in_if_statement" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_before_finally_in_try_statement" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_before_while_in_do_statement" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_in_empty_block" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_in_empty_method_body" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_in_empty_type_declaration" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_arrow_in_array_creation" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_arrow_in_field_access" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_arrow_in_foreach" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_arrow_in_match_arm" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_arrow_in_method_invocation" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_arrow_in_yield" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_assignment_operator" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_attribute_group_start" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_binary_operator" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_closing_brace_in_block" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_closing_paren_in_cast" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_colon_in_conditional" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_colon_in_enum_type" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_colon_in_named_argument" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_coloncolon_in_field_access" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_coloncolon_in_method_invocation" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_array_creation" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_attribute_group" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_echo" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_for_inits" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_global" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_list" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_match_arm_conditions" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_match_expressions" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_multiple_constant_declarations" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_static" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_superinterfaces" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_concatenation_operator" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_equal_in_enum_case" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_array_creation" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_cast" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_catch" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_for" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_foreach" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_if" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_list" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_match" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_switch" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_while" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_postfix_operator" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_prefix_operator" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_question_in_conditional" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_reference_symbol_in_referenced_expression" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_semicolon_in_for" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_unary_operator" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_arrow_in_array_creation" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_arrow_in_field_access" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_arrow_in_foreach" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_arrow_in_match_arm" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_arrow_in_method_invocation" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_arrow_in_yield" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_assignment_operator" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_attribute_group_end" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_binary_operator" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_array_creation" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_cast" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_catch" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_for" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_foreach" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_if" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_list" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_match" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_switch" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_while" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_colon_in_case" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_colon_in_conditional" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_colon_in_default" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_colon_in_enum_type" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_colon_in_named_argument" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_coloncolon_in_field_access" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_coloncolon_in_method_invocation" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_array_creation" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_attribute_group" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_echo" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_for_inits" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_global" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_list" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_match_arm_conditions" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_match_expressions" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_multiple_constant_declarations" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_static" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_superinterfaces" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_concatenation_operator" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_equal_in_enum_case" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_brace_in_block" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_brace_in_match" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_brace_in_switch" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_array_creation" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_catch" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_for" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_foreach" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_if" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_list" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_match" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_switch" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_while" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_postfix_operator" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_prefix_operator" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_question_in_conditional" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_semicolon" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_semicolon_in_for" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_unary_operator" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_between_brackets_in_array_type_reference" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.join_lines_in_comments" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.keep_else_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.keep_elseif_statement_on_same_line" value="true"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.keep_imple_if_on_one_line" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.keep_then_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.keep_trailing_comma_in_list" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.lineSplit" value="9999"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_after_namespace" value="1"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_after_use_statements" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_at_end_of_class_body" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_before_namespace" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_before_use_statements" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_between_namespaces" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_between_use_statements" value="0"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.put_empty_statement_on_new_line" value="false"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.tabulation.size" value="4"/>
+        <setting id="org.eclipse.php.formatter.core.formatter.use_on_off_tags" value="false"/>
+    </profile>
 </profiles>

From 05a7c16422e15a800dc8e203e966a0ccb60c2968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Fali=C3=A8re?= <benjamin.faliere@altairis.fr>
Date: Thu, 16 Jan 2025 12:09:27 +0100
Subject: [PATCH 148/243] ENH: accessibility on ticket admin page

---
 htdocs/admin/ticket.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 1ae98d5a5ec..3feb6223eda 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -1,11 +1,11 @@
 <?php
-/* Copyright (C) 2013-2018  Jean-François FERRY 	<hello@librethic.io>
- * Copyright (C) 2016       Christophe Battarel 	<christophe@altairis.fr>
- * Copyright (C) 2022-2023  Udo Tamm            	<dev@dolibit.de>
- * Copyright (C) 2023       Alexandre Spangaro  	<aspangaro@easya.solutions>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		Benjamin Falière		<benjamin.faliere@altairis.fr>
+/* Copyright (C) 2013-2018  	Jean-François FERRY 	<hello@librethic.io>
+ * Copyright (C) 2016       	Christophe Battarel 	<christophe@altairis.fr>
+ * Copyright (C) 2022-2023  	Udo Tamm            	<dev@dolibit.de>
+ * Copyright (C) 2023       	Alexandre Spangaro  	<aspangaro@easya.solutions>
+ * Copyright (C) 2024			MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       	Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024-2025		Benjamin Falière		<benjamin.faliere@altairis.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
@@ -563,7 +563,7 @@ print '</tr>';
 
 // Auto assign ticket to user who created it
 print '<tr class="oddeven">';
-print '<td>'.$langs->trans("TicketsAutoAssignTicket").'</td>';
+print '<td><label for="TICKET_AUTO_ASSIGN_USER_CREATE" class="block">'.$langs->trans("TicketsAutoAssignTicket").'</label></td>';
 print '<td class="left">';
 print '<input class="minwidth100" type="text" id="TICKET_AUTO_ASSIGN_USER_CREATE" name="TICKET_AUTO_ASSIGN_USER_CREATE" value="'.getDolGlobalString('TICKET_AUTO_ASSIGN_USER_CREATE').'">';
 print '</td>';
@@ -598,9 +598,9 @@ print '</td>';
 print '</tr>';
 
 print '<tr class="oddeven">';
-print '<td>'.$langs->trans("TicketsDelayBeforeFirstAnswer")."</td>";
+print '<td><label for="delay_first_response" class="block">'.$langs->trans("TicketsDelayBeforeFirstAnswer")."</label></td>";
 print '<td class="left">
-	<input type="number" value="'.getDolGlobalString('TICKET_DELAY_BEFORE_FIRST_RESPONSE').'" name="delay_first_response" class="width50">
+	<input type="number" value="'.getDolGlobalString('TICKET_DELAY_BEFORE_FIRST_RESPONSE').'" id="delay_first_response" name="delay_first_response" class="width50">
 	</td>';
 print '<td class="center">';
 print $formcategory->textwithpicto('', $langs->trans("TicketsDelayBeforeFirstAnswerHelp"), 1, 'help');
@@ -608,9 +608,9 @@ print '</td>';
 print '</tr>';
 
 print '<tr class="oddeven">';
-print '<td>'.$langs->trans("TicketsDelayBetweenAnswers")."</td>";
+print '<td><label for="delay_between_responses" class="block">'.$langs->trans("TicketsDelayBetweenAnswers")."</label></td>";
 print '<td class="left">
-	<input type="number" value="'.getDolGlobalString('TICKET_DELAY_SINCE_LAST_RESPONSE').'" name="delay_between_responses" class="width50">
+	<input type="number" value="'.getDolGlobalString('TICKET_DELAY_SINCE_LAST_RESPONSE').'" id="delay_between_responses" name="delay_between_responses" class="width50">
 	</td>';
 print '<td class="center">';
 print $formcategory->textwithpicto('', $langs->trans("TicketsDelayBetweenAnswersHelp"), 1, 'help');
@@ -655,18 +655,18 @@ if (!getDolGlobalString('FCKEDITOR_ENABLE_MAIL')) {
 // TODO Use module notification instead...
 
 // Email to send notifications
-print '<tr class="oddeven"><td>'.$langs->trans("TicketEmailNotificationFrom").'</td>';
+print '<tr class="oddeven"><td><label for="TICKET_NOTIFICATION_EMAIL_FROM" class="block">'.$langs->trans("TicketEmailNotificationFrom").'</label></td>';
 print '<td class="left">';
-print '<input type="text" class="minwidth200" name="TICKET_NOTIFICATION_EMAIL_FROM" value="' . getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM').'"></td>';
+print '<input type="text" class="minwidth200" id="TICKET_NOTIFICATION_EMAIL_FROM" name="TICKET_NOTIFICATION_EMAIL_FROM" value="' . getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM').'"></td>';
 print '<td class="center">';
 print $formcategory->textwithpicto('', $langs->trans("TicketEmailNotificationFromHelp"), 1, 'help');
 print '</td>';
 print '</tr>';
 
 // Email for notification of TICKET_CREATE
-print '<tr class="oddeven"><td>'.$langs->trans("TicketEmailNotificationTo").'</td>';
+print '<tr class="oddeven"><td><label for="TICKET_NOTIFICATION_EMAIL_TO" class="block">'.$langs->trans("TicketEmailNotificationTo").'</label></td>';
 print '<td class="left">';
-print '<input type="text" class="minwidth200" name="TICKET_NOTIFICATION_EMAIL_TO" value="'.getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO').'"></td>';
+print '<input type="text" class="minwidth200" id="TICKET_NOTIFICATION_EMAIL_TO" name="TICKET_NOTIFICATION_EMAIL_TO" value="'.getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO').'"></td>';
 print '<td class="center">';
 print $formcategory->textwithpicto('', $langs->trans("TicketEmailNotificationToHelp"), 1, 'help');
 print '</td>';

From 2ae7549563413cb5146868b95bed84922880328c Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 14:02:08 +0100
Subject: [PATCH 149/243] Debug v21

---
 htdocs/install/mysql/migration/20.0.0-21.0.0.sql        | 4 ++++
 htdocs/install/mysql/tables/llx_societe_account.key.sql | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql
index 2ea5cf7a51e..189922844e2 100644
--- a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql
+++ b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql
@@ -403,3 +403,7 @@ ALTER TABLE llx_societe_rib DROP INDEX uk_societe_rib;
 ALTER TABLE llx_societe_rib ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
 -- select entity, label, fk_soc, default_rib, MIN(iban_prefix), MAX(iban_prefix), MIN(rowid), MAX(rowid), COUNT(rowid) from llx_societe_rib GROUP BY entity, label, fk_soc, default_rib HAVING COUNT(rowid) > 1;
 ALTER TABLE llx_societe_rib ADD UNIQUE INDEX uk_societe_rib(entity, label, fk_soc);
+
+
+ALTER TABLE llx_societe_account DROP INDEX uk_societe_account_login_website_soc;
+ALTER TABLE llx_societe_account ADD UNIQUE INDEX uk_societe_account_login_website(entity, login, site, fk_website);
diff --git a/htdocs/install/mysql/tables/llx_societe_account.key.sql b/htdocs/install/mysql/tables/llx_societe_account.key.sql
index e889a38d527..a98272dbce7 100644
--- a/htdocs/install/mysql/tables/llx_societe_account.key.sql
+++ b/htdocs/install/mysql/tables/llx_societe_account.key.sql
@@ -22,11 +22,13 @@ ALTER TABLE llx_societe_account ADD INDEX idx_societe_account_fk_website (fk_web
 ALTER TABLE llx_societe_account ADD INDEX idx_societe_account_fk_soc (fk_soc);
 -- END MODULEBUILDER INDEXES
 
-ALTER TABLE llx_societe_account ADD UNIQUE INDEX uk_societe_account_login_website_soc(entity, fk_soc, login, site, fk_website);
+-- Only one unique login in the same website (note: we can still have the same login in database for 2 different companies if fk_website is null)
+ALTER TABLE llx_societe_account ADD UNIQUE INDEX uk_societe_account_login_website(entity, login, site, fk_website);
+-- Only one unique login in the same external account in the same company
 ALTER TABLE llx_societe_account ADD UNIQUE INDEX uk_societe_account_key_account_soc(entity, fk_soc, key_account, site, fk_website);
 
+
 -- Table website does not always exists
 --ALTER TABLE llx_societe_account ADD CONSTRAINT llx_societe_account_fk_website FOREIGN KEY (fk_website) REFERENCES llx_website(rowid);
 
 ALTER TABLE llx_societe_account ADD CONSTRAINT llx_societe_account_fk_societe FOREIGN KEY (fk_soc) REFERENCES llx_societe(rowid);
-

From 6f26816185a62f02bfac07770dfcd46779d44d6c Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 14:02:43 +0100
Subject: [PATCH 150/243] Migration

---
 htdocs/install/mysql/migration/21.0.0-22.0.0.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql
index 5af4f5bd7a9..a629c3c313e 100644
--- a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql
+++ b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql
@@ -37,6 +37,9 @@
 ALTER TABLE llx_societe_rib MODIFY COLUMN label varchar(180);
 ALTER TABLE llx_societe_rib MODIFY COLUMN iban_prefix varchar(100);
 
+ALTER TABLE llx_societe_account DROP INDEX uk_societe_account_login_website_soc;
+ALTER TABLE llx_societe_account ADD UNIQUE INDEX uk_societe_account_login_website(entity, login, site, fk_website);
+
 
 -- V22 migration
 

From d85c39e77ba9f4852f134ed23e52e3837540a59e Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 14:47:03 +0100
Subject: [PATCH 151/243] Fix CI

---
 htdocs/core/lib/functions.lib.php                             | 2 +-
 .../interface_50_modNotification_Notification.class.php       | 3 ---
 htdocs/loan/card.php                                          | 2 +-
 htdocs/user/bank.php                                          | 4 ++--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bffc520abb0..4c9a5d4cedd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9185,7 +9185,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			} elseif (property_exists($object, 'delivery_date')) {
 				$date_delivery =  $object->delivery_date;
 			}
-			$substitutionarray['__DATE_DELIVERY__'] = (isset($date_delivery) ? dol_print_date($date_delivery, 'day', 0, $outputlangs) : '');
+			$substitutionarray['__DATE_DELIVERY__'] = (isset($date_delivery) ? dol_print_date($date_delivery, 'day', false, $outputlangs) : '');
 			$substitutionarray['__DATE_DELIVERY_DAY__'] = (isset($date_delivery) ? dol_print_date($date_delivery, "%d") : '');
 			$substitutionarray['__DATE_DELIVERY_DAY_TEXT__'] = (isset($date_delivery) ? dol_print_date($date_delivery, "%A") : '');
 			$substitutionarray['__DATE_DELIVERY_MON__'] = (isset($date_delivery) ? dol_print_date($date_delivery, "%m") : '');
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index c3bdc971328..86bf821cd36 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -99,9 +99,6 @@ class InterfaceNotification extends DolibarrTriggers
 		$notify = new Notify($this->db);
 		$resultSend = $notify->send($action, $object);
 		if ($resultSend < 0) {
-			if (!isset($this->errors)) {
-				$this->errors = [];
-			}
 			$this->errors = array_merge($this->errors, $notify->errors);
 			return $resultSend;
 		}
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index f0025e642a6..aefbc83ca92 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -205,7 +205,7 @@ if (empty($reshook)) {
 				$object->capital = $capital;
 
 				$object->nbterm = GETPOSTINT("nbterm");
-				$object->rate = price2num(GETPOST("rate", 'alpha'));
+				$object->rate = GETPOSTFLOAT("rate");
 				$object->insurance_amount = GETPOSTFLOAT('insurance_amount');
 
 				$accountancy_account_capital = GETPOST('accountancy_account_capital');
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 0a9a378fb35..edd8ff48472 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -125,7 +125,7 @@ if ($user->hasRight('salaries', 'readall')) {
 if ($user->hasRight('hrm', 'read')) {
 	$ok = true;
 }
-if ($user->hasRight('expensereport', 'readall') || ($user->hasRight('expensereport', 'readall') && in_array($object->id, $childids))) {
+if ($user->hasRight('expensereport', 'readall') || ($user->hasRight('expensereport', 'read') && in_array($object->id, $childids))) {
 	$ok = true;
 }
 if ($user->hasRight('holiday', 'readall') || ($user->hasRight('holiday', 'read') && in_array($object->id, $childids))) {
@@ -778,7 +778,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 
 	// Latest expense report
 	if (isModEnabled('expensereport') &&
-		($user->hasRight('expensereport', 'readall') || ($user->hasRight('expensereport', 'lire') && $object->id == $user->id))
+		($user->hasRight('expensereport', 'readall') || ($user->hasRight('expensereport', 'read') && $object->id == $user->id))
 	) {
 		$exp = new ExpenseReport($db);
 

From eaa51fed7b4e18d494d47fd9db8061aa5c95518b Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Wed, 15 Jan 2025 20:01:40 +0100
Subject: [PATCH 152/243] accounting: fix num_rows without call from $db

$res->num_rows will not work on PostgreSQL. $db->num_rows() must be used
instead to execute the correct procedure depending on the database
backend.
---
 htdocs/core/lib/accounting.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index e3876491055..ff23193441e 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -295,7 +295,7 @@ function getDefaultDatesForTransfer()
 		$sql .= " WHERE date_start < '".$db->idate(dol_now())."' AND date_end > '".$db->idate(dol_now())."'";
 		$sql .= $db->plimit(1);
 		$res = $db->query($sql);
-		if ($res->num_rows > 0) {
+		if ($db->num_rows($res) > 0) {
 			$obj = $db->fetch_object($res);
 
 			$date_start = $db->jdate($obj->date_start);

From 63c991413ee7db10a44ff7458a13b58f0881b662 Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Wed, 15 Jan 2025 20:01:40 +0100
Subject: [PATCH 153/243] api_thirdparties: fix num_rows typo

$res->num_rows will not work on PostgreSQL. $db->num_rows() must be used
instead to execute the correct procedure depending on the database
backend.

But the call was not written properly and both were mixed up in commit
25741a618ebc162af25ede4936b8087f580e85bf which used $db->num_rows, and
then fixed in 72c443868c235c31cb192c1202d277b6df4cd380 which used
$db->num_rows($result) where suited, except this location.
---
 htdocs/societe/class/api_thirdparties.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 4461bb644e3..9f1049544cf 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1865,7 +1865,7 @@ class Thirdparties extends DolibarrApi
 		$result = $this->db->query($sql);
 
 		// We do not found an existing SocieteAccount entity for this fk_soc and site ; we then create a new one.
-		if ($result && $this->db->num_rows == 0) {
+		if ($result && $this->db->num_rows($result) == 0) {
 			if (!isset($request_data['key_account'])) {
 				throw new RestException(422, 'Unprocessable Entity: You must pass the key_account attribute in your request data !');
 			}

From 4acacc2e9ffcabb857883e2aeb13795ed466ffe9 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 15:19:36 +0100
Subject: [PATCH 154/243] Debug v21 - fix js warnings

---
 htdocs/core/class/html.form.class.php | 42 +++++++++++++--------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a6cce4e7bfb..16ab5f8f1b9 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9044,7 +9044,7 @@ class Form
 	 */
 	public static function selectArrayAjax($htmlname, $url, $id = '', $moreparam = '', $moreparamtourl = '', $disabled = 0, $minimumInputLength = 1, $morecss = '', $callurlonselect = 0, $placeholder = '', $acceptdelayedhtml = 0)
 	{
-		global $conf, $langs;
+		global $conf;
 		global $delayedhtmlcontent;    // Will be used later outside of this function
 
 		// TODO Use an internal dolibarr component instead of select2
@@ -9091,9 +9091,9 @@ class Form
 				    		},
 				    		cache: true
 				    	},
-		 				language: select2arrayoflanguage,
+		 				language: select2arrayoflanguage || \'en\',
 						containerCssClass: \':all:\',					/* Line to add class from the original SELECT propagated to the new <span class="select2-selection...> tag */
-					    placeholder: "' . dol_escape_js($placeholder) . '",
+					    placeholder: \'' . dol_escape_js($placeholder) . '\',
 				    	escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work
 				    	minimumInputLength: ' . ((int) $minimumInputLength) . ',
 				        formatResult: function (result, container, query, escapeMarkup) {
@@ -9104,9 +9104,9 @@ class Form
 	                ' . ($callurlonselect ? '
 	                /* Code to execute a GET when we select a value */
 	                $(".' . $htmlname . '").change(function() {
-				    	var selected = $(".' . $htmlname . '").val();
+				    	var selected = $(\'.' . dol_escape_js($htmlname) . '\').val();
 	                	console.log("We select in selectArrayAjax the entry "+selected)
-				        $(".' . $htmlname . '").val("");  /* reset visible combo value */
+				        $(\'.' . dol_escape_js($htmlname) . '\').val("");  /* reset visible combo value */
 	    			    $.each( saveRemoteData, function( key, value ) {
 	    				        if (key == selected)
 	    			            {
@@ -9149,7 +9149,7 @@ class Form
 	 */
 	public static function selectArrayFilter($htmlname, $array, $id = '', $moreparam = '', $disableFiltering = 0, $disabled = 0, $minimumInputLength = 1, $morecss = '', $callurlonselect = 0, $placeholder = '', $acceptdelayedhtml = 0, $textfortitle = '')
 	{
-		global $conf, $langs;
+		global $conf;
 		global $delayedhtmlcontent;    // Will be used later outside of this function
 
 		// TODO Use an internal dolibarr component instead of select2
@@ -9179,13 +9179,13 @@ class Form
 
 					' . ($callurlonselect ? 'var saveRemoteData = ' . json_encode($array) . ';' : '') . '
 
-					$(".' . $htmlname . '").select2({
+					$(\'.' . dol_escape_js($htmlname) . '\').select2({
 						data: data,
-						language: select2arrayoflanguage,
+						language: select2arrayoflanguage || \'en\',
 						containerCssClass: \':all:\',					/* Line to add class from the original SELECT propagated to the new <span class="select2-selection...> tag */
-						placeholder: "' . dol_escape_js($placeholder) . '",
+						placeholder: \'' . dol_escape_js($placeholder) . '\',
 						escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work
-						minimumInputLength: ' . $minimumInputLength . ',
+						minimumInputLength: ' . ((int) $minimumInputLength) . ',
 						formatResult: function (result, container, query, escapeMarkup) {
 							return escapeMarkup(result.text);
 						},
@@ -9224,11 +9224,11 @@ class Form
 
 					' . ($callurlonselect ? '
 					/* Code to execute a GET when we select a value */
-					$(".' . $htmlname . '").change(function() {
-						var selected = $(".' . $htmlname . '").val();
+					$(\'.' . dol_escape_js($htmlname) . '\').change(function() {
+						var selected = $(\'.' . dol_escape_js($htmlname) . '\').val();
 						console.log("We select "+selected)
 
-						$(".' . $htmlname . '").val("");  /* reset visible combo value */
+						$(\'.' . dol_escape_js($htmlname) . '\').val("");  /* reset visible combo value */
 						$.each( saveRemoteData, function( key, value ) {
 							if (key == selected)
 							{
@@ -9357,7 +9357,7 @@ class Form
 				}
 				$out .= '}' . "\n";
 				$out .= '$(document).ready(function () {
-							$(\'#' . $htmlname . '\').' . $tmpplugin . '({';
+							$(\'#' . dol_escape_js($htmlname) . '\').' . $tmpplugin . '({';
 				if ($placeholder) {
 					$out .= '
 								placeholder: {
@@ -9367,7 +9367,7 @@ class Form
 				}
 				$out .= '		dir: \'ltr\',
 								containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag (ko with multiselect) */
-								dropdownCssClass: \'' . $morecss . '\',				/* Line to add class on the new <span class="select2-selection...> tag (ok with multiselect). Need full version of select2. */
+								dropdownCssClass: \'' . dol_escape_js($morecss) . '\',				/* Line to add class on the new <span class="select2-selection...> tag (ok with multiselect). Need full version of select2. */
 								// Specify format function for dropdown item
 								formatResult: formatResult,
 							 	templateResult: formatResult,		/* For 4.0 */
@@ -9375,26 +9375,26 @@ class Form
 								// Specify format function for selected item
 								formatSelection: formatSelection,
 							 	templateSelection: formatSelection,		/* For 4.0 */
-							 	language: select2arrayoflanguage
+							 	language: select2arrayoflanguage || \'en\'
 							});
 
 							/* Add also morecss to the css .select2 that is after the #htmlname, for component that are show dynamically after load, because select2 set
 								 the size only if component is not hidden by default on load */
-							$(\'#' . $htmlname . ' + .select2\').addClass(\'' . $morecss . '\');
+							$(\'#' . dol_escape_js($htmlname) . ' + .select2\').addClass(\'' . dol_escape_js($morecss) . '\');
 						});' . "\n";
 			} elseif ($addjscombo == 2 && !defined('DISABLE_MULTISELECT')) {
 				// Add other js lib
 				// TODO external lib multiselect/jquery.multi-select.js must have been loaded to use this multiselect plugin
 				// ...
-				$out .= 'console.log(\'addjscombo=2 for htmlname=' . $htmlname . '\');';
+				$out .= 'console.log(\'addjscombo=2 for htmlname=' . dol_escape_js($htmlname) . '\');';
 				$out .= '$(document).ready(function () {
-							$(\'#' . $htmlname . '\').multiSelect({
+							$(\'#' . dol_escape_js($htmlname) . '\').multiSelect({
 								containerHTML: \'<div class="multi-select-container">\',
 								menuHTML: \'<div class="multi-select-menu">\',
-								buttonHTML: \'<span class="multi-select-button ' . $morecss . '">\',
+								buttonHTML: \'<span class="multi-select-button ' . dol_escape_js($morecss) . '">\',
 								menuItemHTML: \'<label class="multi-select-menuitem">\',
 								activeClass: \'multi-select-container--open\',
-								noneText: \'' . $placeholder . '\'
+								noneText: \'' . dol_escape_js($placeholder) . '\'
 							});
 						})';
 			}

From 70a476a83006defe8863d494c01026900b2cc23e Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 15:24:09 +0100
Subject: [PATCH 155/243] Fix js warning

---
 htdocs/core/lib/ajax.lib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 8378d992bd3..7fdc149ff89 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -489,14 +489,14 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 	$msg = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' -->
 		<script>
 			$(document).ready(function () {
-				$(\''.(preg_match('/^\./', $htmlname) ? $htmlname : '#'.$htmlname).'\').'.$tmpplugin.'({
+				$(\''.(dol_escape_js(preg_match('/^\./', $htmlname) ? $htmlname : '#'.$htmlname)).'\').'.$tmpplugin.'({
 					dir: \'ltr\',';
 	if (preg_match('/onrightofpage/', $morecss)) {	// when $morecss contains 'onrightofpage', the select2 component must also be inside a parent with class="parentonrightofpage"
 		$msg .= ' dropdownAutoWidth: true, dropdownParent: $(\'#'.$htmlname.'\').parent(), '."\n";
 	}
 	$msg .= '		width: \''.dol_escape_js($widthTypeOfAutocomplete).'\',		/* off or resolve */
 					minimumInputLength: '.((int) $minLengthToAutocomplete).',
-					language: select2arrayoflanguage,
+					language: select2arrayoflanguage || \'en\',
 					matcher: function (params, data) {
 						if ($.trim(params.term) === "") {
 							return data;
@@ -509,7 +509,7 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 						}
 						return data;
 					},
-					theme: \'default'.$moreselect2theme.'\',		/* to add css on generated html components */
+					theme: \'default'.dol_escape_js($moreselect2theme).'\',		/* to add css on generated html components */
 					containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */
 					selectionCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */
 					dropdownCssClass: \'ui-dialog\',

From 5e7ed6ba6dced9ac109fc8991625dcea041900b8 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 15:32:08 +0100
Subject: [PATCH 156/243] Try better fix for js warning

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

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 7fdc149ff89..cbeb65f53a5 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -496,7 +496,7 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 	}
 	$msg .= '		width: \''.dol_escape_js($widthTypeOfAutocomplete).'\',		/* off or resolve */
 					minimumInputLength: '.((int) $minLengthToAutocomplete).',
-					language: select2arrayoflanguage || \'en\',
+					language: (typeof select2arrayoflanguage === \'undefined\') ? \'en\' : select2arrayoflanguage),
 					matcher: function (params, data) {
 						if ($.trim(params.term) === "") {
 							return data;

From a233abdcc5e7d2f87ae9ba24cf69d8093d5da74b Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 15:33:00 +0100
Subject: [PATCH 157/243] Fix sql error

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

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index cbeb65f53a5..933a6422512 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -496,7 +496,7 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 	}
 	$msg .= '		width: \''.dol_escape_js($widthTypeOfAutocomplete).'\',		/* off or resolve */
 					minimumInputLength: '.((int) $minLengthToAutocomplete).',
-					language: (typeof select2arrayoflanguage === \'undefined\') ? \'en\' : select2arrayoflanguage),
+					language: (typeof select2arrayoflanguage === \'undefined\') ? \'en\' : select2arrayoflanguage,
 					matcher: function (params, data) {
 						if ($.trim(params.term) === "") {
 							return data;

From 84d982cdfbd4e172a63617d3edf5271ad9eb4b5b Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 15:35:17 +0100
Subject: [PATCH 158/243] Fix js warning

---
 htdocs/core/class/html.form.class.php | 6 +++---
 htdocs/societe/card.php               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 16ab5f8f1b9..847d8fe8027 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9091,7 +9091,7 @@ class Form
 				    		},
 				    		cache: true
 				    	},
-		 				language: select2arrayoflanguage || \'en\',
+		 				language: (typeof select2arrayoflanguage === \'undefined\') ? \'en\' : select2arrayoflanguage,
 						containerCssClass: \':all:\',					/* Line to add class from the original SELECT propagated to the new <span class="select2-selection...> tag */
 					    placeholder: \'' . dol_escape_js($placeholder) . '\',
 				    	escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work
@@ -9181,7 +9181,7 @@ class Form
 
 					$(\'.' . dol_escape_js($htmlname) . '\').select2({
 						data: data,
-						language: select2arrayoflanguage || \'en\',
+						language: (typeof select2arrayoflanguage === \'undefined\') ? \'en\' : select2arrayoflanguage,
 						containerCssClass: \':all:\',					/* Line to add class from the original SELECT propagated to the new <span class="select2-selection...> tag */
 						placeholder: \'' . dol_escape_js($placeholder) . '\',
 						escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work
@@ -9375,7 +9375,7 @@ class Form
 								// Specify format function for selected item
 								formatSelection: formatSelection,
 							 	templateSelection: formatSelection,		/* For 4.0 */
-							 	language: select2arrayoflanguage || \'en\'
+							 	language: (typeof select2arrayoflanguage === \'undefined\') ? \'en\' : select2arrayoflanguage
 							});
 
 							/* Add also morecss to the css .select2 that is after the #htmlname, for component that are show dynamically after load, because select2 set
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 470acf88c76..fd29d86a584 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1375,7 +1375,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					placeholder: "' . $langs->trans('Name of the new third party. In the meantime we check if it already exists...') . '",
 					allowClear: true,
 					minimumInputLength: 3,
-					language: select2arrayoflanguage,
+					language: (typeof select2arrayoflanguage === \'undefined\') ? \'en\' : select2arrayoflanguage,
 					containerCssClass: ":all:",
 					selectionCssClass: ":all:",
 					tags: true,

From f97b2f44cd4d216d9dd1f8dc3f1999fc35cdd4cb Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 17:27:22 +0100
Subject: [PATCH 159/243] Debug v21 - Fix export in accountancy

---
 htdocs/accountancy/journal/sellsjournal.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 2b166dff8d9..d634288e372 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -233,7 +233,7 @@ if ($result) {
 		$obj = $db->fetch_object($result);
 
 		// Controls
-		$accountancy_code_customer_general = (!empty($obj->accountancy_code_customer_general)) ? $obj->accountancy_code_customer_general : $cptcli;
+		$accountancy_code_customer_general = (!empty($obj->accountancy_code_customer_general) && $obj->accountancy_code_customer_general != '-1') ? $obj->accountancy_code_customer_general : $cptcli;
 		$compta_soc = (!empty($obj->code_compta_client)) ? $obj->code_compta_client : $cptcli;
 
 		$compta_prod = $obj->compte;
@@ -611,7 +611,7 @@ if ($action == 'writebookkeeping' && !$error && $user->hasRight('accounting', 'b
 				$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 				$bookkeeping->subledger_label = $tabcompany[$key]['name'];
 
-				$bookkeeping->numero_compte = !empty($tabcompany[$key]['accountancy_code_customer_general']) ? $tabcompany[$key]['accountancy_code_customer_general'] : $cptcli;
+				$bookkeeping->numero_compte = (!empty($tabcompany[$key]['accountancy_code_customer_general']) && $tabcompany[$key]['accountancy_code_customer_general'] != '-1') ? $tabcompany[$key]['accountancy_code_customer_general'] : $cptcli;
 				$bookkeeping->label_compte = $accountingaccountcustomer->label;
 
 				$bookkeeping->label_operation = $bookkeepingstatic->accountingLabelForOperation($companystatic->name, $invoicestatic->ref, $langs->trans("SubledgerAccount"));
@@ -920,7 +920,7 @@ if ($action == 'exportcsv' && !$error) {		// ISO and not UTF8 !
 	foreach ($tabfac as $key => $val) {
 		$companystatic->id = $tabcompany[$key]['id'];
 		$companystatic->name = $tabcompany[$key]['name'];
-		$companystatic->accountancy_code_customer_general = !empty($tabcompany[$key]['accountancy_code_customer_general']) ? $tabcompany[$key]['accountancy_code_customer_general'] : $cptcli;
+		$companystatic->accountancy_code_customer_general = (!empty($tabcompany[$key]['accountancy_code_customer_general']) && $tabcompany[$key]['accountancy_code_customer_general'] != '-1') ? $tabcompany[$key]['accountancy_code_customer_general'] : $cptcli;
 		$companystatic->code_compta = $tabcompany[$key]['code_compta'];				// deprecated
 		$companystatic->code_compta_client = $tabcompany[$key]['code_compta'];
 		$companystatic->code_client = $tabcompany[$key]['code_client'];
@@ -1174,7 +1174,7 @@ if (empty($action) || $action == 'view') {
 	foreach ($tabfac as $key => $val) {
 		$companystatic->id = $tabcompany[$key]['id'];
 		$companystatic->name = $tabcompany[$key]['name'];
-		$companystatic->accountancy_code_customer_general = !empty($tabcompany[$key]['accountancy_code_customer_general']) ? $tabcompany[$key]['accountancy_code_customer_general'] : $cptcli;
+		$companystatic->accountancy_code_customer_general = (!empty($tabcompany[$key]['accountancy_code_customer_general']) && $tabcompany[$key]['accountancy_code_customer_general'] != '-1') ? $tabcompany[$key]['accountancy_code_customer_general'] : $cptcli;
 		$companystatic->code_compta = $tabcompany[$key]['code_compta'];
 		$companystatic->code_compta_client = $tabcompany[$key]['code_compta'];
 		$companystatic->code_client = $tabcompany[$key]['code_client'];
@@ -1281,7 +1281,7 @@ if (empty($action) || $action == 'view') {
 			// Account
 			print "<td>";
 			$accountoshow = length_accountg($companystatic->accountancy_code_customer_general);
-			if (($accountoshow == "") || $accountoshow == 'NotDefined') {
+			if (($accountoshow == "") || $accountoshow == "-1" || $accountoshow == 'NotDefined') {
 				print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
 			} else {
 				print $accountoshow;

From 5dca2a2d411ca872b60f97d48274f47b022649fa Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 17:27:22 +0100
Subject: [PATCH 160/243] Debug v21 - Fix export in accountancy

---
 htdocs/accountancy/journal/sellsjournal.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 2b166dff8d9..d634288e372 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -233,7 +233,7 @@ if ($result) {
 		$obj = $db->fetch_object($result);
 
 		// Controls
-		$accountancy_code_customer_general = (!empty($obj->accountancy_code_customer_general)) ? $obj->accountancy_code_customer_general : $cptcli;
+		$accountancy_code_customer_general = (!empty($obj->accountancy_code_customer_general) && $obj->accountancy_code_customer_general != '-1') ? $obj->accountancy_code_customer_general : $cptcli;
 		$compta_soc = (!empty($obj->code_compta_client)) ? $obj->code_compta_client : $cptcli;
 
 		$compta_prod = $obj->compte;
@@ -611,7 +611,7 @@ if ($action == 'writebookkeeping' && !$error && $user->hasRight('accounting', 'b
 				$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 				$bookkeeping->subledger_label = $tabcompany[$key]['name'];
 
-				$bookkeeping->numero_compte = !empty($tabcompany[$key]['accountancy_code_customer_general']) ? $tabcompany[$key]['accountancy_code_customer_general'] : $cptcli;
+				$bookkeeping->numero_compte = (!empty($tabcompany[$key]['accountancy_code_customer_general']) && $tabcompany[$key]['accountancy_code_customer_general'] != '-1') ? $tabcompany[$key]['accountancy_code_customer_general'] : $cptcli;
 				$bookkeeping->label_compte = $accountingaccountcustomer->label;
 
 				$bookkeeping->label_operation = $bookkeepingstatic->accountingLabelForOperation($companystatic->name, $invoicestatic->ref, $langs->trans("SubledgerAccount"));
@@ -920,7 +920,7 @@ if ($action == 'exportcsv' && !$error) {		// ISO and not UTF8 !
 	foreach ($tabfac as $key => $val) {
 		$companystatic->id = $tabcompany[$key]['id'];
 		$companystatic->name = $tabcompany[$key]['name'];
-		$companystatic->accountancy_code_customer_general = !empty($tabcompany[$key]['accountancy_code_customer_general']) ? $tabcompany[$key]['accountancy_code_customer_general'] : $cptcli;
+		$companystatic->accountancy_code_customer_general = (!empty($tabcompany[$key]['accountancy_code_customer_general']) && $tabcompany[$key]['accountancy_code_customer_general'] != '-1') ? $tabcompany[$key]['accountancy_code_customer_general'] : $cptcli;
 		$companystatic->code_compta = $tabcompany[$key]['code_compta'];				// deprecated
 		$companystatic->code_compta_client = $tabcompany[$key]['code_compta'];
 		$companystatic->code_client = $tabcompany[$key]['code_client'];
@@ -1174,7 +1174,7 @@ if (empty($action) || $action == 'view') {
 	foreach ($tabfac as $key => $val) {
 		$companystatic->id = $tabcompany[$key]['id'];
 		$companystatic->name = $tabcompany[$key]['name'];
-		$companystatic->accountancy_code_customer_general = !empty($tabcompany[$key]['accountancy_code_customer_general']) ? $tabcompany[$key]['accountancy_code_customer_general'] : $cptcli;
+		$companystatic->accountancy_code_customer_general = (!empty($tabcompany[$key]['accountancy_code_customer_general']) && $tabcompany[$key]['accountancy_code_customer_general'] != '-1') ? $tabcompany[$key]['accountancy_code_customer_general'] : $cptcli;
 		$companystatic->code_compta = $tabcompany[$key]['code_compta'];
 		$companystatic->code_compta_client = $tabcompany[$key]['code_compta'];
 		$companystatic->code_client = $tabcompany[$key]['code_client'];
@@ -1281,7 +1281,7 @@ if (empty($action) || $action == 'view') {
 			// Account
 			print "<td>";
 			$accountoshow = length_accountg($companystatic->accountancy_code_customer_general);
-			if (($accountoshow == "") || $accountoshow == 'NotDefined') {
+			if (($accountoshow == "") || $accountoshow == "-1" || $accountoshow == 'NotDefined') {
 				print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
 			} else {
 				print $accountoshow;

From 7c31549f710d10db8b12261373a596c0490473e8 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 16 Jan 2025 17:13:15 +0100
Subject: [PATCH 161/243] FIX societe.class.php uses getCountry, provided by
 company.lib

# FIX Societe.class.php uses getCountry, provided by company.lib

Include company.lib.php in societe.class.php.
The SocieteTest.php test failed when run independently on windows.
---
 htdocs/societe/class/societe.class.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index a1a3b9306bb..bc371942fb3 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2002-2006	Rodolphe Quiedeville		<rodolphe@quiedeville.org>
  * Copyright (C) 2004-2021	Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2004		Eric Seigne					<eric.seigne@ryxeo.com>
@@ -20,7 +21,7 @@
  * Copyright (C) 2022		ButterflyOfFire				<butterflyoffire+dolibarr@protonmail.com>
  * Copyright (C) 2023-2024	Alexandre Janniaux			<alexandre.janniaux@gmail.com>
  * Copyright (C) 2024		William Mead				<william.mead@manchenumerique.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -45,6 +46,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonsocialnetworks.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonpeople.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
 
@@ -3192,7 +3194,7 @@ class Societe extends CommonObject
 		if (empty($option) || preg_match('/customer/', $option)) {
 			if (($this->client == 1 || $this->client == 3) && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
 				$s .= '<'.$tag.' class="customer-back" title="'.dolPrintHTMLForAttribute($langs->trans("Customer")).'"';
-				$s.= $tag == 'a' ? ' href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id.'"' : '';
+				$s .= $tag == 'a' ? ' href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id.'"' : '';
 				$s .= '>'.dol_substr($langs->trans("Customer"), 0, 1).'</'.$tag.'>';
 			}
 		}

From eadf4c9f5999ee60394172a4bcdd60e2295b9b28 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 16 Jan 2025 17:23:13 +0100
Subject: [PATCH 162/243] Qual: Remove var_dump and exit from SocieteTest

---
 test/phpunit/SocieteTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 79f40128c59..65ac7f70d96 100644
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -1,7 +1,9 @@
 <?php
+
 /* Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023 Alexandre Janniaux   <alexandre.janniaux@gmail.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -100,7 +102,6 @@ class SocieteTest extends CommonClassTest
 		$localobject->country_code = 'ES';
 
 		$result = $localobject->create($user);
-		var_dump($localobject);exit;
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThanOrEqual($result, 0);

From 8ac29f71fbb6912118c7d8bdb90e764de94ee22d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 16 Jan 2025 17:47:56 +0100
Subject: [PATCH 163/243] Qual: Fix
 dolPrintHtmlForAttribute->dolPrintHTMLForAttribute

# Qual: Fix dolPrintHtmlForAttribute->dolPrintHTMLForAttribute

Make printed text correspond to executed statement
---
 test/phpunit/test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/phpunit/test.php b/test/phpunit/test.php
index bd471275f1f..2e20c7a5cc0 100755
--- a/test/phpunit/test.php
+++ b/test/phpunit/test.php
@@ -57,12 +57,12 @@ print "\n";
 print "\n";
 
 // dol_escape_htmltag(dol_string_onlythesehtmltags(dol_htmlentitiesbr($s), 1, 0, 0, 0, array('br', 'b', 'font', 'hr', 'span')), 1, -1, '', 0, 1);
-print ">>> dolPrintHtmlForattribute(< > bb<b>bold</b> ç & )\n";
+print ">>> dolPrintHTMLForAttribute(< > bb<b>bold</b> ç & )\n";
 print dolPrintHTMLForAttribute("< > bb<b>bold</b> ç &");
 print "\n";
 print ">>> dolPrintHTMLForAttribute(&lt; &gt; bb<b>bold</b> ç &)\n";
 print dolPrintHTMLForAttribute("&lt; &gt; bb<b>bold</b> ç &");
 print "\n";
-print '>>> dolPrintHtmlForattribute(&lt;script&gt;alert("azerty")&lt;/script&gt;)'."\n";
+print '>>> dolPrintHTMLForAttribute(&lt;script&gt;alert("azerty")&lt;/script&gt;)'."\n";
 print dolPrintHTMLForAttribute('&lt;script&gt;alert("azerty")&lt;/script&gt;');
 print "\n";

From 8b788773cde3c323783a1b8e8a1e3528acf3a15f Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 17:54:56 +0100
Subject: [PATCH 164/243] Fix transfer in accountancy when general account was
 empty to -1

---
 htdocs/accountancy/journal/bankjournal.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index a50430b06dd..a108c040353 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -297,11 +297,11 @@ if ($result) {
 		$compta_soc = 'NotDefined';
 		$accountancy_code_general = 'NotDefined';
 		if ($lineisapurchase > 0) {
-			$accountancy_code_general = (!empty($obj->accountancy_code_supplier_general)) ? $obj->accountancy_code_supplier_general : $account_supplier;
+			$accountancy_code_general = (!empty($obj->accountancy_code_supplier_general) && $obj->accountancy_code_supplier_general != '-1') ? $obj->accountancy_code_supplier_general : $account_supplier;
 			$compta_soc = (($obj->code_compta_fournisseur != "") ? $obj->code_compta_fournisseur : $account_supplier);
 		}
 		if ($lineisasale > 0) {
-			$accountancy_code_general = (!empty($obj->accountancy_code_customer_general)) ? $obj->accountancy_code_customer_general : $account_customer;
+			$accountancy_code_general = (!empty($obj->accountancy_code_customer_general) && $obj->accountancy_code_customer_general != '-1') ? $obj->accountancy_code_customer_general : $account_customer;
 			$compta_soc = (!empty($obj->code_compta_client) ? $obj->code_compta_client : $account_customer);
 		}
 

From 6b31c69c8b872ef8f5e554bb59ae200ec1febc2e Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 18:22:46 +0100
Subject: [PATCH 165/243] Debug v21

---
 htdocs/user/bank.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index edd8ff48472..61fadf541b6 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -629,12 +629,22 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		if ($action == 'editaccountancycodeusergeneral' && $user->hasRight('user', 'user', 'creer')) {
 			print $formaccounting->formAccountingAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->accountancy_code_user_general, 'accountancycodeusergeneral', 0, 1, '', 1);
 		} else {
-			$accountingaccount = new AccountingAccount($db);
-			$accountingaccount->fetch(0, $object->accountancy_code_user_general, 1);
-			print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
+			if (!empty($object->accountancy_code_user_general) && $object->accountancy_code_user_general != '-1') {
+				$accountingaccount = new AccountingAccount($db);
+				$accountingaccount->fetch(0, $object->accountancy_code_user_general, 1);
+				print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
+			}
 		}
-		$accountingAccountByDefault = " (" . $langs->trans("AccountingAccountByDefaultShort") . ": " . length_accountg(getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT')) . ")";
+		print '<span class="opacitymedium">';
+		if (!empty($object->accountancy_code_user_general) && $object->accountancy_code_user_general != '-1') {
+			print ' (';
+		}
+		$accountingAccountByDefault = $langs->trans("AccountingAccountByDefaultShort") . ": " . length_accountg(getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT'));
 		print (getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') ? $accountingAccountByDefault : '');
+		if (!empty($object->accountancy_code_user_general) && $object->accountancy_code_user_general != '-1') {
+			print ')';
+		}
+		print '</span>';
 		print '</td>';
 
 		// Accountancy code

From a52a218ae42f0e8114ec44591780026855391f02 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Thu, 16 Jan 2025 19:17:47 +0100
Subject: [PATCH 166/243] Use same patch like in #26454

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index ea9c7f6b830..4860fe9c34a 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5016,7 +5016,7 @@ class Product extends CommonObject
 				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty'],2=>$rec['fk_product_type']);
 				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']);
 				if (empty($firstlevelonly)) {
-					array_push($parents, $rec['rowid']);
+					$parents[] = $rec['rowid'];
 					$listofchilds = $this->getChildsArbo($rec['rowid'], 0, $level + 1, $parents);
 					foreach ($listofchilds as $keyChild => $valueChild) {
 						$prods[$rec['rowid']]['childs'][$keyChild] = $valueChild;

From 4bf6511811c292de5920b2f82ecc54c958e4ede6 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 22:03:51 +0100
Subject: [PATCH 167/243] Debug v21 - getCustomerAccount return duplicates.
 Misssing a key.

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

diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index add72341158..2a6447d6ca1 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -269,7 +269,6 @@ class SocieteAccount extends CommonObject
 	 */
 	public function createFromClone(User $user, $fromid)
 	{
-		global $hookmanager, $langs;
 		$error = 0;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -345,18 +344,25 @@ class SocieteAccount extends CommonObject
 	 *
 	 * @param	int		$id				Id of third party
 	 * @param	string	$site			Site (example: 'stripe', '...')
-	 * @param	int		$status			Status (0=test, 1=live)
+	 * @param	int		$status			Status (0=test, 1=live, -1=we don't mind)
 	 * @param	string	$site_account 	Value to use to identify with account to use on site when site can offer several accounts. For example: 'pk_live_123456' when using Stripe service.
+	 * @param	string	$fk_website		Id website
 	 * @return	string					Stripe customer ref 'cu_xxxxxxxxxxxxx' or ''
 	 * @see getThirdPartyID()
 	 */
-	public function getCustomerAccount($id, $site, $status = 0, $site_account = '')
+	public function getCustomerAccount($id, $site, $status = 0, $site_account = '', $fk_website = 0)
 	{
 		$sql = "SELECT sa.key_account as key_account, sa.entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account as sa";
 		$sql .= " WHERE sa.fk_soc = ".((int) $id);
 		$sql .= " AND sa.entity IN (".getEntity('societe').")";
-		$sql .= " AND sa.site = '".$this->db->escape($site)."' AND sa.status = ".((int) $status);
+		$sql .= " AND sa.site = '".$this->db->escape($site)."'";
+		if ($fk_website > 0) {
+			$sql .= " AND sa.fk_website = ".((int) $fk_website);
+		}
+		if ($status >= 0) {
+			$sql .= " AND sa.status = ".((int) $status);
+		}
 		$sql .= " AND sa.key_account IS NOT NULL AND sa.key_account <> ''";
 		$sql .= " AND (sa.site_account = '' OR sa.site_account IS NULL OR sa.site_account = '".$this->db->escape($site_account)."')";
 		$sql .= " ORDER BY sa.site_account DESC, sa.rowid DESC"; // To get the entry with a site_account defined in priority
@@ -442,7 +448,7 @@ class SocieteAccount extends CommonObject
 	 */
 	public function getTooltipContentArray($params)
 	{
-		global $langs, $user;
+		global $langs;
 
 		$langs->loadLangs(['companies, commercial', 'website']);
 
@@ -467,7 +473,7 @@ class SocieteAccount extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
-		global $db, $conf, $langs;
+		global $conf, $langs;
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 

From 0f02a26fe388e7adbaceb9d37b7c244b1bb73f82 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 22:58:34 +0100
Subject: [PATCH 168/243] Trans

---
 htdocs/langs/en_US/website.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index b839978b0a9..6d48cde9934 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -304,6 +304,7 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only

From c5421e457c561b120359616f1d5dafd7234cce16 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 16 Jan 2025 23:59:34 +0100
Subject: [PATCH 169/243] Fix typo

---
 htdocs/langs/en_US/website.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 6d48cde9934..1f4dea08683 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -361,6 +361,6 @@ LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
 WebPortalSetupNotComplete=Web portal setup is not complete
-DeleteWebsiteaccount=Delete website account
+DeleteWebsiteAccount=Delete website account
 ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
 ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.

From e87853c17bee244d18bf01781e160206ed849ed4 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 01:03:35 +0100
Subject: [PATCH 170/243] Doc

---
 htdocs/core/lib/images.lib.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 6ff9a5087f6..c9b9a2fd99a 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -514,7 +514,7 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95)
  *    	@param     string	$extName        	Extension to differentiate thumb file name ('_small', '_mini')
  *    	@param     int		$quality        	Quality of compression (0=worst, 100=best)
  *      @param     string	$outdir           	Directory where to store thumb
- *      @param     int		$targetformat     	New format of target (IMAGETYPE_GIF, IMAGETYPE_JPG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_WBMP ... or 0 to keep old format)
+ *      @param     int		$targetformat     	New format of target (IMAGETYPE_GIF, IMAGETYPE_JPG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_WBMP ... or 0 to keep original format)
  *    	@return    string|int<0,0>				Full path of thumb or '' if it fails or 'Error...' if it fails, or 0 if it fails to detect the type of image
  */
 function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', $quality = 50, $outdir = 'thumbs', $targetformat = 0)
@@ -551,9 +551,9 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 
 	$filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image
 
-	$infoImg = getimagesize($filetoread); // Recuperation des infos de l'image
-	$imgWidth = $infoImg[0]; // Largeur de l'image
-	$imgHeight = $infoImg[1]; // Hauteur de l'image
+	$infoImg = getimagesize($filetoread); // Get information like size and real format of image. Warning real format may be png when extension is .jpg
+	$imgWidth = $infoImg[0]; 	// Width of image
+	$imgHeight = $infoImg[1]; 	// Height of image
 
 	$ort = false;
 	if (function_exists('exif_read_data')) {

From d404ab6322a83222b7c9104f8612b8c5565d2fd9 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 01:05:11 +0100
Subject: [PATCH 171/243] Doc

---
 htdocs/core/lib/images.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index c9b9a2fd99a..26ac9e8930f 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -506,7 +506,8 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95)
 
 /**
  *    	Create a thumbnail from an image file (Supported extensions are gif, jpg, png and bmp).
- *      If file is myfile.jpg, new file may be myfile_small.jpg
+ *      If file is myfile.jpg, new file may be myfile_small.jpg. But extension may differs if original file has a format and an extension
+ *      of another one, like a.jpg file when real format is png.
  *
  *    	@param     string	$file           	Path of source file to resize
  *    	@param     int		$maxWidth       	Maximum width of the thumbnail (-1=unchanged, 160 by default)

From 9ed7ffd3a1379710fa3ec6c7213f71b5e43f38f5 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 01:39:14 +0100
Subject: [PATCH 172/243] Add TODO

---
 htdocs/core/lib/images.lib.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 26ac9e8930f..0f0ff2cf7be 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -556,6 +556,9 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 	$imgWidth = $infoImg[0]; 	// Width of image
 	$imgHeight = $infoImg[1]; 	// Height of image
 
+	// TODO LDR
+	//if $infoImg[2] != extension of file $file, return a string 'Error: content of file has a format that differs of the format of its extension
+
 	$ort = false;
 	if (function_exists('exif_read_data')) {
 		$exif = @exif_read_data($filetoread);

From 9bf090b263b697d02f253fb6e8a02a1ca8fe549c Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 01:52:19 +0100
Subject: [PATCH 173/243] Debug v21

---
 htdocs/website/samples/wrapper.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index 0823b551efe..f7127a3d815 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -266,6 +266,11 @@ if ($rss) {
 		exit;
 	}
 
+	// For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+	if (image_format_supported($fullpath_original_file) && !dol_is_file($fullpath_original_file)) {
+		$fullpath_original_file = getImageFileNameForSize($fullpath_original_file, '', '.png');
+	}
+
 	clearstatcache();
 
 	$filename = basename($fullpath_original_file);

From a9ff78528a5f9dbc9c5988028126eb0870d538da Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 17 Jan 2025 11:36:41 +0100
Subject: [PATCH 174/243] FIX missing default values if $objsrc or $soc fields
 are empty

---
 htdocs/compta/facture/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 4b60fdacff5..9f0301f3c06 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3179,9 +3179,9 @@ if ($action == 'create') {
 				$expesrc->fetch_optionals();
 				$object->array_options = $expesrc->array_options;
 			} else {
-				$cond_reglement_id 	= (!empty($objectsrc->cond_reglement_id) ? $objectsrc->cond_reglement_id : (!empty($soc->cond_reglement_id) ? $soc->cond_reglement_id : 0));
-				$mode_reglement_id 	= (!empty($objectsrc->mode_reglement_id) ? $objectsrc->mode_reglement_id : (!empty($soc->mode_reglement_id) ? $soc->mode_reglement_id : 0));
-				$fk_account         = (!empty($objectsrc->fk_account) ? $objectsrc->fk_account : (!empty($soc->fk_account) ? $soc->fk_account : 0));
+				$cond_reglement_id 	= (!empty($objectsrc->cond_reglement_id) ? $objectsrc->cond_reglement_id : (!empty($soc->cond_reglement_id) ? $soc->cond_reglement_id : (!empty($cond_reglement_id) ? $cond_reglement_id : 0)));
+				$mode_reglement_id 	= (!empty($objectsrc->mode_reglement_id) ? $objectsrc->mode_reglement_id : (!empty($soc->mode_reglement_id) ? $soc->mode_reglement_id : (!empty($mode_reglement_id) ? $mode_reglement_id : 0)));
+				$fk_account         = (!empty($objectsrc->fk_account) ? $objectsrc->fk_account : (!empty($soc->fk_account) ? $soc->fk_account : (!empty($fk_account) ? $fk_account : 0)));
 				//$remise_percent 	= (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_percent) ? $soc->remise_percent : 0));
 				//$remise_absolue 	= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
 

From 5dd02bd09f9393f8aea53e23f066f220fd4ef7a6 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 12:20:55 +0100
Subject: [PATCH 175/243] Fix link

---
 htdocs/admin/dict.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 360488a2410..320d8ca9e82 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -598,7 +598,7 @@ $tabcond[DICT_ASSET_DISPOSAL_TYPE] = isModEnabled('asset');
 // List of help for fields (no more used, help is defined into tabcomplete)
 $tabhelp = array();
 
-// Table to store complete information (will replace all other table). Key is table name.
+// Table to store complete information (will replace all other tables). Key is table name.
 $tabcomplete = array(
 	'c_forme_juridique' => array(
 		'picto' => 'company',
@@ -2679,7 +2679,11 @@ if ($id > 0) {
 			print '<tr class="oddeven"><td class="minwidth200">';
 			if (!empty($tabcond[$i])) {
 				$tabnamenoprefix = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabname[$i]);
-				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i;
+				if ($i == DICT_CHARGESOCIALES) {
+					print '&search_country_id='.$mysoc->country_id;
+				}
+				print '">';
 				if (!empty($tabcomplete[$tabnamenoprefix]['picto'])) {
 					print img_picto('', $tabcomplete[$tabnamenoprefix]['picto'], 'class="pictofixedwidth paddingrightonly"');
 				}

From 7433b5e7d7b3c38bb6525337000e4fb9943c87b6 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 12:55:47 +0100
Subject: [PATCH 176/243] Trans

---
 htdocs/langs/en_US/compta.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index ba68fd31f41..0e88b2ab2f5 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
-AutomaticCreationPayment=Automatically record the payment
+AutomaticCreationPayment=Also record the payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments

From 737e216c5f654c343fe1bfc228cf209cc123557b Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 13:05:37 +0100
Subject: [PATCH 177/243] Debug v21 - use a better error message

---
 htdocs/accountancy/journal/bankjournal.php | 6 ++++--
 htdocs/langs/en_US/accountancy.lang        | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index a108c040353..ccada3d1f81 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -1326,7 +1326,7 @@ if (empty($action) || $action == 'view') {
 						$reflabel .= isset($val['soclib']) ? $val['soclib'] : "";
 					}
 
-					print '<!-- Thirdparty bank.rowid='.$key.' -->';
+					print '<!-- Thirdparty bank.rowid='.$key.'=accounting_bookkeeping.fk_doc (accounting_bookkeeping.doc_type=\'bank\') -->';
 					print '<tr class="oddeven">';
 
 					// Date
@@ -1405,9 +1405,11 @@ if (empty($action) || $action == 'view') {
 							if (empty($accounttoshowsubledger) || $accounttoshowsubledger == 'NotDefined') {
 								//print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
 								if (!empty($tabcompany[$key]['code_compta'])) {
-									if (in_array($tabtype[$key], array('payment_various', 'payment_salary'))) {
+									if (in_array($tabtype[$key], array('payment_various'))) {
 										// For such case, if subledger is not defined, we won't use subledger accounts.
 										$accounttoshowsubledger = '<span class="warning small">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored").'</span>';
+									} elseif (in_array($tabtype[$key], array('payment_salary'))) {
+										$accounttoshowsubledger = '<span class="warning small">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored2").'</span>';
 									} else {
 										$accounttoshowsubledger = '<span class="warning small">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown", $tabcompany[$key]['code_compta']).'</span>';
 									}
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index c4e8cfb2e9f..d0984b30ca3 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -262,6 +262,7 @@ UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
 ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored2=Subledger account not defined or third party or user unknown. We will keep the subledger account value empty.
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service

From 3ce842eab08f2e2616c98e257190dd152fd10cbc Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 13:16:13 +0100
Subject: [PATCH 178/243] Debug v21 - CSS

---
 htdocs/accountancy/journal/bankjournal.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index ccada3d1f81..c778c17bfc3 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -1277,7 +1277,7 @@ if (empty($action) || $action == 'view') {
 				print "<td>".$date."</td>";
 
 				// Ref
-				print "<td>".dol_escape_htmltag($ref)."</td>";
+				print '<td class="maxwidth300 nopaddingtopimp nopaddingbottomimp">'.dol_escape_htmltag($ref)."</td>";
 
 				// Ledger account
 				$accounttoshow = length_accountg($k);
@@ -1299,7 +1299,7 @@ if (empty($action) || $action == 'view') {
 				print "</td>";
 
 				// Label operation
-				print '<td>';
+				print '<td class="maxwidth300 nopaddingtopimp nopaddingbottomimp">';
 				print $reflabel;	// This is already html escaped content
 				print "</td>";
 
@@ -1332,8 +1332,8 @@ if (empty($action) || $action == 'view') {
 					// Date
 					print "<td>".$date."</td>";
 
-					// Ref
-					print "<td>".dol_escape_htmltag($ref)."</td>";
+					// Ref / Piece
+					print '<td class="nopaddingtopimp nopaddingbottomimp">'.dol_escape_htmltag($ref)."</td>";
 
 
 					// Ledger account
@@ -1421,11 +1421,14 @@ if (empty($action) || $action == 'view') {
 							$accounttoshowsubledger = '';
 						}
 					}
-					print '<td class="maxwidth300">';
+					print '<td class="maxwidth300 nopaddingtopimp nopaddingbottomimp">';
 					print $accounttoshowsubledger;	// This is a html string
 					print "</td>";
 
-					print "<td>".$reflabel."</td>";
+					// Label operation
+					print '<td class="nopaddingtopimpo paddingbottomimp">';
+					print $reflabel;		// This is a html string
+					print "</td>";
 
 					print '<td class="center">'.$val["type_payment"]."</td>";
 

From 1f017863950c77069abb735abaea4e203def6158 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 13:37:30 +0100
Subject: [PATCH 179/243] Debug v21

---
 htdocs/accountancy/journal/bankjournal.php | 36 ++++++++++------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index c778c17bfc3..bf257a9facf 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -446,9 +446,9 @@ if ($result) {
 					// If we fill it here to, we must concat.
 					if ($userstatic->id > 0) {
 						if ($is_sc) {
-							$tabpay[$obj->rowid]["soclib"] .= ' '.$userstatic->getNomUrl(1, 'accountancy', 0);
+							$tabpay[$obj->rowid]["soclib"] .= ' '.$userstatic->getNomUrl(-1, 'accountancy', 0);
 						} else {
-							$tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, 'accountancy', 0);
+							$tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(-1, 'accountancy', 0);
 						}
 					} else {
 						$tabpay[$obj->rowid]["soclib"] = '???'; // Should not happen, but happens with old data when id of user was not saved on expense report payment.
@@ -600,7 +600,7 @@ if ($result) {
 					}
 				} elseif ($links[$key]['type'] == 'banktransfert') {
 					$accountLinestatic->fetch($links[$key]['url_id']);
-					$tabpay[$obj->rowid]["lib"] .= ' '.$langs->trans("BankTransfer").'- '.$accountLinestatic ->getNomUrl(1);
+					$tabpay[$obj->rowid]["lib"] .= ' '.$langs->trans("BankTransfer").' '.$accountLinestatic ->getNomUrl(1);
 					$tabtp[$obj->rowid][$account_transfer] = isset($tabtp[$obj->rowid][$account_transfer]) ? $tabtp[$obj->rowid][$account_transfer] + $amounttouse : $amounttouse;
 					$bankaccountstatic->fetch($tabpay[$obj->rowid]['fk_bank_account']);
 					$tabpay[$obj->rowid]["soclib"] = $bankaccountstatic->getNomUrl(2);
@@ -699,11 +699,11 @@ if (!$error && $action == 'writebookkeeping' && $user->hasRight('accounting', 'b
 
 					$reflabel = '';
 					if (!empty($val['lib'])) {
-						$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+						$reflabel .= dol_string_nohtmltag($val['lib'])." / ";
 					}
 					$reflabel .= $langs->trans("Bank").' '.dol_string_nohtmltag($val['bank_account_ref']);
 					if (!empty($val['soclib'])) {
-						$reflabel .= " - ".dol_string_nohtmltag($val['soclib']);
+						$reflabel .= " / ".dol_string_nohtmltag($val['soclib']);
 					}
 
 					$bookkeeping = new BookKeeping($db);
@@ -760,7 +760,7 @@ if (!$error && $action == 'writebookkeeping' && $user->hasRight('accounting', 'b
 
 						$reflabel = '';
 						if (!empty($val['lib'])) {
-							$reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
+							$reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " / " : "");
 						}
 						if ($tabtype[$key] == 'banktransfert') {
 							$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
@@ -889,7 +889,7 @@ if (!$error && $action == 'writebookkeeping' && $user->hasRight('accounting', 'b
 					if ($mt) {
 						$reflabel = '';
 						if (!empty($val['lib'])) {
-							$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+							$reflabel .= dol_string_nohtmltag($val['lib'])." / ";
 						}
 						$reflabel .= dol_string_nohtmltag('WaitingAccount');
 
@@ -1010,11 +1010,11 @@ if ($action == 'exportcsv' && $user->hasRight('accounting', 'bind', 'write')) {
 			if ($mt) {
 				$reflabel = '';
 				if (!empty($val['lib'])) {
-					$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+					$reflabel .= dol_string_nohtmltag($val['lib'])." / ";
 				}
 				$reflabel .= $langs->trans("Bank").' '.dol_string_nohtmltag($val['bank_account_ref']);
 				if (!empty($val['soclib'])) {
-					$reflabel .= " - ".dol_string_nohtmltag($val['soclib']);
+					$reflabel .= " / ".dol_string_nohtmltag($val['soclib']);
 				}
 
 				print '"'.$key.'"'.$sep;
@@ -1037,7 +1037,7 @@ if ($action == 'exportcsv' && $user->hasRight('accounting', 'bind', 'write')) {
 				if ($mt) {
 					$reflabel = '';
 					if (!empty($val['lib'])) {
-						$reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
+						$reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " / " : "");
 					}
 					if ($tabtype[$key] == 'banktransfert') {
 						$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
@@ -1076,7 +1076,7 @@ if ($action == 'exportcsv' && $user->hasRight('accounting', 'bind', 'write')) {
 				if ($mt) {
 					$reflabel = '';
 					if (!empty($val['lib'])) {
-						$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+						$reflabel .= dol_string_nohtmltag($val['lib'])." / ";
 					}
 					$reflabel .= dol_string_nohtmltag('WaitingAccount');
 
@@ -1250,8 +1250,6 @@ if (empty($action) || $action == 'view') {
 	print '<td class="right">'.$langs->trans("AccountingCredit")."</td>";
 	print "</tr>\n";
 
-	$r = '';
-
 	foreach ($tabpay as $key => $val) {			  // $key is rowid in llx_bank
 		$date = dol_print_date($val["date"], 'day');
 
@@ -1262,15 +1260,15 @@ if (empty($action) || $action == 'view') {
 			if ($mt) {
 				$reflabel = '';
 				if (!empty($val['lib'])) {
-					$reflabel .= $val['lib']." - ";
+					$reflabel .= $val['lib']." / ";
 				}
 				$reflabel .= $langs->trans("Bank").' '.$val['bank_account_ref'];
 				if (!empty($val['soclib'])) {
-					$reflabel .= " - ".$val['soclib'];
+					$reflabel .= " / ".$val['soclib'];
 				}
 
 				//var_dump($tabpay[$key]);
-				print '<!-- Bank bank.rowid='.$key.' type='.$tabpay[$key]['type'].' ref='.$tabpay[$key]['ref'].'-->';
+				print '<!-- Bank bank.rowid='.$key.'=accounting_bookkeeping.fk_doc (accounting_bookkeeping.doc_type=\'bank\') type='.$tabpay[$key]['type'].' ref='.$tabpay[$key]['ref'].' -->';
 				print '<tr class="oddeven">';
 
 				// Date
@@ -1318,7 +1316,7 @@ if (empty($action) || $action == 'view') {
 				if ($mt) {
 					$reflabel = '';
 					if (!empty($val['lib'])) {
-						$reflabel .= $val['lib'].(isset($val['soclib']) ? " - " : "");
+						$reflabel .= $val['lib'].(isset($val['soclib']) ? " / " : "");
 					}
 					if ($tabtype[$key] == 'banktransfert') {
 						$reflabel .= $langs->trans('TransitionalAccount').' '.$account_transfer;
@@ -1326,7 +1324,7 @@ if (empty($action) || $action == 'view') {
 						$reflabel .= isset($val['soclib']) ? $val['soclib'] : "";
 					}
 
-					print '<!-- Thirdparty bank.rowid='.$key.'=accounting_bookkeeping.fk_doc (accounting_bookkeeping.doc_type=\'bank\') -->';
+					print '<!-- Thirdparty bank.rowid='.$key.'=accounting_bookkeeping.fk_doc (accounting_bookkeeping.doc_type=\'bank\') type='.$tabpay[$key]['type'].' ref='.$tabpay[$key]['ref'].' -->';
 					print '<tr class="oddeven">';
 
 					// Date
@@ -1446,7 +1444,7 @@ if (empty($action) || $action == 'view') {
 				if ($mt) {
 					$reflabel = '';
 					if (!empty($val['lib'])) {
-						$reflabel .= $val['lib']." - ";
+						$reflabel .= $val['lib']." / ";
 					}
 					$reflabel .= 'WaitingAccount';
 

From ef9105cc44baeeea527440091ad7a8e5a48188be Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 14:08:39 +0100
Subject: [PATCH 180/243] Debug v21

---
 htdocs/accountancy/journal/bankjournal.php      | 17 +++++++++++++----
 htdocs/compta/sociales/card.php                 | 12 ++++++------
 .../sociales/class/chargesociales.class.php     |  5 +++--
 htdocs/langs/en_US/admin.lang                   |  1 -
 htdocs/langs/en_US/main.lang                    |  1 +
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index bf257a9facf..b133e0399e4 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -476,13 +476,10 @@ if ($result) {
 						$chargestatic->label = $links[$key]['label'];
 					}
 					$chargestatic->ref = $chargestatic->label;
-					//$chargestatic->fetch($chargestatic->id);
-
-					$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
-					$tabpay[$obj->rowid]["paymentscid"] = $chargestatic->id;
 
 					// Retrieve the accounting code of the social contribution of the payment from link of payment.
 					// Note: We have the social contribution id, it can be faster to get accounting code from social contribution id.
+					/*
 					$sqlmid = "SELECT cchgsoc.accountancy_code";
 					$sqlmid .= " FROM ".MAIN_DB_PREFIX."c_chargesociales cchgsoc";
 					$sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."chargesociales as chgsoc ON chgsoc.fk_type = cchgsoc.id";
@@ -495,7 +492,19 @@ if ($result) {
 					if ($resultmid) {
 						$objmid = $db->fetch_object($resultmid);
 						$tabtp[$obj->rowid][$objmid->accountancy_code] = isset($tabtp[$obj->rowid][$objmid->accountancy_code]) ? $tabtp[$obj->rowid][$objmid->accountancy_code] + $amounttouse : $amounttouse;
+					}*/
+					$tmpcharge = new ChargeSociales($db);
+					$resultmid = $tmpcharge->fetch($chargestatic->id);
+					if ($resultmid) {
+						$chargestatic->type_label = $tmpcharge->type_label;
+						$chargestatic->type_code = $tmpcharge->type_code;
+						$chargestatic->type_accountancy_code = $tmpcharge->type_accountancy_code;
+
+						$tabtp[$obj->rowid][$tmpcharge->type_accountancy_code] = isset($tabtp[$obj->rowid][$tmpcharge->type_accountancy_code]) ? $tabtp[$obj->rowid][$tmpcharge->type_accountancy_code] + $amounttouse : $amounttouse;
 					}
+
+					$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
+					$tabpay[$obj->rowid]["paymentscid"] = $chargestatic->id;
 				} elseif ($links[$key]['type'] == 'payment_donation') {
 					$paymentdonstatic->id = $links[$key]['url_id'];
 					$paymentdonstatic->ref = (string) $links[$key]['url_id'];
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index d33cb0e1be6..123f3c0bf4b 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -37,13 +37,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 if (isModEnabled('project')) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
-if (isModEnabled('accounting')) {
-	include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
-}
 
 /**
  * @var Conf $conf
@@ -351,13 +350,11 @@ if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
-$now = dol_now();
-
 $title = $langs->trans("SocialContribution").' - '.$langs->trans("Card");
 $help_url = 'EN:Module_Taxes_and_social_contributions|FR:Module_Taxes_et_charges_spéciales|ES:M&oacute;dulo Impuestos y cargas sociales (IVA, impuestos)';
 llxHeader("", $title, $help_url);
 
-$reseapayer = 0;
+$resteapayer = 0;
 
 
 // Form to create a social contribution
@@ -603,6 +600,9 @@ if ($id > 0) {
 			$formsocialcontrib->select_type_socialcontrib($actionPostValue ? $actionPostValue : $object->type, 'actioncode', 1);
 		} else {
 			print $object->type_label;
+			if (isModEnabled("accounting")) {
+				print ' &nbsp; <pan class="opacitymedium">('.$langs->trans("AccountancyCode").': '.(empty($object->type_accountancy_code) ? $langs->trans("Unknown") : length_accountg($object->type_accountancy_code)).')</span>';
+			}
 		}
 		print "</td>";
 
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index f6ca5ff79dc..97ac741e52e 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -679,8 +679,9 @@ class ChargeSociales extends CommonObject
 		}
 		if (!empty($this->type_label)) {
 			$label .= '<br><b>'.$langs->trans('Type').':</b> '.$this->type_label;
-			if (!empty($this->type_accountancy_code)) {
-				$label .= ' <span class="opacitymedium">('.$langs->trans('AccountancyCode').': '.$this->type_accountancy_code.')</span>';
+			if (isModEnabled('accounting') || !empty($this->type_accountancy_code)) {
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+				$label .= ' <span class="opacitymedium">('.$langs->trans('AccountancyCode').': '.(empty($this->type_accountancy_code) ? $langs->trans("Unknown") : length_accountg($this->type_accountancy_code)).')</span>';
 			}
 		}
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 421291cc7ed..7859c0eec2f 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1872,7 +1872,6 @@ Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
 YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
-AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index d01964bc47c..a76687104cb 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -891,6 +891,7 @@ OriginFileName=Original filename
 SetDemandReason=Set source
 SetBankAccount=Define Bank Account
 AccountCurrency=Account currency
+AccountancyCode=Accounting Code
 ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines

From 654aa24e8cbc22b5a7607f8cb4d057420ff707b7 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 14:21:55 +0100
Subject: [PATCH 181/243] Debug v21

---
 htdocs/core/actions_massactions.inc.php | 2 +-
 htdocs/societe/website.php              | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 82a25fd2678..266bae09fc0 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -107,7 +107,7 @@ if (!empty($permtodelete) && empty($permissiontodelete)) {
 }
 
 // Mass actions. Controls on number of lines checked.
-$maxformassaction = (!getDolGlobalString('MAIN_LIMIT_FOR_MASS_ACTIONS') ? 1000 : $conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
+$maxformassaction = getDolGlobalInt('MAIN_LIMIT_FOR_MASS_ACTIONS', 1000);
 if ($massaction && is_array($toselect) && count($toselect) < 1) {
 	$error++;
 	setEventMessages($langs->trans("NoRecordSelected"), null, "warnings");
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 77f9f92a4dc..4ed8e18f7d6 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -133,6 +133,10 @@ if ($id > 0) {
 	$result = $object->fetch($id);
 }
 
+if (!($object->id > 0) && $action == 'view') {
+	recordNotFound();
+}
+
 // Security check
 $id = GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('socid');
 if ($user->socid) {
@@ -186,7 +190,8 @@ if (empty($reshook)) {
 	// Mass actions
 	$objectclass = 'WebsiteAccount';
 	$objectlabel = 'WebsiteAccount';
-	$uploaddir = $conf->societe->multidir_output[$object->entity];
+	$uploaddir = empty($conf->societe->multidir_output[$object->entity]) ? $conf->societe->dir_output : $conf->societe->multidir_output[$object->entity];
+
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
@@ -196,8 +201,6 @@ if (empty($reshook)) {
  *	View
  */
 
-$contactstatic = new Contact($db);
-
 $form = new Form($db);
 
 $langs->load("companies");

From cd4e5c8998fdab65399c25f6d470cd11173e13da Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 15:24:21 +0100
Subject: [PATCH 182/243] Debug v21

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index a1a3b9306bb..13dd05eff14 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1510,11 +1510,11 @@ class Societe extends CommonObject
 
 		$this->capital = ($this->capital != '') ? (float) price2num(trim((string) $this->capital)) : null;
 
-		$this->effectif_id = (int) trim((string) $this->effectif_id);
-		$this->forme_juridique_code = (int) trim((string) $this->forme_juridique_code);
+		$this->effectif_id = (int) $this->effectif_id;
+		$this->forme_juridique_code = (int) $this->forme_juridique_code;
 
 		//Gencod
-		$this->barcode = trim($this->barcode);
+		$this->barcode = trim((string) $this->barcode);
 
 		// For automatic creation
 		if ($this->code_client == -1 || $this->code_client === 'auto') {
@@ -1524,10 +1524,10 @@ class Societe extends CommonObject
 			$this->get_codefournisseur($this, 1);
 		}
 
-		$this->accountancy_code_customer_general = trim($this->accountancy_code_customer_general);
-		$this->code_compta_client = trim($this->code_compta_client);
-		$this->accountancy_code_supplier_general = trim($this->accountancy_code_supplier_general);
-		$this->code_compta_fournisseur = trim($this->code_compta_fournisseur);
+		$this->accountancy_code_customer_general = trim((string) $this->accountancy_code_customer_general);
+		$this->code_compta_client = trim((string) $this->code_compta_client);
+		$this->accountancy_code_supplier_general = trim((string) $this->accountancy_code_supplier_general);
+		$this->code_compta_fournisseur = trim((string) $this->code_compta_fournisseur);
 
 		// Check parameters. More tests are done later in the ->verify()
 		if (!is_numeric($this->client) && !is_numeric($this->fournisseur)) {
@@ -1563,15 +1563,15 @@ class Societe extends CommonObject
 		}
 
 		//Web services
-		$this->webservices_url = $this->webservices_url ? clean_url($this->webservices_url, 0) : '';
-		$this->webservices_key = trim($this->webservices_key);
+		$this->webservices_url = empty($this->webservices_url) ? '' : clean_url($this->webservices_url, 0);
+		$this->webservices_key = trim((string) $this->webservices_key);
 
 		$this->accountancy_code_buy = (empty($this->accountancy_code_buy) ? '' : trim($this->accountancy_code_buy));
 		$this->accountancy_code_sell = (empty($this->accountancy_code_sell) ? '' : trim($this->accountancy_code_sell));
 
 		//Incoterms
 		$this->fk_incoterms = (int) $this->fk_incoterms;
-		$this->location_incoterms = trim($this->location_incoterms);
+		$this->location_incoterms = trim((string) $this->location_incoterms);
 
 		$this->db->begin();
 

From 3598855e748430266c138086f2d76b139128658a Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 16:18:56 +0100
Subject: [PATCH 183/243] Debug v21 - type of public note

---
 htdocs/install/mysql/migration/20.0.0-21.0.0.sql | 5 +++++
 htdocs/install/mysql/tables/llx_product.sql      | 4 ++--
 htdocs/install/mysql/tables/llx_product_lang.sql | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql
index 189922844e2..cb821e230ae 100644
--- a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql
+++ b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql
@@ -61,6 +61,11 @@ ALTER TABLE llx_asset_model ADD COLUMN ref_ext varchar(255) AFTER ref;
 
 -- V21 migration
 
+ALTER TABLE llx_product MODIFY COLUMN note_public mediumtext;
+ALTER TABLE llx_product MODIFY COLUMN note mediumtext;
+ALTER TABLE llx_product_lang MODIFY COLUMN note mediumtext;
+
+
 CREATE TABLE llx_categorie_fichinter
 (
   fk_categorie  integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index afb612aacdb..f75a4f4ef3f 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -36,8 +36,8 @@ create table llx_product
 
   label                         varchar(255) NOT NULL,
   description                   text,
-  note_public                   text,
-  note                          text,
+  note_public                   mediumtext,
+  note                          mediumtext,
   customcode                    varchar(32),                        -- Customs|Commodity|HS|TARIC code see https://github.com/Dolibarr/dolibarr/issues/31679
   fk_country                    integer DEFAULT NULL,               -- Optional id of original country
   fk_state                      integer DEFAULT NULL,               -- Optional id of original state/province
diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql
index de21c8049af..c0eff4c6f3b 100644
--- a/htdocs/install/mysql/tables/llx_product_lang.sql
+++ b/htdocs/install/mysql/tables/llx_product_lang.sql
@@ -25,6 +25,6 @@ create table llx_product_lang
   lang           varchar(5)   DEFAULT 0 NOT NULL,
   label          varchar(255) NOT NULL,
   description    text,
-  note           text,
+  note           mediumtext,
   import_key varchar(14) DEFAULT NULL
 )ENGINE=innodb;

From de67a70325101a0da3ba77c81ba94994f99a7e69 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 17:09:47 +0100
Subject: [PATCH 184/243] Debug v21

---
 htdocs/core/class/doleditor.class.php | 52 +++++++++++++--------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 31297131479..9a5e139d361 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -26,7 +26,7 @@
 
 /**
  *      Class to manage a WYSIWYG editor.
- *		Usage: $doleditor=new DolEditor('body',$message,320,'toolbar_mailing');
+ *		Usage: $doleditor = new DolEditor('body', $message, 320, 'toolbar_mailing');
  *		       $doleditor->Create();
  */
 class DolEditor
@@ -188,23 +188,31 @@ class DolEditor
 	 *	Output edit area inside the HTML stream.
 	 *	Output depends on this->tool (fckeditor, ckeditor, textarea, ...)
 	 *
-	 *  @param	int		$noprint             1=Return HTML string instead of printing it to output
-	 *  @param	string	$morejs		         Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });". Used by CKEditor only.
-	 *  @param  boolean $disallowAnyContent  Disallow to use any content. true=restrict to a predefined list of allowed elements. Used by CKEditor only.
-	 *  @param	string	$titlecontent		 Show title content before editor area. Used by ACE editor only.
-	 *  @param	string	$option				 For ACE editor, set the source language ('html', 'php', 'javascript', 'json', ...)
-	 *  @param	string	$moreparam			 Add extra tags to the textarea
-	 *  @param	string	$morecss			 Add extra css to the textarea
+	 *  @param	int		$noprint            1=Return HTML string instead of printing it to output
+	 *  @param	string	$morejs		        Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });". Used by CKEditor only.
+	 *  @param  boolean|string	$restrictContent		Decide which content is allowed. Used by CKEditor only.
+	 *                                                  true = restrict allowed content to a predefined list of allowed elements.
+	 *                                                  false = allow anything
+	 *                                                  string = true + add values into string
+	 *  @param	string	$titlecontent		Show title content before editor area. Used by ACE editor only.
+	 *  @param	string	$option				For ACE editor, set the source language ('html', 'php', 'javascript', 'json', ...)
+	 *  @param	string	$moreparam			Add extra tags to the textarea
+	 *  @param	string	$morecss			Add extra css to the textarea
 	 *  @return	void|string
 	 */
-	public function Create($noprint = 0, $morejs = '', $disallowAnyContent = true, $titlecontent = '', $option = '', $moreparam = '', $morecss = '')
+	public function Create($noprint = 0, $morejs = '', $restrictContent = true, $titlecontent = '', $option = '', $moreparam = '', $morecss = '')
 	{
 		// phpcs:enable
 		global $conf, $langs;
 
 		$fullpage = false;
+
+		$extraAllowedContent = 'a[target];section[contenteditable,id];div{float,display}';
+		if (is_string($restrictContent)) {
+			$extraAllowedContent = $restrictContent;
+		}
 		if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT)) {
-			$disallowAnyContent = !getDolGlobalString('FCKEDITOR_ALLOW_ANY_CONTENT'); // Only predefined list of html tags are allowed or all
+			$restrictContent = !getDolGlobalString('FCKEDITOR_ALLOW_ANY_CONTENT'); // Only predefined list of html tags are allowed or all
 		}
 
 		$found = 0;
@@ -214,9 +222,7 @@ class DolEditor
 
 		if (in_array($this->tool, array('textarea', 'ckeditor'))) {
 			$found = 1;
-			//$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" '.($this->readonly?' disabled':'').' rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 5px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
-			// TODO We do not put the 'disabled' tag because on a read form, it change style with grey.
-			//print $this->content;
+			// Note: We do not put the attribute 'disabled' tag because on a read form, it change style with grey.
 			$out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'"';
 			$out .= ' rows="'.$this->rows.'"';
 			//$out .= ' style="height: 700px; min-height: 700px;"';
@@ -259,7 +265,7 @@ class DolEditor
 
 				$htmlencode_force = preg_match('/_encoded$/', $this->toolbarname) ? 'true' : 'false';
 
-				$out .= '<!-- Output ckeditor disallowAnyContent='.dol_escape_htmltag((string) $disallowAnyContent).' toolbarname='.dol_escape_htmltag($this->toolbarname).' -->'."\n";
+				$out .= '<!-- Output ckeditor disallowAnyContent='.dol_escape_htmltag((string) $restrictContent).' toolbarname='.dol_escape_htmltag($this->toolbarname).' -->'."\n";
 				//$out .= '<style>#cke_1_top { height: 34px !important; }</style>';
 				$out .= '<script nonce="'.getNonce().'" type="text/javascript">
             			$(document).ready(function () {
@@ -268,15 +274,15 @@ class DolEditor
                             /* should be editor=CKEDITOR.replace but what if there is several editors ? */
                             tmpeditor = CKEDITOR.replace(\''.dol_escape_js($this->htmlname).'\',
             					{
-            						/* property:xxx is same than CKEDITOR.config.property = xxx */
+            						/* property: xxx is same than CKEDITOR.config.property = xxx */
             						customConfig: ckeditorConfig,
 									removePlugins: \''.dol_escape_js($pluginstodisable).'\',
 									versionCheck: false,
             						readOnly: '.($this->readonly ? 'true' : 'false').',
                             		htmlEncodeOutput: '.dol_escape_js($htmlencode_force).',
-            						allowedContent: '.($disallowAnyContent ? 'false' : 'true').',		/* Advanced Content Filter (ACF) is on when allowedContent is false */
-            						extraAllowedContent: \'a[target];section[contenteditable,id];div{float,display}\',		/* Allow a tag with attribute target, allow seciont tag and allow the style float and display into div to default other allowed tags */
-									disallowedContent: \'\',		/* Tags that are not allowed */
+            						allowedContent: '.($restrictContent ? 'false' : 'true').',		/* Advanced Content Filter (ACF) is on when allowedContent is false */
+            						extraAllowedContent: \''.dol_escape_js($extraAllowedContent).'\',	/* Allow a tag with attribute target, allow section tag and allow the style float and display into div to default other allowed tags */
+									disallowedContent: \'\',											/* Tags that are not allowed */
             						fullPage: '.($fullpage ? 'true' : 'false').',						/* if true, the html, header and body tags are kept */
                             		toolbar: \''.dol_escape_js($this->toolbarname).'\',
             						toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').',
@@ -291,7 +297,7 @@ class DolEditor
 													console.log(\'ckeditor '.dol_escape_js($this->htmlname).' instanceReady\');
 
 													/* If we found the attribute required on source div, we remove it (not compatible with ckeditor) */
-													/* Disabled, because attribute required should never be used on fields for doleditor */
+													/* Disabled, because attribute "required" should never be used on fields for doleditor */
 													/* jQuery("#'.dol_escape_js($this->htmlname).'").attr("required", false); */
 
                                                     // Output paragraphs as <p>Text</p>.
@@ -303,14 +309,6 @@ class DolEditor
                                                         breakAfterClose : true
                                                     });
                                                 },
-												/* This is to remove the tab Link on image popup. Does not work, so commented */
-												/* dialogDefinition: function (event) {
-										            var dialogName = event.data.name;
-										            var dialogDefinition = event.data.definition;
-										            if (dialogName == \'image\') {
-										                dialogDefinition.removeContents(\'Link\');
-										            }
-										        } */
 										},
 									disableNativeSpellChecker: '.(getDolGlobalString('CKEDITOR_NATIVE_SPELLCHECKER') ? 'false' : 'true');
 

From c898c52531559924bf17cd16fd6117bea79f4c39 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 17:40:10 +0100
Subject: [PATCH 185/243] Fix iframe lost

---
 htdocs/core/lib/functions.lib.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4c9a5d4cedd..584541e94ab 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8481,7 +8481,7 @@ function dol_nl2br($stringtoencode, $nl2brmode = 0, $forxml = false)
  *
  * @param	string	$stringtoencode				String to encode
  * @param	int     $nouseofiframesandbox		0=Default, 1=Allow use of option MAIN_SECURITY_USE_SANDBOX_FOR_HTMLWITHNOJS for html sanitizing (not yet working)
- * @param	string	$check						'restricthtmlnolink' or 'restricthtml' or 'restricthtmlallowclass' or 'restricthtmlallowlinkscript' or 'restricthtmlallowunvalid'
+ * @param	string	$check						'restricthtmlnolink' or 'restricthtml' or 'restricthtmlallowclass' or 'restricthtmlallowiframe' or 'restricthtmlallowlinkscript' or 'restricthtmlallowunvalid'
  * @return	string								HTML sanitized
  */
 function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = 'restricthtml')
@@ -8607,6 +8607,8 @@ function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = '
 				$out = dol_string_onlythesehtmltags($out, 0, 1, 0, 0, array(), 1, 1, 1, getDolGlobalInt("UNSECURED_restricthtmlallowlinkscript_ALLOW_PHP"));
 			} elseif ($check == 'restricthtmlallowclass' || $check == 'restricthtmlallowunvalid') {
 				$out = dol_string_onlythesehtmltags($out, 0, 0, 1);
+			} elseif ($check == 'restricthtmlallowiframe') {
+				$out = dol_string_onlythesehtmltags($out, 0, 0, 1, 1);
 			} else {
 				$out = dol_string_onlythesehtmltags($out, 0, 1, 1);
 			}

From 998f0ce49b43502b88afb924a395492aa7c1487e Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 17:55:13 +0100
Subject: [PATCH 186/243] Debug v21

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 584541e94ab..d276fa7ef74 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1316,6 +1316,7 @@ function sanitizeVal($out = '', $check = 'alphanohtml', $filter = null, $options
 		case 'restricthtmlnolink':
 		case 'restricthtml':		// Recommended for most html textarea
 		case 'restricthtmlallowclass':
+		case 'restricthtmlallowiframe':
 		case 'restricthtmlallowlinkscript':	// Allow link and script tag for head section.
 		case 'restricthtmlallowunvalid':
 			$out = dol_htmlwithnojs($out, 1, $check);

From 23f2af1bce991f7be14150d67aca61424c2f605c Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 17 Jan 2025 20:59:23 +0100
Subject: [PATCH 187/243] Debug v21

---
 htdocs/product/class/product.class.php                 | 7 ++++---
 htdocs/product/class/productfournisseurprice.class.php | 6 ++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 0862b6b1d93..fa3cc2b2d4e 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2852,7 +2852,7 @@ class Product extends CommonObject
 	}
 
 	/**
-	 *  Load a product in memory from database
+	 * Load a product in memory from database
 	 *
 	 * @param  int    $id                Id of product/service to load
 	 * @param  string $ref               Ref of product/service to load
@@ -3052,8 +3052,9 @@ class Product extends CommonObject
 				$this->stock_reel = $obj->stock;
 				$this->pmp = $obj->pmp;
 
-				$this->date_creation = $obj->datec;
-				$this->date_modification = $obj->tms;
+				$this->date_creation = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->tms);
+
 				$this->import_key = $obj->import_key;
 				$this->entity = $obj->entity;
 
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index 6da02f15b30..3cdb939670f 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -265,8 +265,6 @@ class ProductFournisseurPrice extends CommonObject
 	 */
 	public function __construct(DoliDB $db)
 	{
-		global $conf, $langs;
-
 		$this->db = $db;
 
 		$this->ismultientitymanaged = 1;
@@ -533,7 +531,7 @@ class ProductFournisseurPrice extends CommonObject
 	 */
 	public function validate($user, $notrigger = 0)
 	{
-		global $conf, $langs;
+		global $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -961,7 +959,7 @@ class ProductFournisseurPrice extends CommonObject
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf, $langs;
+		global $langs;
 
 		$result = 0;
 		$includedocgeneration = 0;

From 311a6bf0a9d4997f7f82e788125d568adf51ea78 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 17 Jan 2025 00:31:18 +0100
Subject: [PATCH 188/243] Fix ci: travis - Better test if phpunit completed

# Fix ci: travis - Better test if phpunit completed
---
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7129c93d9f1..0020c7b067b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -528,12 +528,11 @@ script:
 
   - |
     echo "Unit testing"
-    # Ensure we catch errors with -e. Set this to +e instead of -e if you want to go to the end to see dolibarr.log file.
-    set -e
-    phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
-    phpunitresult=$?
+    # Execute phpunit, check its exit status and that the phpunit output shows a test summary
+    phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php | tee /dev/tty | grep -qE "(OK .*[0-9]+ tests.*[0-9]+ assertions|Tests: [0-9]+)" ; phpunitresult=$((PIPESTATUS[0]?PIPESTATUS[0]:PIPESTATUS[2]))
     echo "Phpunit return code = $phpunitresult"
-    set +e
+    # Comment next line if you want to go to the end to see the dolibarr.log file.
+    [ $phpunitresult == 0 ] || exit $phpunitresult
     echo
 
 after_script:

From 490750e810b03b517aeb2c5650c8dedc4f712363 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 16 Jan 2025 17:23:13 +0100
Subject: [PATCH 189/243] Qual: Remove var_dump and exit from SocieteTest

---
 test/phpunit/SocieteTest.php | 40 +++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index cd82b4155d3..4ca93839881 100644
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -1,6 +1,9 @@
 <?php
+
 /* Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023 Alexandre Janniaux   <alexandre.janniaux@gmail.com>
+ * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -44,9 +47,9 @@ $conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 /**
  * Class for PHPUnit tests
  *
- * @backupGlobals disabled
+ * @backupGlobals          disabled
  * @backupStaticAttributes enabled
- * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ * @remarks                backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
 class SocieteTest extends CommonClassTest
 {
@@ -74,7 +77,7 @@ class SocieteTest extends CommonClassTest
 			die(1);
 		}
 
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin();    // This is to have all actions inside a transaction even if test launched without suite.
 
 		print __METHOD__."\n";
 	}
@@ -99,7 +102,6 @@ class SocieteTest extends CommonClassTest
 		$localobject->country_code = 'ES';
 
 		$result = $localobject->create($user);
-		var_dump($localobject);exit;
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThanOrEqual($result, 0);
@@ -110,10 +112,10 @@ class SocieteTest extends CommonClassTest
 	/**
 	 * testSocieteFetch
 	 *
-	 * @param   int     $id             Company id
-	 * @return  Societe $localobject    Company
+	 * @param  int $id Company id
+	 * @return Societe $localobject    Company
 	 *
-	 * @depends	testSocieteCreate
+	 * @depends testSocieteCreate
 	 * The depends says test is run only if previous is ok
 	 */
 	public function testSocieteFetch($id)
@@ -139,9 +141,9 @@ class SocieteTest extends CommonClassTest
 	/**
 	 * testSocieteUpdate
 	 *
-	 * @param   Societe $localobject    Company
-	 * @return  Societe $localobject    Company
-	*
+	 * @param  Societe $localobject Company
+	 * @return Societe $localobject    Company
+	 *
 	 * @depends testSocieteFetch
 	 * The depends says test is run only if previous is ok
 	 */
@@ -211,8 +213,8 @@ class SocieteTest extends CommonClassTest
 	/**
 	 * testIdProfCheck
 	 *
-	 * @param   Societe $localobject    Company
-	 * @return  Societe $localobject    Company
+	 * @param  Societe $localobject Company
+	 * @return Societe $localobject    Company
 	 *
 	 * @depends testSocieteUpdate
 	 * The depends says test is run only if previous is ok
@@ -266,8 +268,8 @@ class SocieteTest extends CommonClassTest
 	/**
 	 * testSocieteOther
 	 *
-	 * @param   Societe $localobject    Company
-	 * @return  int     $id             Id of company
+	 * @param  Societe $localobject Company
+	 * @return int     $id             Id of company
 	 *
 	 * @depends testIdProfCheck
 	 * The depends says test is run only if previous is ok
@@ -326,8 +328,8 @@ class SocieteTest extends CommonClassTest
 	/**
 	 * testGetOutstandingBills
 	 *
-	 * @param   int     $id     Id of company
-	 * @return  int
+	 * @param  int $id Id of company
+	 * @return int
 	 *
 	 * @depends testSocieteOther
 	 * The depends says test is run only if previous is ok
@@ -355,8 +357,8 @@ class SocieteTest extends CommonClassTest
 	/**
 	 * testSocieteDelete
 	 *
-	 * @param   int     $id     Id of company
-	 * @return  int
+	 * @param  int $id Id of company
+	 * @return int
 	 *
 	 * @depends testGetOutstandingBills
 	 * The depends says test is run only if previous is ok
@@ -383,7 +385,7 @@ class SocieteTest extends CommonClassTest
 	/**
 	 * testSocieteGetFullAddress
 	 *
-	 * @return  int     $id             Id of company
+	 * @return int     $id             Id of company
 	 */
 	public function testSocieteGetFullAddress()
 	{

From 03866f7014107d6bb6699a30805270e49411e7ac Mon Sep 17 00:00:00 2001
From: SebHashe <sebastien.hacout@gmail.com>
Date: Sat, 18 Jan 2025 11:33:03 +0100
Subject: [PATCH 190/243] Update llx_accounting_account_fr.sql

Compilation plan asso avec PCG
---
 .../mysql/data/llx_accounting_account_fr.sql  | 1187 +++++++++++++++--
 1 file changed, 1061 insertions(+), 126 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_accounting_account_fr.sql b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
index 4bccc36b9a2..653449f469f 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_fr.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
@@ -40,7 +40,7 @@
 -- Content / Contenu:
 -- PCG25-DEV     -   50
 -- PCG18-ASSOC   -  900
--- PCGAFR14-DEV  - 1030
+-- PCGAFR14-DEV  - 1963
 
 
 
@@ -898,131 +898,1066 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 --
 -- Descriptif des plans comptables FR PCG18-ASSOC
 --
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7201,'PCG18-ASSOC','CAPIT',		'1',    '0', 'Fonds propres, emprunts et dettes assimilésFonds propres, provisions pour risques et charges et dettes à plus d''un an', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7202,'PCG18-ASSOC','IMMO',		'2',    '0', 'Frais d''établissement. Actifs immobilisés et créances à plus d''un an', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7203,'PCG18-ASSOC','STOCK',		'3',    '0', 'Stock et commandes en cours d''exécution', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7204,'PCG18-ASSOC','THIRDPARTY','4',  '0', 'Créances et dettes à un an au plus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7205,'PCG18-ASSOC','FINAN',		'5',    '0', 'Placement de trésorerie et de valeurs disponibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7206,'PCG18-ASSOC','EXPENSE',	'6',    '0', 'Charges', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7207,'PCG18-ASSOC','INCOME',	'7',    '0', 'Produits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7208,'PCG18-ASSOC','SPECIAL',	'8',    '0', 'Comptes spéciaux', 1);
-
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7000,'PCG18-ASSOC','CAPIT',   '10', '7201', 'Fonds propres et réserves', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7001,'PCG18-ASSOC','CAPIT',  '102', '7000', 'Fonds propres sans droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7002,'PCG18-ASSOC','CAPIT', '1021', '7001', 'Première situation nette établie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7003,'PCG18-ASSOC','CAPIT', '1022', '7001', 'Fonds statutaires (à subdiviser en fonction des statuts)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7004,'PCG18-ASSOC','CAPIT', '1023', '7001', 'Dotations non consomptibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7005,'PCG18-ASSOC','CAPIT','10231', '7004', 'Dotations non consomptibles initiales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7006,'PCG18-ASSOC','CAPIT','10232', '7004', 'Dotations non consomptibles complémentaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7007,'PCG18-ASSOC','CAPIT', '1024', '7001', 'Autres fonds propres sans droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7008,'PCG18-ASSOC','CAPIT',  '103', '7000', 'Fonds propres avec droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7009,'PCG18-ASSOC','CAPIT', '1032', '7008', 'Fonds statutaires (à subdiviser en fonction des statuts)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7010,'PCG18-ASSOC','CAPIT', '1034', '7008', 'Autres fonds propres avec droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7011,'PCG18-ASSOC','CAPIT',  '105', '7000', 'Ecarts de réévaluation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7012,'PCG18-ASSOC','CAPIT', '1051', '7011', 'Ecarts de réévaluation sur des biens sans droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7013,'PCG18-ASSOC','CAPIT', '1052', '7011', 'Ecarts de réévaluation sur des biens avec droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7014,'PCG18-ASSOC','CAPIT',  '106', '7000', 'Réserves', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7015,'PCG18-ASSOC','CAPIT', '1068', '7014', 'Réserves pour projet de l’entité', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7016,'PCG18-ASSOC','CAPIT',  '108', '7000', 'Dotations consomptibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7017,'PCG18-ASSOC','CAPIT', '1081', '7016', 'Dotations consomptibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7018,'PCG18-ASSOC','CAPIT', '1089', '7016', 'Dotations consomptibles inscrites au compte de résultat', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7019,'PCG18-ASSOC','CAPIT',   '15', '7201', 'Provisions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7020,'PCG18-ASSOC','CAPIT',  '152', '7019', 'Provisions pour charges sur legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7021,'PCG18-ASSOC','CAPIT',   '16', '7201', 'Emprunts et dettes assimilées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7022,'PCG18-ASSOC','CAPIT',  '163', '7021', 'Autres emprunts obligataires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7023,'PCG18-ASSOC','CAPIT', '1631', '7022', 'Titres associatifs et assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7024,'PCG18-ASSOC','CAPIT',   '19', '7201', 'Fonds dédiés ou reportés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7025,'PCG18-ASSOC','CAPIT',  '191', '7024', 'Fonds reportés liés aux legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7026,'PCG18-ASSOC','CAPIT', '1911', '7025', 'Legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7027,'PCG18-ASSOC','CAPIT', '1912', '7025', 'Donations temporaires d’usufruit', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7028,'PCG18-ASSOC','CAPIT',  '194', '7024', 'Fonds dédiés sur subventions d’exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7029,'PCG18-ASSOC','CAPIT',  '195', '7024', 'Fonds dédiés sur contributions financières d’autres organismes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7030,'PCG18-ASSOC','CAPIT',  '196', '7024', 'Fonds dédiés sur ressources liées à la générosité du public', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7031,'PCG18-ASSOC', 'IMMO',   '20', '7202', 'Immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7032,'PCG18-ASSOC', 'IMMO',  '204', '7031', 'Donations temporaires d’usufruit', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7033,'PCG18-ASSOC', 'IMMO',   '24', '7202', 'Biens reçus par legs ou donations destinés à être cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7034,'PCG18-ASSOC', 'IMMO',   '27', '7202', 'Autres immobilisations financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7035,'PCG18-ASSOC', 'IMMO', '2742', '7034', 'Prêts aux partenaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7036,'PCG18-ASSOC', 'IMMO',   '28', '7202', 'Amortissements des immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7037,'PCG18-ASSOC', 'IMMO',  '280', '7036', 'Amortissements des immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7038,'PCG18-ASSOC', 'IMMO', '2804', '7037', 'Donations temporaires d’usufruit', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7039,'PCG18-ASSOC', 'IMMO',   '29', '7202', 'Dépréciations des immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7040,'PCG18-ASSOC', 'IMMO',  '294', '7039', 'Dépréciationsdes biens reçus par legs ou donations destinés à être cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7041,'PCG18-ASSOC','THIRDPARTY',	 '41', '7204', 'Clients, adhérents, usagers et comptes rattachés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7042,'PCG18-ASSOC','THIRDPARTY',     '45', '7204', 'Confédération, fédération, union, entités affiliées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7043,'PCG18-ASSOC','THIRDPARTY',    '455', '7042', 'Partenaires - comptes courants', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7044,'PCG18-ASSOC','THIRDPARTY',     '46', '7204', 'Débiteurs et créditeurs divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7045,'PCG18-ASSOC','THIRDPARTY',    '461', '7044', 'Créances reçues par legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7046,'PCG18-ASSOC','THIRDPARTY',    '466', '7044', 'Dettes des legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7047,'PCG18-ASSOC','THIRDPARTY',    '468', '7044', 'Divers – charges à payer et produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7048,'PCG18-ASSOC','THIRDPARTY',   '4681', '7047', 'Frais des bénévoles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7049,'PCG18-ASSOC','EXPENSE',        '62', '7206', 'Autres services extérieurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7050,'PCG18-ASSOC','EXPENSE',       '622', '7049', 'Rémunérations d’intermédiaires et honoraires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7051,'PCG18-ASSOC','EXPENSE',      '6226', '7050', 'Honoraires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7052,'PCG18-ASSOC','EXPENSE',     '62264', '7051', 'Honoraires sur legs ou donations destinés à être cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7053,'PCG18-ASSOC','EXPENSE',        '65', '7206', 'Autres charges de gestion courante', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7054,'PCG18-ASSOC','EXPENSE',       '653', '7053', 'Charges de la générosité du public', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7055,'PCG18-ASSOC','EXPENSE',      '6531', '7054', 'Autres charges sur legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7056,'PCG18-ASSOC','EXPENSE',       '657', '7053', 'Aides financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7057,'PCG18-ASSOC','EXPENSE',        '67', '7206', 'Charges exceptionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7058,'PCG18-ASSOC','EXPENSE',       '673', '7057', 'Apports ou affectations en numéraire', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7059,'PCG18-ASSOC','EXPENSE',       '675', '7057', 'Valeurs comptables des éléments d’actifs cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7060,'PCG18-ASSOC','EXPENSE',      '6754', '7059', 'Immobilisations reçues par legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7061,'PCG18-ASSOC','EXPENSE',        '68', '7206', 'Dotations aux amortissements, provisions et engagements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7062,'PCG18-ASSOC','EXPENSE',      '6816', '7061', 'Dotations pour dépréciations des immobilisations incorporelles et corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7063,'PCG18-ASSOC','EXPENSE',     '68164', '7062', 'Dotations pour dépréciation d’actifs reçus par legs ou donations destinés à être cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7064,'PCG18-ASSOC','EXPENSE',       '689', '7061', 'Reports en fonds dédiés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7065,'PCG18-ASSOC','EXPENSE',      '6891', '7064', 'Reports en fonds reportés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7066,'PCG18-ASSOC','EXPENSE',      '6894', '7064', 'Reports en fonds dédiés sur subventions d’exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7067,'PCG18-ASSOC','EXPENSE',      '6895', '7064', 'Reports en fonds dédiés sur contributions financières d’autres organismes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7068,'PCG18-ASSOC','EXPENSE',      '6896', '7064', 'Reports en fonds dédiés sur ressources liées à la générosité du public', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7069,'PCG18-ASSOC','INCOME',         '70', '7207', 'Ventes de produits fabriqués, prestations de services, marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7070,'PCG18-ASSOC','INCOME',        '706', '7069', 'Ventes de prestations de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7071,'PCG18-ASSOC','INCOME',       '7063', '7070', 'Parrainages', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7072,'PCG18-ASSOC','INCOME',        '707', '7069', 'Ventes de marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7073,'PCG18-ASSOC','INCOME',       '7073', '7073', 'Ventes de dons en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7074,'PCG18-ASSOC','INCOME',         '73', '7207', 'Concours publics', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7075,'PCG18-ASSOC','INCOME',         '75', '7207', 'Autres produits de gestion courante', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7076,'PCG18-ASSOC','INCOME',        '753', '7075', 'Versements des fondateurs ou consommation de la dotation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7077,'PCG18-ASSOC','INCOME',       '7531', '7076', 'Versements des fondateurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7078,'PCG18-ASSOC','INCOME',       '7532', '7076', 'Quotes-parts de dotation consomptible virée au compte de résultat', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7079,'PCG18-ASSOC','INCOME',        '754', '7075', 'Ressources liées à la générosité du public', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7080,'PCG18-ASSOC','INCOME',       '7541', '7079', 'Dons manuels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7081,'PCG18-ASSOC','INCOME',      '75411', '7080', 'Dons manuels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7082,'PCG18-ASSOC','INCOME',      '75412', '7080', 'Abandons de frais par les bénévoles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7083,'PCG18-ASSOC','INCOME',       '7542', '7079', 'Mécénats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7084,'PCG18-ASSOC','INCOME',       '7543', '7079', 'Legs, donations et assurances-vie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7085,'PCG18-ASSOC','INCOME',      '75431', '7084', 'Assurances-vie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7086,'PCG18-ASSOC','INCOME',      '75432', '7084', 'Legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7087,'PCG18-ASSOC','INCOME',      '75433', '7084', 'Autres produits sur legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7088,'PCG18-ASSOC','INCOME',        '755', '7075', 'Contributions financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7089,'PCG18-ASSOC','INCOME',       '7551', '7088', 'Contributions financières d’autres organismes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7090,'PCG18-ASSOC','INCOME',       '7552', '7088', 'Quotes-parts de générosité reçues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7091,'PCG18-ASSOC','INCOME',        '756', '7075', 'Cotisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7092,'PCG18-ASSOC','INCOME',       '7561', '7091', 'Cotisations sans contrepartie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7093,'PCG18-ASSOC','INCOME',       '7562', '7091', 'Cotisations avec contrepartie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7094,'PCG18-ASSOC','INCOME',        '757', '7075', 'Gains de change sur créances et dettes d’exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7095,'PCG18-ASSOC','INCOME',         '77', '7207', 'Produits exceptionnels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7096,'PCG18-ASSOC','INCOME',        '775', '7095', 'Produits des cessions d’éléments d’actifs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7097,'PCG18-ASSOC','INCOME',       '7754', '7096', 'Immobilisations reçues en legs ou donations destinées à être cédées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7098,'PCG18-ASSOC','INCOME',         '78', '7207', 'Reprises sur amortissements, dépréciations et provisions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7099,'PCG18-ASSOC','INCOME',        '781', '7098', 'Reprises sur amortissements des immobilisations dépréciations et provisions (à inscrire dans les produits d’exploitation)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7100,'PCG18-ASSOC','INCOME',       '7816', '7099', 'Reprises sur dépréciations des immobilisations incorporelles et corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7101,'PCG18-ASSOC','INCOME',      '78164', '7100', 'Reprises sur dépréciations d’actifs reçus par legs ou donations destinés à être cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7102,'PCG18-ASSOC','INCOME',        '789', '7098', 'Utilisations de fonds reportés et de fonds dédiés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7103,'PCG18-ASSOC','INCOME',       '7891', '7102', 'Utilisations de fonds reportés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7104,'PCG18-ASSOC','INCOME',       '7894', '7102', 'Utilisations des fonds dédiés sur subventions d’exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7105,'PCG18-ASSOC','INCOME',       '7895', '7102', 'Utilisations des fonds dédiés sur contributions financières d’autres organismes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7106,'PCG18-ASSOC','INCOME',       '7896', '7102', 'Utilisations des fonds dédiés sur ressources liées à la générosité du public', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7107,'PCG18-ASSOC','INCOME',         '86', '7208', 'Emplois des contributions volontaires en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7108,'PCG18-ASSOC','INCOME',        '860', '7107', 'Secours en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7109,'PCG18-ASSOC','INCOME',        '861', '7107', 'Mises à disposition gratuite de biens', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7110,'PCG18-ASSOC','INCOME',        '862', '7107', 'Prestations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7111,'PCG18-ASSOC','INCOME',        '864', '7107', 'Personnel bénévole', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7112,'PCG18-ASSOC','INCOME',         '87', '7208', 'Contributions volontaires en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7113,'PCG18-ASSOC','INCOME',        '870', '7112', 'Dons en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7114,'PCG18-ASSOC','INCOME',        '871', '7112', 'Prestations en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7115,'PCG18-ASSOC','INCOME',        '875', '7112', 'Bénévolat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7001,'PCG18-ASSOC','CAPIT',		'1',    '0', 'Fonds propres, emprunts et dettes assimilésFonds propres, provisions pour risques et charges et dettes à plus dun an', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7002,'PCG18-ASSOC','IMMO',		'2',    '0', 'Frais détablissement. Actifs immobilisés et créances à plus dun an', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7003,'PCG18-ASSOC','STOCK',		'3',    '0', 'Stock et commandes en cours dexécution', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7004,'PCG18-ASSOC','THIRDPARTY',		'4',    '0', 'Créances et dettes à un an au plus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7005,'PCG18-ASSOC','FINAN',		'5',    '0', 'Placement de trésorerie et de valeurs disponibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7006,'PCG18-ASSOC','EXPENSE',		'6',    '0', 'Charges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7007,'PCG18-ASSOC','INCOME',		'7',    '0', 'Produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7008,'PCG18-ASSOC','SPECIAL',		'8',    '0', 'Comptes spéciaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7009,'PCG18-ASSOC','CAPIT',		'10',    '7001', 'Fonds propres et réserves', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7010,'PCG18-ASSOC','CAPIT',		'101',    '7009', 'Capital', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7011,'PCG18-ASSOC','CAPIT',		'1011',    '7010', 'Capital souscrit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7012,'PCG18-ASSOC','CAPIT',		'1012',    '7010', 'Capital souscrit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7013,'PCG18-ASSOC','CAPIT',		'1013',    '7010', 'Capital souscrit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7014,'PCG18-ASSOC','CAPIT',		'10131',    '7013', 'Capital non amorti', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7015,'PCG18-ASSOC','CAPIT',		'10132',    '7013', 'Capital amorti', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7016,'PCG18-ASSOC','CAPIT',		'1018',    '7010', 'Capital souscrit soumis à des réglementations particulières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7017,'PCG18-ASSOC','CAPIT',		'102',    '7009', 'Fonds propres sans droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7018,'PCG18-ASSOC','CAPIT',		'1021',    '7017', 'Première situation nette établie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7019,'PCG18-ASSOC','CAPIT',		'1022',    '7017', 'Fonds statutaires (à subdiviser en fonction des statuts)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7020,'PCG18-ASSOC','CAPIT',		'1023',    '7017', 'Dotations non consomptibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7021,'PCG18-ASSOC','CAPIT',		'10231',    '7020', 'Dotations non consomptibles initiales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7022,'PCG18-ASSOC','CAPIT',		'10232',    '7020', 'Dotations non consomptibles complémentaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7023,'PCG18-ASSOC','CAPIT',		'1024',    '7017', 'Autres fonds propres sans droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7024,'PCG18-ASSOC','CAPIT',		'103',    '7009', 'Fonds propres avec droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7025,'PCG18-ASSOC','CAPIT',		'1032',    '7024', 'Fonds statutaires (à subdiviser en fonction des statuts)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7026,'PCG18-ASSOC','CAPIT',		'1034',    '7024', 'Autres fonds propres avec droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7027,'PCG18-ASSOC','CAPIT',		'104',    '7009', 'Primes liées au capital social', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7028,'PCG18-ASSOC','CAPIT',		'1041',    '7027', 'Primes d''émission', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7029,'PCG18-ASSOC','CAPIT',		'1042',    '7027', 'Primes de fusion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7030,'PCG18-ASSOC','CAPIT',		'1043',    '7027', 'Primes d''apport', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7031,'PCG18-ASSOC','CAPIT',		'1044',    '7027', 'Primes de conversion d''obligations en actions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7032,'PCG18-ASSOC','CAPIT',		'1045',    '7027', 'Bons de souscription d''actions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7033,'PCG18-ASSOC','CAPIT',		'105',    '7009', 'Ecarts de réévaluation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7034,'PCG18-ASSOC','CAPIT',		'1051',    '7033', 'Ecarts de réévaluation sur des biens sans droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7035,'PCG18-ASSOC','CAPIT',		'1052',    '7033', 'Ecarts de réévaluation sur des biens avec droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7036,'PCG18-ASSOC','CAPIT',		'1053',    '7033', 'Réserve de réévaluation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7037,'PCG18-ASSOC','CAPIT',		'1055',    '7033', 'Ecarts de réévaluation (autres opérations légales)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7038,'PCG18-ASSOC','CAPIT',		'1057',    '7033', 'Autres écarts de réévaluation en France', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7039,'PCG18-ASSOC','CAPIT',		'1058',    '7033', 'Autres écarts de réévaluation à l''Etranger', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7040,'PCG18-ASSOC','CAPIT',		'106',    '7009', 'Réserves', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7041,'PCG18-ASSOC','CAPIT',		'1061',    '7040', 'Réserve légale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7042,'PCG18-ASSOC','CAPIT',		'10611',    '7041', 'Réserve légale proprement dite', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7043,'PCG18-ASSOC','CAPIT',		'10612',    '7041', 'Plus-values nettes à long terme', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7044,'PCG18-ASSOC','CAPIT',		'1062',    '7040', 'Réserves indisponibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7045,'PCG18-ASSOC','CAPIT',		'1063',    '7040', 'Réserves statutaires ou contractuelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7046,'PCG18-ASSOC','CAPIT',		'1064',    '7040', 'Réserves réglementées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7047,'PCG18-ASSOC','CAPIT',		'10641',    '7046', 'Plus-values nettes à long terme', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7048,'PCG18-ASSOC','CAPIT',		'10643',    '7046', 'Réserves consécutives à l''octroi de subventions d''investissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7049,'PCG18-ASSOC','CAPIT',		'10648',    '7046', 'Autres réserves réglementées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7050,'PCG18-ASSOC','CAPIT',		'1068',    '7040', 'Réserves pour projet de l''entité', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7051,'PCG18-ASSOC','CAPIT',		'10681',    '7050', 'Réserve de propre assureur', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7052,'PCG18-ASSOC','CAPIT',		'10688',    '7050', 'Réserves diverses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7053,'PCG18-ASSOC','CAPIT',		'107',    '7009', 'Ecart d''équivalence', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7054,'PCG18-ASSOC','CAPIT',		'108',    '7009', 'Dotations consomptibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7055,'PCG18-ASSOC','CAPIT',		'1081',    '7054', 'Dotations consomptibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7056,'PCG18-ASSOC','CAPIT',		'1089',    '7054', 'Dotations consomptibles inscrites au compte de résultat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7057,'PCG18-ASSOC','CAPIT',		'109',    '7009', 'Actionnaires : Capital souscrit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7058,'PCG18-ASSOC','CAPIT',		'11',    '7001', 'Report à nouveau (solde créditeur ou débiteur)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7059,'PCG18-ASSOC','CAPIT',		'110',    '7058', 'Report à nouveau (solde créditeur)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7060,'PCG18-ASSOC','CAPIT',		'119',    '7058', 'Report à nouveau (solde débiteur)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7061,'PCG18-ASSOC','CAPIT',		'12',    '7001', 'Résultat de l''exercice (bénéfice ou perte)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7062,'PCG18-ASSOC','CAPIT',		'120',    '7061', 'Résultat de l''exercice (bénéfice)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7063,'PCG18-ASSOC','CAPIT',		'129',    '7061', 'Résultat de l''exercice (perte)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7064,'PCG18-ASSOC','CAPIT',		'13',    '7001', 'Subventions d''investissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7065,'PCG18-ASSOC','CAPIT',		'131',    '7064', 'Subventions d''équipement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7066,'PCG18-ASSOC','CAPIT',		'1311',    '7065', 'Etat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7067,'PCG18-ASSOC','CAPIT',		'1312',    '7065', 'Régions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7068,'PCG18-ASSOC','CAPIT',		'1313',    '7065', 'Départements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7069,'PCG18-ASSOC','CAPIT',		'1314',    '7065', 'Communes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7070,'PCG18-ASSOC','CAPIT',		'1315',    '7065', 'Collectivités publiques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7071,'PCG18-ASSOC','CAPIT',		'1316',    '7065', 'Entreprises publiques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7072,'PCG18-ASSOC','CAPIT',		'1317',    '7065', 'Entreprises et organismes privés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7073,'PCG18-ASSOC','CAPIT',		'1318',    '7065', 'Autres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7074,'PCG18-ASSOC','CAPIT',		'138',    '7064', 'Autres subventions d''investissement (même ventilation que celle du compte 131)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7075,'PCG18-ASSOC','CAPIT',		'139',    '7064', 'Subventions d''investissement inscrites au compte de résultat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7076,'PCG18-ASSOC','CAPIT',		'1391',    '7075', 'Subventions d''équipement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7077,'PCG18-ASSOC','CAPIT',		'13911',    '7076', 'Etat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7078,'PCG18-ASSOC','CAPIT',		'13912',    '7076', 'Régions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7079,'PCG18-ASSOC','CAPIT',		'13913',    '7076', 'Départements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7080,'PCG18-ASSOC','CAPIT',		'13914',    '7076', 'Communes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7081,'PCG18-ASSOC','CAPIT',		'13915',    '7076', 'Collectivités publiques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7082,'PCG18-ASSOC','CAPIT',		'13916',    '7076', 'Entreprises publiques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7083,'PCG18-ASSOC','CAPIT',		'13917',    '7076', 'Entreprises et organismes privés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7084,'PCG18-ASSOC','CAPIT',		'13918',    '7076', 'Autres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7085,'PCG18-ASSOC','CAPIT',		'1398',    '7075', 'Autres subventions d''investissement (même ventilation que celle du compte 1391)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7086,'PCG18-ASSOC','CAPIT',		'14',    '7001', 'Provisions réglementées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7087,'PCG18-ASSOC','CAPIT',		'142',    '7086', 'Provisions réglementées relatives aux immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7088,'PCG18-ASSOC','CAPIT',		'1423',    '7087', 'Provisions pour reconstitution des gisements miniers et pétroliers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7089,'PCG18-ASSOC','CAPIT',		'1424',    '7087', 'Provisions pour investissement (participation des salariés)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7090,'PCG18-ASSOC','CAPIT',		'143',    '7086', 'Provisions réglementées relatives aux stocks', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7091,'PCG18-ASSOC','CAPIT',		'1431',    '7090', 'Hausse des prix', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7092,'PCG18-ASSOC','CAPIT',		'1432',    '7090', 'Fluctuation des cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7093,'PCG18-ASSOC','CAPIT',		'144',    '7086', 'Provisions réglementées relatives aux autres éléments de l''actif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7094,'PCG18-ASSOC','CAPIT',		'145',    '7086', 'Amortissements dérogatoires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7095,'PCG18-ASSOC','CAPIT',		'146',    '7086', 'Provision spéciale de réévaluation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7096,'PCG18-ASSOC','CAPIT',		'147',    '7086', 'Plus-values réinvesties', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7097,'PCG18-ASSOC','CAPIT',		'148',    '7086', 'Autres provisions réglementées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7098,'PCG18-ASSOC','CAPIT',		'15',    '7001', 'Provisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7099,'PCG18-ASSOC','CAPIT',		'151',    '7098', 'Provisions pour risques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7100,'PCG18-ASSOC','CAPIT',		'1511',    '7099', 'Provisions pour litiges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7101,'PCG18-ASSOC','CAPIT',		'1512',    '7099', 'Provisions pour garanties données aux clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7102,'PCG18-ASSOC','CAPIT',		'1513',    '7099', 'Provisions pour pertes sur marchés à terme', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7103,'PCG18-ASSOC','CAPIT',		'1514',    '7099', 'Provisions pour amendes et pénalités', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7104,'PCG18-ASSOC','CAPIT',		'1515',    '7099', 'Provisions pour pertes de change', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7105,'PCG18-ASSOC','CAPIT',		'1516',    '7099', 'Provisions pour pertes sur contrats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7106,'PCG18-ASSOC','CAPIT',		'1518',    '7099', 'Autres provisions pour risques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7107,'PCG18-ASSOC','CAPIT',		'152',    '7098', 'Provisions pour charges sur legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7108,'PCG18-ASSOC','CAPIT',		'153',    '7098', 'Provisions pour pensions et obligations similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7109,'PCG18-ASSOC','CAPIT',		'154',    '7098', 'Provisions pour restructurations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7110,'PCG18-ASSOC','CAPIT',		'155',    '7098', 'Provisions pour impôts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7111,'PCG18-ASSOC','CAPIT',		'156',    '7098', 'Provisions pour renouvellement des immobilisations (entreprises concessionnaires)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7112,'PCG18-ASSOC','CAPIT',		'157',    '7098', 'Provisions pour charges à répartir sur plusieurs exercices', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7113,'PCG18-ASSOC','CAPIT',		'1572',    '7112', 'Provisions pour gros entretien ou grandes révisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7114,'PCG18-ASSOC','CAPIT',		'158',    '7098', 'Autres provisions pour charges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7115,'PCG18-ASSOC','CAPIT',		'1581',    '7114', 'Provisions pour remises en état', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7116,'PCG18-ASSOC','CAPIT',		'16',    '7001', 'Emprunts et dettes assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7117,'PCG18-ASSOC','CAPIT',		'161',    '7116', 'Emprunts obligataires convertibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7118,'PCG18-ASSOC','CAPIT',		'162',    '7116', 'Obligations représentatives de passifs nets remis en fiducie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7119,'PCG18-ASSOC','CAPIT',		'163',    '7116', 'Autres emprunts obligataires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7120,'PCG18-ASSOC','CAPIT',		'1631',    '7119', 'Titres associatifs et assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7121,'PCG18-ASSOC','CAPIT',		'164',    '7116', 'Emprunts auprès des établissements de crédit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7122,'PCG18-ASSOC','CAPIT',		'165',    '7116', 'Dépôts et cautionnements reçus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7123,'PCG18-ASSOC','CAPIT',		'1651',    '7122', 'Dépôts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7124,'PCG18-ASSOC','CAPIT',		'1655',    '7122', 'Cautionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7125,'PCG18-ASSOC','CAPIT',		'166',    '7116', 'Participation des salariés aux résultats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7126,'PCG18-ASSOC','CAPIT',		'1661',    '7125', 'Comptes bloqués', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7127,'PCG18-ASSOC','CAPIT',		'1662',    '7125', 'Fonds de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7128,'PCG18-ASSOC','CAPIT',		'167',    '7116', 'Emprunts et dettes assortis de conditions particulières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7129,'PCG18-ASSOC','CAPIT',		'1671',    '7128', 'Emissions de titres participatifs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7130,'PCG18-ASSOC','CAPIT',		'1674',    '7128', 'Avances conditionnées de l''Etat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7131,'PCG18-ASSOC','CAPIT',		'1675',    '7128', 'Emprunts participatifs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7132,'PCG18-ASSOC','CAPIT',		'168',    '7116', 'Autres emprunts et dettes assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7133,'PCG18-ASSOC','CAPIT',		'1681',    '7132', 'Autres emprunts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7134,'PCG18-ASSOC','CAPIT',		'1685',    '7132', 'Rentes viagères capitalisées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7135,'PCG18-ASSOC','CAPIT',		'1687',    '7132', 'Autres dettes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7136,'PCG18-ASSOC','CAPIT',		'1688',    '7132', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7137,'PCG18-ASSOC','CAPIT',		'16881',    '7136', 'sur emprunts obligataires convertibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7138,'PCG18-ASSOC','CAPIT',		'16883',    '7136', 'sur autres emprunts obligataires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7139,'PCG18-ASSOC','CAPIT',		'16884',    '7136', 'sur emprunts auprès des établissements de crédit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7140,'PCG18-ASSOC','CAPIT',		'16885',    '7136', 'sur dépôts et cautionnements reçus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7141,'PCG18-ASSOC','CAPIT',		'16886',    '7136', 'sur participation des salariés aux résultats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7142,'PCG18-ASSOC','CAPIT',		'16887',    '7136', 'sur emprunts et dettes assortis de conditions particulières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7143,'PCG18-ASSOC','CAPIT',		'16888',    '7136', 'sur autres emprunts et dettes assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7144,'PCG18-ASSOC','CAPIT',		'169',    '7116', 'Primes de remboursement des obligations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7145,'PCG18-ASSOC','CAPIT',		'17',    '7001', 'Dettes rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7146,'PCG18-ASSOC','CAPIT',		'171',    '7145', 'Dettes rattachées à des participations (groupe)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7147,'PCG18-ASSOC','CAPIT',		'174',    '7145', 'Dettes rattachées à des participations (hors groupe)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7148,'PCG18-ASSOC','CAPIT',		'178',    '7145', 'Dettes rattachées à des sociétés en participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7149,'PCG18-ASSOC','CAPIT',		'1781',    '7148', 'Principal', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7150,'PCG18-ASSOC','CAPIT',		'1788',    '7148', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7151,'PCG18-ASSOC','CAPIT',		'18',    '7001', 'Comptes de liaison des établissements et sociétés en participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7152,'PCG18-ASSOC','CAPIT',		'181',    '7151', 'Comptes de liaison des établissements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7153,'PCG18-ASSOC','CAPIT',		'186',    '7151', 'Biens et prestations de services échangés entre établissements (charges)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7154,'PCG18-ASSOC','CAPIT',		'187',    '7151', 'Biens et prestations de services échangés entre établissements (produits)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7155,'PCG18-ASSOC','CAPIT',		'188',    '7151', 'Comptes de liaison des sociétés en participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7156,'PCG18-ASSOC','CAPIT',		'19',    '7001', 'Fonds dédiés ou reportés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7157,'PCG18-ASSOC','CAPIT',		'191',    '7156', 'Fonds reportés liés aux legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7158,'PCG18-ASSOC','CAPIT',		'1911',    '7157', 'Legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7159,'PCG18-ASSOC','CAPIT',		'1912',    '7157', 'Donations temporaires d''usufruit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7160,'PCG18-ASSOC','CAPIT',		'194',    '7156', 'Fonds dédiés sur subventions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7161,'PCG18-ASSOC','CAPIT',		'195',    '7156', 'Fonds dédiés sur contributions financières d''autres organismes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7162,'PCG18-ASSOC','CAPIT',		'196',    '7156', 'Fonds dédiés sur ressources liées à la générosité du public', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7164,'PCG18-ASSOC','IMMO',		'20',    '7002', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7165,'PCG18-ASSOC','IMMO',		'201',    '7164', 'Frais d''établissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7166,'PCG18-ASSOC','IMMO',		'2011',    '7165', 'Frais de constitution', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7167,'PCG18-ASSOC','IMMO',		'2012',    '7165', 'Frais de premier établissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7168,'PCG18-ASSOC','IMMO',		'20121',    '7167', 'Frais de prospection', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7169,'PCG18-ASSOC','IMMO',		'20122',    '7167', 'Frais de publicité', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7170,'PCG18-ASSOC','IMMO',		'2013',    '7165', 'Frais d''augmentation de capital et d''opérations diverses (fusions, scissions, transformations)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7171,'PCG18-ASSOC','IMMO',		'203',    '7164', 'Frais de recherche et de développement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7172,'PCG18-ASSOC','IMMO',		'204',    '7164', 'Donations temporaires d''usufruit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7173,'PCG18-ASSOC','IMMO',		'205',    '7164', 'Concessions et droits similaires, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7174,'PCG18-ASSOC','IMMO',		'206',    '7164', 'Droit au bail', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7175,'PCG18-ASSOC','IMMO',		'207',    '7164', 'Fonds commercial', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7176,'PCG18-ASSOC','IMMO',		'208',    '7164', 'Autres immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7177,'PCG18-ASSOC','IMMO',		'2081',    '7176', 'Mali de fusion sur actifs incorporels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7178,'PCG18-ASSOC','IMMO',		'21',    '7002', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7179,'PCG18-ASSOC','IMMO',		'211',    '7178', 'Terrains', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7180,'PCG18-ASSOC','IMMO',		'2111',    '7179', 'Terrains nus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7181,'PCG18-ASSOC','IMMO',		'2112',    '7179', 'Terrains aménagés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7182,'PCG18-ASSOC','IMMO',		'2113',    '7179', 'Sous', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7183,'PCG18-ASSOC','IMMO',		'2114',    '7179', 'Terrains de carrières (Tréfonds)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7184,'PCG18-ASSOC','IMMO',		'2115',    '7179', 'Terrains bâtis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7185,'PCG18-ASSOC','IMMO',		'21151',    '7184', 'Ensembles immobiliers industriels (A, B)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7186,'PCG18-ASSOC','IMMO',		'21155',    '7184', 'Ensembles immobiliers administratifs et commerciaux (A, B)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7187,'PCG18-ASSOC','IMMO',		'21158',    '7184', 'Autres ensembles immobiliers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7188,'PCG18-ASSOC','IMMO',		'211581',    '7187', 'affectés aux opérations professionnelles (A, B)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7189,'PCG18-ASSOC','IMMO',		'211588',    '7187', 'affectés aux opérations non professionnelles (A, B)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7190,'PCG18-ASSOC','IMMO',		'2116',    '7179', 'Compte d''ordre sur immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7191,'PCG18-ASSOC','IMMO',		'212',    '7178', 'Agencements et aménagements de terrains (même ventilation que celle du compte 211)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7192,'PCG18-ASSOC','IMMO',		'213',    '7178', 'Constructions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7193,'PCG18-ASSOC','IMMO',		'2131',    '7192', 'Bâtiments', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7194,'PCG18-ASSOC','IMMO',		'21311',    '7193', 'Ensembles immobiliers industriels (A, B)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7195,'PCG18-ASSOC','IMMO',		'21315',    '7193', 'Ensembles immobiliers administratifs et commerciaux (A, B)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7196,'PCG18-ASSOC','IMMO',		'21318',    '7193', 'Autres ensembles immobiliers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7197,'PCG18-ASSOC','IMMO',		'213181',    '7196', 'affectés aux opérations professionnelles (A, B)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7198,'PCG18-ASSOC','IMMO',		'213188',    '7196', 'affectés aux opérations non professionnelles (A, B)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7199,'PCG18-ASSOC','IMMO',		'2135',    '7192', 'Installations générales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7200,'PCG18-ASSOC','IMMO',		'21351',    '7199', 'Ensembles immobiliers industriels (A, B)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7201,'PCG18-ASSOC','IMMO',		'21355',    '7199', 'Ensembles immobiliers administratifs et commerciaux (A, B)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7202,'PCG18-ASSOC','IMMO',		'21358',    '7199', 'Autres ensembles immobiliers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7203,'PCG18-ASSOC','IMMO',		'213581',    '7202', 'affectés aux opérations professionnelles (A, B)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7204,'PCG18-ASSOC','IMMO',		'213588',    '7202', 'affectés aux opérations non professionnelles (A, B)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7205,'PCG18-ASSOC','IMMO',		'2138',    '7192', 'Ouvrages d''infrastructure', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7206,'PCG18-ASSOC','IMMO',		'21381',    '7205', 'Voies de terre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7207,'PCG18-ASSOC','IMMO',		'21382',    '7205', 'Voies de fer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7208,'PCG18-ASSOC','IMMO',		'21383',    '7205', 'Voies d''eau', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7209,'PCG18-ASSOC','IMMO',		'21384',    '7205', 'Barrages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7210,'PCG18-ASSOC','IMMO',		'21385',    '7205', 'Pistes d''aérodromes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7211,'PCG18-ASSOC','IMMO',		'214',    '7178', 'Constructions sur sol d''autrui (même ventilation que celle du compte 213)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7212,'PCG18-ASSOC','IMMO',		'215',    '7178', 'Installations techniques, matériels et outillage industriels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7213,'PCG18-ASSOC','IMMO',		'2151',    '7212', 'Installations complexes spécialisées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7214,'PCG18-ASSOC','IMMO',		'21511',    '7213', 'sur sol propre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7215,'PCG18-ASSOC','IMMO',		'21514',    '7213', 'sur sol d''autrui', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7216,'PCG18-ASSOC','IMMO',		'2153',    '7212', 'Installations à caractère spécifique', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7217,'PCG18-ASSOC','IMMO',		'21531',    '7216', 'sur sol propre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7218,'PCG18-ASSOC','IMMO',		'21534',    '7216', 'sur sol d''autrui', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7219,'PCG18-ASSOC','IMMO',		'2154',    '7212', 'Matériel industriel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7220,'PCG18-ASSOC','IMMO',		'2155',    '7212', 'Outillage industriel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7221,'PCG18-ASSOC','IMMO',		'2157',    '7212', 'Agencements et aménagements du matériel et outillage industriels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7222,'PCG18-ASSOC','IMMO',		'218',    '7178', 'Autres immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7223,'PCG18-ASSOC','IMMO',		'2181',    '7222', 'Installations générales, agencements, aménagements divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7224,'PCG18-ASSOC','IMMO',		'2182',    '7222', 'Matériel de transport', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7225,'PCG18-ASSOC','IMMO',		'2183',    '7222', 'Matériel de bureau et matériel informatique', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7226,'PCG18-ASSOC','IMMO',		'2184',    '7222', 'Mobilier', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7227,'PCG18-ASSOC','IMMO',		'2185',    '7222', 'Cheptel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7228,'PCG18-ASSOC','IMMO',		'2186',    '7222', 'Emballages récupérables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7229,'PCG18-ASSOC','IMMO',		'2187',    '7222', 'Mali de fusions sur actifs corporels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7230,'PCG18-ASSOC','IMMO',		'22',    '7002', 'Immobilisations mises en concession', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7231,'PCG18-ASSOC','IMMO',		'23',    '7002', 'Immobilisations en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7232,'PCG18-ASSOC','IMMO',		'231',    '7231', 'Immobilisations corporelles en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7233,'PCG18-ASSOC','IMMO',		'2312',    '7232', 'Terrains', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7234,'PCG18-ASSOC','IMMO',		'2313',    '7232', 'Constructions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7235,'PCG18-ASSOC','IMMO',		'2315',    '7232', 'Installations techniques, matériel et outillage industriels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7236,'PCG18-ASSOC','IMMO',		'2318',    '7232', 'Autres immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7237,'PCG18-ASSOC','IMMO',		'232',    '7231', 'Immobilisations incorporelles en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7238,'PCG18-ASSOC','IMMO',		'237',    '7231', 'Avances et acomptes versés sur immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7239,'PCG18-ASSOC','IMMO',		'238',    '7231', 'Avances et acomptes versés sur commandes d''immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7240,'PCG18-ASSOC','IMMO',		'2382',    '7239', 'Terrains', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7241,'PCG18-ASSOC','IMMO',		'2383',    '7239', 'Constructions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7242,'PCG18-ASSOC','IMMO',		'2385',    '7239', 'Installations techniques, matériel et outillage industriels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7243,'PCG18-ASSOC','IMMO',		'2388',    '7239', 'Autres immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7244,'PCG18-ASSOC','IMMO',		'24',    '7002', 'Biens reçus par legs ou donations destinés à être cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7245,'PCG18-ASSOC','IMMO',		'25',    '7002', 'Parts dans des entreprises liées et créances sur des entreprises liées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7246,'PCG18-ASSOC','IMMO',		'26',    '7002', 'Participations et créances rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7247,'PCG18-ASSOC','IMMO',		'261',    '7246', 'Titres de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7248,'PCG18-ASSOC','IMMO',		'2611',    '7247', 'Actions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7249,'PCG18-ASSOC','IMMO',		'2618',    '7247', 'Autres titres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7250,'PCG18-ASSOC','IMMO',		'266',    '7246', 'Autres formes de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7251,'PCG18-ASSOC','IMMO',		'2661',    '7250', 'Droits représentatifs d''actifs nets remis en fiducie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7252,'PCG18-ASSOC','IMMO',		'267',    '7246', 'Créances rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7253,'PCG18-ASSOC','IMMO',		'2671',    '7252', 'Créances rattachées à des participations (groupe)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7254,'PCG18-ASSOC','IMMO',		'2674',    '7252', 'Créances rattachées à des participations (hors groupe)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7255,'PCG18-ASSOC','IMMO',		'2675',    '7252', 'Versements représentatifs d''apports non capitalisés (appel de fonds)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7256,'PCG18-ASSOC','IMMO',		'2676',    '7252', 'Avances consolidables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7257,'PCG18-ASSOC','IMMO',		'2677',    '7252', 'Autres créances rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7258,'PCG18-ASSOC','IMMO',		'2678',    '7252', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7259,'PCG18-ASSOC','IMMO',		'268',    '7246', 'Créances rattachées à des sociétés en participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7260,'PCG18-ASSOC','IMMO',		'2681',    '7259', 'Principal', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7261,'PCG18-ASSOC','IMMO',		'2688',    '7259', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7262,'PCG18-ASSOC','IMMO',		'269',    '7246', 'Versements restant à effectuer sur titres de participation non libérés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7263,'PCG18-ASSOC','IMMO',		'27',    '7002', 'Autres immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7264,'PCG18-ASSOC','IMMO',		'271',    '7263', 'Titres immobilisés autres que les titres immobilisés de l''activité de portefeuille (droit de propriété)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7265,'PCG18-ASSOC','IMMO',		'2711',    '7264', 'Actions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7266,'PCG18-ASSOC','IMMO',		'2718',    '7264', 'Autres titres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7267,'PCG18-ASSOC','IMMO',		'272',    '7263', 'Titres immobilisés (droit de créance)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7268,'PCG18-ASSOC','IMMO',		'2721',    '7267', 'Obligations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7269,'PCG18-ASSOC','IMMO',		'2722',    '7267', 'Bons', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7270,'PCG18-ASSOC','IMMO',		'273',    '7263', 'Titres immobilisés de l''activité de portefeuille', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7271,'PCG18-ASSOC','IMMO',		'274',    '7263', 'Prêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7272,'PCG18-ASSOC','IMMO',		'2741',    '7271', 'Prêts participatifs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7273,'PCG18-ASSOC','IMMO',		'2742',    '7271', 'Prêts aux partenaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7274,'PCG18-ASSOC','IMMO',		'2743',    '7271', 'Prêts au personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7275,'PCG18-ASSOC','IMMO',		'2748',    '7271', 'Autres prêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7276,'PCG18-ASSOC','IMMO',		'275',    '7263', 'Dépôts et cautionnements versés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7277,'PCG18-ASSOC','IMMO',		'2751',    '7276', 'Dépôts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7278,'PCG18-ASSOC','IMMO',		'2755',    '7276', 'Cautionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7279,'PCG18-ASSOC','IMMO',		'276',    '7263', 'Autres créances immobilisées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7280,'PCG18-ASSOC','IMMO',		'2761',    '7279', 'Créances diverses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7281,'PCG18-ASSOC','IMMO',		'2768',    '7279', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7282,'PCG18-ASSOC','IMMO',		'27682',    '7281', 'sur titres immobilisés (droit de créance)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7283,'PCG18-ASSOC','IMMO',		'27684',    '7281', 'sur prêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7284,'PCG18-ASSOC','IMMO',		'27685',    '7281', 'sur dépôts et cautionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7285,'PCG18-ASSOC','IMMO',		'27688',    '7281', 'sur créances diverses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7286,'PCG18-ASSOC','IMMO',		'277',    '7263', '(Actions propres ou parts propres)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7287,'PCG18-ASSOC','IMMO',		'2771',    '7286', 'Actions propres ou parts propres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7288,'PCG18-ASSOC','IMMO',		'2772',    '7286', 'Actions propres ou parts propres en voie d''annulation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7289,'PCG18-ASSOC','IMMO',		'278',    '7263', 'Mali de fusion sur actifs financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7290,'PCG18-ASSOC','IMMO',		'279',    '7263', 'Versements restant à effectuer sur titres immobilisés non libérés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7291,'PCG18-ASSOC','IMMO',		'28',    '7002', 'Amortissements des immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7292,'PCG18-ASSOC','IMMO',		'280',    '7291', 'Amortissements des immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7293,'PCG18-ASSOC','IMMO',		'2801',    '7292', 'Frais d''établissement (même ventilation que celle du compte 201)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7294,'PCG18-ASSOC','IMMO',		'2803',    '7292', 'Frais de recherche et de développement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7295,'PCG18-ASSOC','IMMO',		'2804',    '7292', 'Donations temporaires d''usufruit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7296,'PCG18-ASSOC','IMMO',		'2805',    '7292', 'Concessions et droits similaires, brevets, licences, logiciels, droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7297,'PCG18-ASSOC','IMMO',		'2807',    '7292', 'Fonds commercial', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7298,'PCG18-ASSOC','IMMO',		'2808',    '7292', 'Autres immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7299,'PCG18-ASSOC','IMMO',		'28081',    '7298', 'Amortissements du mali de fusion sur actifs incorporels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7300,'PCG18-ASSOC','IMMO',		'281',    '7291', 'Amortissements des immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7301,'PCG18-ASSOC','IMMO',		'2812',    '7300', 'Agencements, aménagements de terrains (même ventilation que celle du compte 212)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7302,'PCG18-ASSOC','IMMO',		'2813',    '7300', 'Constructions (même ventilation que celle du compte 213)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7303,'PCG18-ASSOC','IMMO',		'2814',    '7300', 'Constructions sur sol d''autrui (même ventilation que celle du compte 214)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7304,'PCG18-ASSOC','IMMO',		'2815',    '7300', 'Installations, matériel et outillage industriels (même ventilation que celle du compte 215)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7305,'PCG18-ASSOC','IMMO',		'2818',    '7300', 'Autres immobilisations corporelles (même ventilation que celle du compte 218)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7306,'PCG18-ASSOC','IMMO',		'28187',    '7305', 'Amortissement du mali de fusion sur actifs corporels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7307,'PCG18-ASSOC','IMMO',		'282',    '7291', 'Amortissements des immobilisations mises en concession', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7308,'PCG18-ASSOC','IMMO',		'29',    '7002', 'Dépréciations des immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7309,'PCG18-ASSOC','IMMO',		'290',    '7308', 'Dépréciations des immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7310,'PCG18-ASSOC','IMMO',		'2905',    '7309', 'Marques, procédés, droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7311,'PCG18-ASSOC','IMMO',		'2906',    '7309', 'Droit au bail', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7312,'PCG18-ASSOC','IMMO',		'2907',    '7309', 'Fonds commercial', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7313,'PCG18-ASSOC','IMMO',		'2908',    '7309', 'Autres immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7314,'PCG18-ASSOC','IMMO',		'29081',    '7313', 'Dépréciation du mali de fusion sur actifs incorporels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7315,'PCG18-ASSOC','IMMO',		'291',    '7308', 'Dépréciations des immobilisations corporelles (même ventilation que celle du compte 21)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7316,'PCG18-ASSOC','IMMO',		'29187',    '7315', 'Dépréciation du mali de fusion sur actifs corporels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7317,'PCG18-ASSOC','IMMO',		'292',    '7308', 'Dépréciations des immobilisations mises en concession', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7318,'PCG18-ASSOC','IMMO',		'293',    '7308', 'Dépréciations des immobilisations en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7319,'PCG18-ASSOC','IMMO',		'2931',    '7318', 'Immobilisations corporelles en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7320,'PCG18-ASSOC','IMMO',		'2932',    '7318', 'Immobilisations incorporelles en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7321,'PCG18-ASSOC','IMMO',		'294',    '7308', 'Dépréciations des biens reçus par legs ou donations destinés à être cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7322,'PCG18-ASSOC','IMMO',		'296',    '7308', 'Dépréciations des participations et créances rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7323,'PCG18-ASSOC','IMMO',		'2961',    '7322', 'Titres de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7324,'PCG18-ASSOC','IMMO',		'2966',    '7322', 'Autres formes de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7325,'PCG18-ASSOC','IMMO',		'2967',    '7322', 'Créances rattachées à des participations (même ventilation que celle du compte 267)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7326,'PCG18-ASSOC','IMMO',		'2968',    '7322', 'Créances rattachées à des sociétés en participation (même ventilation que celle du compte 268)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7327,'PCG18-ASSOC','IMMO',		'297',    '7308', 'Dépréciations des autres immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7328,'PCG18-ASSOC','IMMO',		'2971',    '7327', 'Titres immobilisés autres que les titres immobilisés de l''activité de portefeuille', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7329,'PCG18-ASSOC','IMMO',		'2972',    '7327', 'Droit de créance (même ventilation que celle du compte 272)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7330,'PCG18-ASSOC','IMMO',		'2973',    '7327', 'Titres immobilisés de l''activité de portefeuille', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7331,'PCG18-ASSOC','IMMO',		'2974',    '7327', 'Prêts (même ventilation que celle du compte 274)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7332,'PCG18-ASSOC','IMMO',		'2975',    '7327', 'Dépôts et cautionnements versés (même ventilation que celle du compte 275)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7333,'PCG18-ASSOC','IMMO',		'2976',    '7327', 'Autres créances immobilisées (même ventilation que celle du compte 276)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7334,'PCG18-ASSOC','IMMO',		'29787',    '7327', 'Dépréciation du mali de fusion sur actifs financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7336,'PCG18-ASSOC','STOCK',		'31',    '7003', 'Matières premières (et fournitures)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7337,'PCG18-ASSOC','STOCK',		'311',    '7336', 'Matières (ou groupe) A', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7338,'PCG18-ASSOC','STOCK',		'312',    '7336', 'Matières (ou groupe) B', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7339,'PCG18-ASSOC','STOCK',		'317',    '7336', 'Fournitures A, B, C,', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7340,'PCG18-ASSOC','STOCK',		'32',    '7003', 'Autres approvisionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7341,'PCG18-ASSOC','STOCK',		'321',    '7340', 'Matières consommables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7342,'PCG18-ASSOC','STOCK',		'3211',    '7341', 'Matières (ou groupe) C', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7343,'PCG18-ASSOC','STOCK',		'3212',    '7341', 'Matières (ou groupe) D', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7344,'PCG18-ASSOC','STOCK',		'322',    '7340', 'Fournitures consommables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7345,'PCG18-ASSOC','STOCK',		'3221',    '7344', 'Combustibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7346,'PCG18-ASSOC','STOCK',		'3222',    '7344', 'Produits d''entretien', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7347,'PCG18-ASSOC','STOCK',		'3223',    '7344', 'Fournitures d''atelier et d''usine', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7348,'PCG18-ASSOC','STOCK',		'3224',    '7344', 'Fournitures de magasin', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7349,'PCG18-ASSOC','STOCK',		'3225',    '7344', 'Fournitures de bureau', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7350,'PCG18-ASSOC','STOCK',		'326',    '7340', 'Emballages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7351,'PCG18-ASSOC','STOCK',		'3261',    '7350', 'Emballages perdus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7352,'PCG18-ASSOC','STOCK',		'3265',    '7350', 'Emballages récupérables non identifiables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7353,'PCG18-ASSOC','STOCK',		'3267',    '7350', 'Emballages à usage mixte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7354,'PCG18-ASSOC','STOCK',		'33',    '7003', 'En-cours de production de biens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7355,'PCG18-ASSOC','STOCK',		'331',    '7354', 'Produits en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7356,'PCG18-ASSOC','STOCK',		'3311',    '7355', 'Produits en cours P 1', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7357,'PCG18-ASSOC','STOCK',		'3312',    '7355', 'Produits en cours P 2', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7358,'PCG18-ASSOC','STOCK',		'335',    '7354', 'Travaux en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7359,'PCG18-ASSOC','STOCK',		'3351',    '7358', 'Travaux en cours T 1', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7360,'PCG18-ASSOC','STOCK',		'3352',    '7358', 'Travaux en cours T 2', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7361,'PCG18-ASSOC','STOCK',		'34',    '7003', 'En-cours de production de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7362,'PCG18-ASSOC','STOCK',		'341',    '7361', 'Etudes en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7363,'PCG18-ASSOC','STOCK',		'3411',    '7362', 'Etudes en cours E 1', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7364,'PCG18-ASSOC','STOCK',		'3412',    '7362', 'Etudes en cours E 2', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7365,'PCG18-ASSOC','STOCK',		'345',    '7361', 'Prestations de services en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7366,'PCG18-ASSOC','STOCK',		'3451',    '7365', 'Prestations de services S 1', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7367,'PCG18-ASSOC','STOCK',		'3452',    '7365', 'Prestations de services S 2', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7368,'PCG18-ASSOC','STOCK',		'35',    '7003', 'Stocks de produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7369,'PCG18-ASSOC','STOCK',		'351',    '7368', 'Produits intermédiaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7370,'PCG18-ASSOC','STOCK',		'3511',    '7369', 'Produits intermédiaires (ou groupe) A', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7371,'PCG18-ASSOC','STOCK',		'3512',    '7369', 'Produits intermédiaires (ou groupe) B', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7372,'PCG18-ASSOC','STOCK',		'355',    '7368', 'Produits finis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7373,'PCG18-ASSOC','STOCK',		'3551',    '7372', 'Produits finis (ou groupe) A', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7374,'PCG18-ASSOC','STOCK',		'3552',    '7372', 'Produits finis (ou groupe) B', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7375,'PCG18-ASSOC','STOCK',		'358',    '7368', 'Produits résiduels (ou matières de récupération)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7376,'PCG18-ASSOC','STOCK',		'3581',    '7375', 'Déchets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7377,'PCG18-ASSOC','STOCK',		'3585',    '7375', 'Rebuts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7378,'PCG18-ASSOC','STOCK',		'3586',    '7375', 'Matières de récupération', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7379,'PCG18-ASSOC','STOCK',		'36',    '7003', '(compte à ouvrir, le cas échéant, sous l''intitulé « Stocks provenant d''immobilisations »)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7380,'PCG18-ASSOC','STOCK',		'37',    '7003', 'Stocks de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7381,'PCG18-ASSOC','STOCK',		'371',    '7380', 'Marchandises (ou groupe) A', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7382,'PCG18-ASSOC','STOCK',		'372',    '7380', 'Marchandises (ou groupe) B', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7383,'PCG18-ASSOC','STOCK',		'38',    '7003', '(lorsque l''entité tient un inventaire permanent en comptabilité générale, le compte 38 peut être utilisé pour comptabiliser les stocks en voie d''acheminement, mis en dépôt ou donnés en consignation)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7384,'PCG18-ASSOC','STOCK',		'39',    '7003', 'Dépréciations des stocks et en-cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7385,'PCG18-ASSOC','STOCK',		'391',    '7384', 'Dépréciations des matières premières (et fournitures)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7386,'PCG18-ASSOC','STOCK',		'3911',    '7385', 'Matières (ou groupe) A', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7387,'PCG18-ASSOC','STOCK',		'3912',    '7385', 'Matières (ou groupe) B', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7388,'PCG18-ASSOC','STOCK',		'3917',    '7385', 'Fournitures A, B, C,', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7389,'PCG18-ASSOC','STOCK',		'392',    '7384', 'Dépréciations des autres approvisionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7390,'PCG18-ASSOC','STOCK',		'3921',    '7389', 'Matières consommables (même ventilation que celle du compte 321)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7391,'PCG18-ASSOC','STOCK',		'3922',    '7389', 'Fournitures consommables (même ventilation que celle du compte 322)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7392,'PCG18-ASSOC','STOCK',		'3926',    '7389', 'Emballages (même ventilation que celle du compte 326)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7393,'PCG18-ASSOC','STOCK',		'393',    '7384', 'Dépréciations des en-cours de production de biens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7394,'PCG18-ASSOC','STOCK',		'3931',    '7393', 'Produits en cours (même ventilation que celle du compte 331)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7395,'PCG18-ASSOC','STOCK',		'3935',    '7393', 'Travaux en cours (même ventilation que celle du compte 335)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7396,'PCG18-ASSOC','STOCK',		'394',    '7384', 'Dépréciations des en-cours de production de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7397,'PCG18-ASSOC','STOCK',		'3941',    '7396', 'Etudes en cours (même ventilation que celle du compte 341)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7398,'PCG18-ASSOC','STOCK',		'3945',    '7396', 'Prestations de services en cours (même ventilation que celle du compte 345)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7399,'PCG18-ASSOC','STOCK',		'395',    '7384', 'Dépréciations des stocks de produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7400,'PCG18-ASSOC','STOCK',		'3951',    '7399', 'Produits intermédiaires (même ventilation que celle du compte 351)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7401,'PCG18-ASSOC','STOCK',		'3955',    '7399', 'Produits finis (même ventilation que celle du compte 355)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7402,'PCG18-ASSOC','STOCK',		'397',    '7384', 'Dépréciations des stocks de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7403,'PCG18-ASSOC','STOCK',		'3971',    '7402', 'Marchandise (ou groupe) A', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7404,'PCG18-ASSOC','STOCK',		'3972',    '7402', 'Marchandise (ou groupe) B', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7406,'PCG18-ASSOC','THIRDPARTY',		'40',    '7004', 'Fournisseurs et comptes rattachés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7407,'PCG18-ASSOC','THIRDPARTY',		'400',    '7406', 'Fournisseurs et comptes rattachés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7408,'PCG18-ASSOC','THIRDPARTY',		'401',    '7406', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7409,'PCG18-ASSOC','THIRDPARTY',		'4011',    '7408', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7410,'PCG18-ASSOC','THIRDPARTY',		'4017',    '7408', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7411,'PCG18-ASSOC','THIRDPARTY',		'403',    '7406', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7412,'PCG18-ASSOC','THIRDPARTY',		'404',    '7406', 'Fournisseurs d''immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7413,'PCG18-ASSOC','THIRDPARTY',		'4041',    '7412', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7414,'PCG18-ASSOC','THIRDPARTY',		'4047',    '7412', 'Fournisseurs d''immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7415,'PCG18-ASSOC','THIRDPARTY',		'405',    '7406', 'Fournisseurs d''immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7416,'PCG18-ASSOC','THIRDPARTY',		'408',    '7406', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7417,'PCG18-ASSOC','THIRDPARTY',		'4081',    '7416', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7418,'PCG18-ASSOC','THIRDPARTY',		'4084',    '7416', 'Fournisseurs d''immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7419,'PCG18-ASSOC','THIRDPARTY',		'4088',    '7416', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7420,'PCG18-ASSOC','THIRDPARTY',		'409',    '7406', 'Fournisseurs débiteurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7421,'PCG18-ASSOC','THIRDPARTY',		'4091',    '7420', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7422,'PCG18-ASSOC','THIRDPARTY',		'4096',    '7420', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7423,'PCG18-ASSOC','THIRDPARTY',		'4097',    '7420', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7424,'PCG18-ASSOC','THIRDPARTY',		'40971',    '7423', 'Fournisseurs d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7425,'PCG18-ASSOC','THIRDPARTY',		'40974',    '7423', 'Fournisseurs d''immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7426,'PCG18-ASSOC','THIRDPARTY',		'4098',    '7420', 'Rabais, remises, ristournes à obtenir et autres avoirs non encore reçus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7427,'PCG18-ASSOC','THIRDPARTY',		'41',    '7004', 'Clients, adhérents, usagers et comptes rattachés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7428,'PCG18-ASSOC','THIRDPARTY',		'410',    '7427', 'Clients et comptes rattachés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7429,'PCG18-ASSOC','THIRDPARTY',		'411',    '7427', 'Clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7430,'PCG18-ASSOC','THIRDPARTY',		'4111',    '7429', 'Clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7431,'PCG18-ASSOC','THIRDPARTY',		'4117',    '7429', 'Clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7432,'PCG18-ASSOC','THIRDPARTY',		'413',    '7427', 'Clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7433,'PCG18-ASSOC','THIRDPARTY',		'416',    '7427', 'Clients douteux ou litigieux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7434,'PCG18-ASSOC','THIRDPARTY',		'418',    '7427', 'Clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7435,'PCG18-ASSOC','THIRDPARTY',		'4181',    '7434', 'Clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7436,'PCG18-ASSOC','THIRDPARTY',		'4188',    '7434', 'Clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7437,'PCG18-ASSOC','THIRDPARTY',		'419',    '7427', 'Clients créditeurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7438,'PCG18-ASSOC','THIRDPARTY',		'4191',    '7437', 'Clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7439,'PCG18-ASSOC','THIRDPARTY',		'4196',    '7437', 'Clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7440,'PCG18-ASSOC','THIRDPARTY',		'4197',    '7437', 'Clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7441,'PCG18-ASSOC','THIRDPARTY',		'4198',    '7437', 'Rabais, remises, ristournes à accorder et autres avoirs à établir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7442,'PCG18-ASSOC','THIRDPARTY',		'42',    '7004', 'Personnel et comptes rattachés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7443,'PCG18-ASSOC','THIRDPARTY',		'421',    '7442', 'Personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7444,'PCG18-ASSOC','THIRDPARTY',		'422',    '7442', 'Comités d''entreprises, d''établissement, …', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7445,'PCG18-ASSOC','THIRDPARTY',		'424',    '7442', 'Participation des salariés aux résultats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7446,'PCG18-ASSOC','THIRDPARTY',		'4246',    '7445', 'Réserve spéciale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7447,'PCG18-ASSOC','THIRDPARTY',		'4248',    '7445', 'Comptes courants', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7448,'PCG18-ASSOC','THIRDPARTY',		'425',    '7442', 'Personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7449,'PCG18-ASSOC','THIRDPARTY',		'426',    '7442', 'Personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7450,'PCG18-ASSOC','THIRDPARTY',		'427',    '7442', 'Personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7451,'PCG18-ASSOC','THIRDPARTY',		'428',    '7442', 'Personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7452,'PCG18-ASSOC','THIRDPARTY',		'4282',    '7451', 'Dettes provisionnées pour congés à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7453,'PCG18-ASSOC','THIRDPARTY',		'4284',    '7451', 'Dettes provisionnées pour participation des salariés aux résultats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7454,'PCG18-ASSOC','THIRDPARTY',		'4286',    '7451', 'Autres charges à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7455,'PCG18-ASSOC','THIRDPARTY',		'4287',    '7451', 'Produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7456,'PCG18-ASSOC','THIRDPARTY',		'43',    '7004', 'Legs, donations et assurances-vie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7457,'PCG18-ASSOC','THIRDPARTY',		'431',    '7456', 'Sécurité sociale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7458,'PCG18-ASSOC','THIRDPARTY',		'437',    '7456', 'Autres organismes sociaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7459,'PCG18-ASSOC','THIRDPARTY',		'438',    '7456', 'Organismes sociaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7460,'PCG18-ASSOC','THIRDPARTY',		'4382',    '7459', 'Charges sociales sur congés à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7461,'PCG18-ASSOC','THIRDPARTY',		'4386',    '7459', 'Autres charges à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7462,'PCG18-ASSOC','THIRDPARTY',		'4387',    '7459', 'Produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7463,'PCG18-ASSOC','THIRDPARTY',		'44',    '7004', 'État et autres collectivités publiques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7464,'PCG18-ASSOC','THIRDPARTY',		'441',    '7463', 'État', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7465,'PCG18-ASSOC','THIRDPARTY',		'4411',    '7464', 'Subventions d''investissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7466,'PCG18-ASSOC','THIRDPARTY',		'4417',    '7464', 'Subventions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7467,'PCG18-ASSOC','THIRDPARTY',		'4418',    '7464', 'Subventions d''équilibre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7468,'PCG18-ASSOC','THIRDPARTY',		'4419',    '7464', 'Avances sur subventions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7469,'PCG18-ASSOC','THIRDPARTY',		'442',    '7463', 'Etat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7470,'PCG18-ASSOC','THIRDPARTY',		'4424',    '7469', 'Obligataires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7471,'PCG18-ASSOC','THIRDPARTY',		'4425',    '7469', 'Associés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7472,'PCG18-ASSOC','THIRDPARTY',		'443',    '7463', 'Opérations particulières avec l''Etat les collectivités publiques, les organismes internationaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7473,'PCG18-ASSOC','THIRDPARTY',		'4431',    '7472', 'Créances sur l''Etat résultant de la suppression de la règle du décalage d''un mois en matière de TVA', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7474,'PCG18-ASSOC','THIRDPARTY',		'4438',    '7472', 'Intérêts courus sur créances figurant au 4431', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7475,'PCG18-ASSOC','THIRDPARTY',		'444',    '7463', 'Etat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7476,'PCG18-ASSOC','THIRDPARTY',		'445',    '7463', 'Etat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7477,'PCG18-ASSOC','THIRDPARTY',		'4452',    '7476', 'TVA due intracommunautaire', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7478,'PCG18-ASSOC','THIRDPARTY',		'4455',    '7476', 'Taxes sur le chiffre d''affaires à décaisser', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7479,'PCG18-ASSOC','THIRDPARTY',		'44551',    '7478', 'TVA à décaisser', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7480,'PCG18-ASSOC','THIRDPARTY',		'44558',    '7478', 'Taxes assimilées à la TVA', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7481,'PCG18-ASSOC','THIRDPARTY',		'4456',    '7476', 'Taxes sur le chiffre d''affaires déductibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7482,'PCG18-ASSOC','THIRDPARTY',		'44562',    '7481', 'TVA sur immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7483,'PCG18-ASSOC','THIRDPARTY',		'44563',    '7481', 'TVA transférée par d''autres entreprises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7484,'PCG18-ASSOC','THIRDPARTY',		'44566',    '7481', 'TVA sur autres biens et services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7485,'PCG18-ASSOC','THIRDPARTY',		'44567',    '7481', 'Crédit de TVA à reporter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7486,'PCG18-ASSOC','THIRDPARTY',		'44568',    '7481', 'Taxes assimilées à la TVA', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7487,'PCG18-ASSOC','THIRDPARTY',		'4457',    '7476', 'Taxes sur le chiffre d''affaires collectées par l''entreprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7488,'PCG18-ASSOC','THIRDPARTY',		'44571',    '7487', 'TVA collectée', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7489,'PCG18-ASSOC','THIRDPARTY',		'44578',    '7487', 'Taxes assimilées à la TVA', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7490,'PCG18-ASSOC','THIRDPARTY',		'4458',    '7476', 'Taxes sur le chiffre d''affaires à régulariser ou en attente', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7491,'PCG18-ASSOC','THIRDPARTY',		'44581',    '7490', 'Acomptes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7492,'PCG18-ASSOC','THIRDPARTY',		'44582',    '7490', 'Acomptes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7493,'PCG18-ASSOC','THIRDPARTY',		'44583',    '7490', 'Remboursement de taxes sur le chiffre d''affaires demandé', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7494,'PCG18-ASSOC','THIRDPARTY',		'44584',    '7490', 'TVA récupérée d''avance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7495,'PCG18-ASSOC','THIRDPARTY',		'44586',    '7490', 'Taxes sur le chiffre d''affaires sur factures non parvenues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7496,'PCG18-ASSOC','THIRDPARTY',		'44587',    '7490', 'Taxes sur le chiffre d''affaires sur factures à établir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7497,'PCG18-ASSOC','THIRDPARTY',		'446',    '7463', 'Obligations cautionnées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7498,'PCG18-ASSOC','THIRDPARTY',		'447',    '7463', 'Autres impôts, taxes et versements assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7499,'PCG18-ASSOC','THIRDPARTY',		'448',    '7463', 'Etat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7500,'PCG18-ASSOC','THIRDPARTY',		'4482',    '7499', 'Charges fiscales sur congés à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7501,'PCG18-ASSOC','THIRDPARTY',		'4486',    '7499', 'Charges à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7502,'PCG18-ASSOC','THIRDPARTY',		'4487',    '7499', 'Produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7503,'PCG18-ASSOC','THIRDPARTY',		'449',    '7463', 'Quotas d''émission à acquérir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7504,'PCG18-ASSOC','THIRDPARTY',		'45',    '7004', 'Confédération, fédération, union, entités affiliées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7505,'PCG18-ASSOC','THIRDPARTY',		'451',    '7504', 'Groupe', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7506,'PCG18-ASSOC','THIRDPARTY',		'455',    '7504', 'Associés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7507,'PCG18-ASSOC','THIRDPARTY',		'4551',    '7506', 'Principal', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7508,'PCG18-ASSOC','THIRDPARTY',		'4558',    '7506', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7509,'PCG18-ASSOC','THIRDPARTY',		'456',    '7504', 'Associés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7510,'PCG18-ASSOC','THIRDPARTY',		'4561',    '7509', 'Associés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7511,'PCG18-ASSOC','THIRDPARTY',		'45611',    '7510', 'Apports en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7512,'PCG18-ASSOC','THIRDPARTY',		'45615',    '7510', 'Apports en numéraire', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7513,'PCG18-ASSOC','THIRDPARTY',		'4562',    '7509', 'Apporteurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7514,'PCG18-ASSOC','THIRDPARTY',		'45621',    '7513', 'Actionnaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7515,'PCG18-ASSOC','THIRDPARTY',		'45625',    '7513', 'Associés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7516,'PCG18-ASSOC','THIRDPARTY',		'4563',    '7509', 'Associés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7517,'PCG18-ASSOC','THIRDPARTY',		'4564',    '7509', 'Associés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7518,'PCG18-ASSOC','THIRDPARTY',		'4566',    '7509', 'Actionnaires défaillants', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7519,'PCG18-ASSOC','THIRDPARTY',		'4567',    '7509', 'Associés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7520,'PCG18-ASSOC','THIRDPARTY',		'457',    '7504', 'Associés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7521,'PCG18-ASSOC','THIRDPARTY',		'458',    '7504', 'Associés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7522,'PCG18-ASSOC','THIRDPARTY',		'4581',    '7521', 'Opérations courantes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7523,'PCG18-ASSOC','THIRDPARTY',		'4588',    '7521', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7524,'PCG18-ASSOC','THIRDPARTY',		'46',    '7004', 'Débiteurs et créditeurs divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7525,'PCG18-ASSOC','THIRDPARTY',		'461',    '7524', 'Créances reçues par legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7526,'PCG18-ASSOC','THIRDPARTY',		'462',    '7524', 'Créances sur cessions d''immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7527,'PCG18-ASSOC','THIRDPARTY',		'464',    '7524', 'Dettes sur acquisitions de valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7528,'PCG18-ASSOC','THIRDPARTY',		'465',    '7524', 'Créances sur cessions de valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7529,'PCG18-ASSOC','THIRDPARTY',		'466',    '7524', 'Dettes des legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7530,'PCG18-ASSOC','THIRDPARTY',		'467',    '7524', 'Autres comptes débiteurs ou créditeurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7531,'PCG18-ASSOC','THIRDPARTY',		'468',    '7524', 'Divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7532,'PCG18-ASSOC','THIRDPARTY',		'4681',    '7531', 'Frais des bénévoles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7533,'PCG18-ASSOC','THIRDPARTY',		'4686',    '7531', 'Charges à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7534,'PCG18-ASSOC','THIRDPARTY',		'4687',    '7531', 'Produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7535,'PCG18-ASSOC','THIRDPARTY',		'47',    '7004', 'Comptes transitoires ou d''attente', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7536,'PCG18-ASSOC','THIRDPARTY',		'471',    '7535', 'Comptes d''attente', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7537,'PCG18-ASSOC','THIRDPARTY',		'472',    '7535', 'Comptes d''attente', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7538,'PCG18-ASSOC','THIRDPARTY',		'473',    '7535', 'Comptes d''attente', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7539,'PCG18-ASSOC','THIRDPARTY',		'474',    '7535', 'Comptes d''attente', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7540,'PCG18-ASSOC','THIRDPARTY',		'475',    '7535', 'Comptes d''attente', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7541,'PCG18-ASSOC','THIRDPARTY',		'476',    '7535', 'Différence de conversion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7542,'PCG18-ASSOC','THIRDPARTY',		'4761',    '7541', 'Diminution des créances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7543,'PCG18-ASSOC','THIRDPARTY',		'4762',    '7541', 'Augmentation des dettes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7544,'PCG18-ASSOC','THIRDPARTY',		'4768',    '7541', 'Différences compensées par couverture de change', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7545,'PCG18-ASSOC','THIRDPARTY',		'477',    '7535', 'Différences de conversion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7546,'PCG18-ASSOC','THIRDPARTY',		'4771',    '7545', 'Augmentation des créances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7547,'PCG18-ASSOC','THIRDPARTY',		'4772',    '7545', 'Diminution des dettes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7548,'PCG18-ASSOC','THIRDPARTY',		'4778',    '7545', 'Différences compensées par couverture de change', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7549,'PCG18-ASSOC','THIRDPARTY',		'478',    '7535', 'Autres comptes transitoires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7550,'PCG18-ASSOC','THIRDPARTY',		'48',    '7004', 'Comptes de régularisation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7551,'PCG18-ASSOC','THIRDPARTY',		'481',    '7550', 'Charges à répartir sur plusieurs exercices', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7552,'PCG18-ASSOC','THIRDPARTY',		'4816',    '7551', 'Frais d''émission des emprunts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7553,'PCG18-ASSOC','THIRDPARTY',		'486',    '7550', 'Charges constatées d''avance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7554,'PCG18-ASSOC','THIRDPARTY',		'487',    '7550', 'Produits constatés d''avance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7555,'PCG18-ASSOC','THIRDPARTY',		'488',    '7550', 'Comptes de répartition périodique des charges et des produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7556,'PCG18-ASSOC','THIRDPARTY',		'4886',    '7555', 'Charges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7557,'PCG18-ASSOC','THIRDPARTY',		'4887',    '7555', 'Produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7558,'PCG18-ASSOC','THIRDPARTY',		'49',    '7004', 'Dépréciations des comptes de tiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7559,'PCG18-ASSOC','THIRDPARTY',		'491',    '7558', 'Dépréciations des comptes de clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7560,'PCG18-ASSOC','THIRDPARTY',		'495',    '7558', 'Dépréciations des comptes du groupe et des associés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7561,'PCG18-ASSOC','THIRDPARTY',		'4951',    '7560', 'Comptes du groupe', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7562,'PCG18-ASSOC','THIRDPARTY',		'4955',    '7560', 'Comptes courants des associés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7563,'PCG18-ASSOC','THIRDPARTY',		'4958',    '7560', 'Opérations faites en commun et en GIE', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7564,'PCG18-ASSOC','THIRDPARTY',		'496',    '7558', 'Dépréciations des comptes de débiteurs divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7565,'PCG18-ASSOC','THIRDPARTY',		'4962',    '7564', 'Créances sur cessions d''immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7566,'PCG18-ASSOC','THIRDPARTY',		'4965',    '7564', 'Créances sur cessions de valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7567,'PCG18-ASSOC','THIRDPARTY',		'4967',    '7564', 'Autres comptes débiteurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7570,'PCG18-ASSOC','FINAN',		'50',    '7005', 'Valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7571,'PCG18-ASSOC','FINAN',		'501',    '7570', 'Parts dans des entreprises liées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7572,'PCG18-ASSOC','FINAN',		'502',    '7570', 'Actions propres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7573,'PCG18-ASSOC','FINAN',		'5021',    '7572', 'Actons destinées à être attribuées aux employés et affectées à des plans déterminés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7574,'PCG18-ASSOC','FINAN',		'5022',    '7572', 'Actons disponibles pour être attribuées aux employés ou pour la régularisation des cours de bourse', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7575,'PCG18-ASSOC','FINAN',		'503',    '7570', 'Actions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7576,'PCG18-ASSOC','FINAN',		'5031',    '7575', 'Titres cotés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7577,'PCG18-ASSOC','FINAN',		'5035',    '7575', 'Titres non cotés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7578,'PCG18-ASSOC','FINAN',		'504',    '7570', 'Autres titres conférant un droit de propriété', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7579,'PCG18-ASSOC','FINAN',		'505',    '7570', 'Obligations et bons émis par la société et rachetés par elle', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7580,'PCG18-ASSOC','FINAN',		'506',    '7570', 'Obligations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7581,'PCG18-ASSOC','FINAN',		'5061',    '7580', 'Titres cotés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7582,'PCG18-ASSOC','FINAN',		'5065',    '7580', 'Titres non cotés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7583,'PCG18-ASSOC','FINAN',		'507',    '7570', 'Bons du Trésor et bons de caisse à court terme', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7584,'PCG18-ASSOC','FINAN',		'508',    '7570', 'Autres valeurs mobilières de placement et autres créances assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7585,'PCG18-ASSOC','FINAN',		'5081',    '7584', 'Autres valeurs mobilières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7586,'PCG18-ASSOC','FINAN',		'5082',    '7584', 'Bons de souscription', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7587,'PCG18-ASSOC','FINAN',		'5088',    '7584', 'Intérêts courus sur obligations, bons et valeurs assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7588,'PCG18-ASSOC','FINAN',		'509',    '7570', 'Versements restant à effectuer sur valeurs mobilières de placement non libérées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7589,'PCG18-ASSOC','FINAN',		'51',    '7005', 'Banques, établissements financiers et assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7590,'PCG18-ASSOC','FINAN',		'511',    '7589', 'Valeurs à l''encaissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7591,'PCG18-ASSOC','FINAN',		'5111',    '7590', 'Coupons échus à l''encaissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7592,'PCG18-ASSOC','FINAN',		'5112',    '7590', 'Chèques à encaisser', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7593,'PCG18-ASSOC','FINAN',		'5113',    '7590', 'Effets à l''encaissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7594,'PCG18-ASSOC','FINAN',		'5114',    '7590', 'Effets à l''escompte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7595,'PCG18-ASSOC','FINAN',		'512',    '7589', 'Banques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7596,'PCG18-ASSOC','FINAN',		'5121',    '7595', 'Comptes en monnaie nationale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7597,'PCG18-ASSOC','FINAN',		'5124',    '7595', 'Comptes en devises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7598,'PCG18-ASSOC','FINAN',		'514',    '7589', 'Chèques postaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7599,'PCG18-ASSOC','FINAN',		'515',    '7589', 'Caisses du Trésor et des établissements publics', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7600,'PCG18-ASSOC','FINAN',		'516',    '7589', 'Sociétés de bourse', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7601,'PCG18-ASSOC','FINAN',		'517',    '7589', 'Autres organismes financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7602,'PCG18-ASSOC','FINAN',		'518',    '7589', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7603,'PCG18-ASSOC','FINAN',		'5181',    '7602', 'Intérêts courus à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7604,'PCG18-ASSOC','FINAN',		'5188',    '7602', 'Intérêts courus à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7605,'PCG18-ASSOC','FINAN',		'519',    '7589', 'Concours bancaires courants', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7606,'PCG18-ASSOC','FINAN',		'5191',    '7605', 'Crédit de mobilisation de créances commerciales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7607,'PCG18-ASSOC','FINAN',		'5193',    '7605', 'Mobilisation de créances nées à l''étranger', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7608,'PCG18-ASSOC','FINAN',		'5198',    '7605', 'Intérêts courus sur concours bancaires courants', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7609,'PCG18-ASSOC','FINAN',		'52',    '7005', 'Instruments de trésorerie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7610,'PCG18-ASSOC','FINAN',		'53',    '7005', 'Caisse', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7611,'PCG18-ASSOC','FINAN',		'531',    '7610', 'Caisse siège social', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7612,'PCG18-ASSOC','FINAN',		'5311',    '7611', 'Caisse en monnaie nationale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7613,'PCG18-ASSOC','FINAN',		'5314',    '7611', 'Caisse en devises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7614,'PCG18-ASSOC','FINAN',		'532',    '7610', 'Caisse succursale (ou usine) A', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7615,'PCG18-ASSOC','FINAN',		'533',    '7610', 'Caisse succursale (ou usine) B', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7616,'PCG18-ASSOC','FINAN',		'54',    '7005', 'Régies d''avance et accréditifs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7617,'PCG18-ASSOC','FINAN',		'58',    '7005', 'Virements internes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7618,'PCG18-ASSOC','FINAN',		'59',    '7005', 'Dépréciations des comptes financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7619,'PCG18-ASSOC','FINAN',		'590',    '7618', 'Dépréciations des valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7620,'PCG18-ASSOC','FINAN',		'5903',    '7619', 'Actions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7621,'PCG18-ASSOC','FINAN',		'5904',    '7619', 'Autres titres conférant un droit de propriété', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7622,'PCG18-ASSOC','FINAN',		'5906',    '7619', 'Obligations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7623,'PCG18-ASSOC','FINAN',		'5908',    '7619', 'Autres valeurs mobilières de placement et créances assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7625,'PCG18-ASSOC','EXPENSE',		'60',    '7006', 'Achats (sauf 603)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7626,'PCG18-ASSOC','EXPENSE',		'601',    '7625', 'Achats stockés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7627,'PCG18-ASSOC','EXPENSE',		'6011',    '7626', 'Matières (ou groupe) A', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7628,'PCG18-ASSOC','EXPENSE',		'6012',    '7626', 'Matières (ou groupe) B', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7629,'PCG18-ASSOC','EXPENSE',		'6017',    '7626', 'Fournitures A, B, C,', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7630,'PCG18-ASSOC','EXPENSE',		'602',    '7625', 'Achats stockés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7631,'PCG18-ASSOC','EXPENSE',		'6021',    '7630', 'Matières consommables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7632,'PCG18-ASSOC','EXPENSE',		'60211',    '7631', 'Matières (ou groupe) C', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7633,'PCG18-ASSOC','EXPENSE',		'60212',    '7631', 'Matières (ou groupe) D', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7634,'PCG18-ASSOC','EXPENSE',		'6022',    '7630', 'Fournitures consommables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7635,'PCG18-ASSOC','EXPENSE',		'60221',    '7634', 'Combustibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7636,'PCG18-ASSOC','EXPENSE',		'60222',    '7634', 'Produits d''entretien', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7637,'PCG18-ASSOC','EXPENSE',		'60223',    '7634', 'Fournitures d''atelier et d''usine', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7638,'PCG18-ASSOC','EXPENSE',		'60224',    '7634', 'Fournitures de magasin', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7639,'PCG18-ASSOC','EXPENSE',		'60225',    '7634', 'Fourniture de bureau', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7640,'PCG18-ASSOC','EXPENSE',		'6026',    '7630', 'Emballages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7641,'PCG18-ASSOC','EXPENSE',		'60261',    '7640', 'Emballages perdus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7642,'PCG18-ASSOC','EXPENSE',		'60265',    '7640', 'Emballages récupérables non identifiables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7643,'PCG18-ASSOC','EXPENSE',		'60267',    '7640', 'Emballages à usage mixte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7644,'PCG18-ASSOC','EXPENSE',		'603',    '7625', 'Variations des stocks (approvisionnements et marchandises)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7645,'PCG18-ASSOC','EXPENSE',		'6031',    '7644', 'Variation des stocks de matières premières (et fournitures)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7646,'PCG18-ASSOC','EXPENSE',		'6032',    '7644', 'Variation des stocks des autres approvisionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7647,'PCG18-ASSOC','EXPENSE',		'6037',    '7644', 'Variation des stocks de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7648,'PCG18-ASSOC','EXPENSE',		'604',    '7625', 'Achats d''études et prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7649,'PCG18-ASSOC','EXPENSE',		'605',    '7625', 'Achats de matériel, équipements et travaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7650,'PCG18-ASSOC','EXPENSE',		'606',    '7625', 'Achats non stockés de matière et fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7651,'PCG18-ASSOC','EXPENSE',		'6061',    '7650', 'Fournitures non stockables (eau, énergie, …)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7652,'PCG18-ASSOC','EXPENSE',		'6063',    '7650', 'Fournitures d''entretien et de petit équipement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7653,'PCG18-ASSOC','EXPENSE',		'6064',    '7650', 'Fournitures administratives', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7654,'PCG18-ASSOC','EXPENSE',		'6068',    '7650', 'Autres matières et fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7655,'PCG18-ASSOC','EXPENSE',		'607',    '7625', 'Achats de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7656,'PCG18-ASSOC','EXPENSE',		'6071',    '7655', 'Marchandise (ou groupe) A', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7657,'PCG18-ASSOC','EXPENSE',		'6072',    '7655', 'Marchandise (ou groupe) B', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7658,'PCG18-ASSOC','EXPENSE',		'608',    '7625', '(Compte réservé, le cas échéant, à la récapitulation des frais accessoires incorporés aux achats)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7659,'PCG18-ASSOC','EXPENSE',		'6081',    '7658', 'de matières premières (et fournitures)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7660,'PCG18-ASSOC','EXPENSE',		'6082',    '7658', 'd''autres approvisionnements stockés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7661,'PCG18-ASSOC','EXPENSE',		'6084',    '7658', 'd''études et prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7662,'PCG18-ASSOC','EXPENSE',		'6085',    '7658', 'de matériel, équipements et travaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7663,'PCG18-ASSOC','EXPENSE',		'6086',    '7658', 'd''approvisionnements non stockés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7664,'PCG18-ASSOC','EXPENSE',		'6087',    '7658', 'de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7665,'PCG18-ASSOC','EXPENSE',		'6088',    '7658', 'Rabais, remises et ristournes non affectés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7666,'PCG18-ASSOC','EXPENSE',		'609',    '7625', 'Rabais, remises et ristournes obtenus sur achats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7667,'PCG18-ASSOC','EXPENSE',		'6091',    '7666', 'de matières premières (et fournitures)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7668,'PCG18-ASSOC','EXPENSE',		'6092',    '7666', 'd''autres approvisionnements stockés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7669,'PCG18-ASSOC','EXPENSE',		'6094',    '7666', 'd''études et prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7670,'PCG18-ASSOC','EXPENSE',		'6095',    '7666', 'de matériel, équipements et travaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7671,'PCG18-ASSOC','EXPENSE',		'6096',    '7666', 'd''approvisionnements non stockés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7672,'PCG18-ASSOC','EXPENSE',		'6097',    '7666', 'de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7673,'PCG18-ASSOC','EXPENSE',		'6098',    '7666', 'Rabais, remises et ristournes non affectés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7674,'PCG18-ASSOC','EXPENSE',		'61',    '7006', 'Services extérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7675,'PCG18-ASSOC','EXPENSE',		'611',    '7674', 'Sous-traitance générale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7676,'PCG18-ASSOC','EXPENSE',		'612',    '7674', 'Redevances de crédit-bail', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7677,'PCG18-ASSOC','EXPENSE',		'6122',    '7676', 'Crédit-bail mobilier', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7678,'PCG18-ASSOC','EXPENSE',		'6125',    '7676', 'Crédit-bail immobilier', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7679,'PCG18-ASSOC','EXPENSE',		'613',    '7674', 'Locations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7680,'PCG18-ASSOC','EXPENSE',		'6132',    '7679', 'Locations immobilières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7681,'PCG18-ASSOC','EXPENSE',		'6135',    '7679', 'Locations mobilières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7682,'PCG18-ASSOC','EXPENSE',		'6136',    '7679', 'Malis sur emballages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7683,'PCG18-ASSOC','EXPENSE',		'614',    '7674', 'Charges locatives et de copropriété', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7684,'PCG18-ASSOC','EXPENSE',		'615',    '7674', 'Entretien et réparations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7685,'PCG18-ASSOC','EXPENSE',		'6152',    '7684', 'sur biens immobiliers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7686,'PCG18-ASSOC','EXPENSE',		'6155',    '7684', 'sur biens mobiliers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7687,'PCG18-ASSOC','EXPENSE',		'6156',    '7684', 'Maintenance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7688,'PCG18-ASSOC','EXPENSE',		'616',    '7674', 'Primes d''assurances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7689,'PCG18-ASSOC','EXPENSE',		'6161',    '7688', 'Multirisques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7690,'PCG18-ASSOC','EXPENSE',		'6162',    '7688', 'Assurance obligatoire dommage construction', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7691,'PCG18-ASSOC','EXPENSE',		'6163',    '7688', 'Assurance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7692,'PCG18-ASSOC','EXPENSE',		'61636',    '7691', 'sur achats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7693,'PCG18-ASSOC','EXPENSE',		'61637',    '7691', 'sur ventes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7694,'PCG18-ASSOC','EXPENSE',		'61638',    '7691', 'sur autres biens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7695,'PCG18-ASSOC','EXPENSE',		'6164',    '7688', 'Risques d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7696,'PCG18-ASSOC','EXPENSE',		'6165',    '7688', 'Insolvabilité clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7697,'PCG18-ASSOC','EXPENSE',		'617',    '7674', 'Etudes et recherches', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7698,'PCG18-ASSOC','EXPENSE',		'618',    '7674', 'Divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7699,'PCG18-ASSOC','EXPENSE',		'6181',    '7698', 'Documentation générale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7700,'PCG18-ASSOC','EXPENSE',		'6183',    '7698', 'Documentation technique', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7701,'PCG18-ASSOC','EXPENSE',		'6185',    '7698', 'Frais de colloques, séminaires, conférences', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7702,'PCG18-ASSOC','EXPENSE',		'619',    '7674', 'Rabais, remises et ristournes obtenus sur services extérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7703,'PCG18-ASSOC','EXPENSE',		'62',    '7006', 'Autres services extérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7704,'PCG18-ASSOC','EXPENSE',		'621',    '7703', 'Personnel extérieur à l''entreprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7705,'PCG18-ASSOC','EXPENSE',		'6211',    '7704', 'Personnel intérimaire', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7706,'PCG18-ASSOC','EXPENSE',		'6214',    '7704', 'Personnel détaché ou prêté à l''entreprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7707,'PCG18-ASSOC','EXPENSE',		'622',    '7703', 'Rémunérations d''intermédiaires et honoraires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7708,'PCG18-ASSOC','EXPENSE',		'6221',    '7707', 'Commissions et courtages sur achats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7709,'PCG18-ASSOC','EXPENSE',		'6222',    '7707', 'Commissions et courtages sur ventes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7710,'PCG18-ASSOC','EXPENSE',		'6224',    '7707', 'Rémunérations des transitaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7711,'PCG18-ASSOC','EXPENSE',		'6225',    '7707', 'Rémunérations d''affacturage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7712,'PCG18-ASSOC','EXPENSE',		'6226',    '7707', 'Honoraires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7713,'PCG18-ASSOC','EXPENSE',		'62264',    '7712', 'Honoraires sur legs ou donations destinés à être cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7714,'PCG18-ASSOC','EXPENSE',		'6227',    '7707', 'Frais d''actes et de contentieux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7715,'PCG18-ASSOC','EXPENSE',		'6228',    '7707', 'Divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7716,'PCG18-ASSOC','EXPENSE',		'623',    '7703', 'Publicité, publications, relations publiques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7717,'PCG18-ASSOC','EXPENSE',		'6231',    '7716', 'Annonces et insertions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7718,'PCG18-ASSOC','EXPENSE',		'6232',    '7716', 'Echantillons', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7719,'PCG18-ASSOC','EXPENSE',		'6233',    '7716', 'Foires et expositions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7720,'PCG18-ASSOC','EXPENSE',		'6234',    '7716', 'Cadeaux à la clientèle', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7721,'PCG18-ASSOC','EXPENSE',		'6235',    '7716', 'Primes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7722,'PCG18-ASSOC','EXPENSE',		'6236',    '7716', 'Catalogues et imprimés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7723,'PCG18-ASSOC','EXPENSE',		'6237',    '7716', 'Publications', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7724,'PCG18-ASSOC','EXPENSE',		'6238',    '7716', 'Divers (pourboires, dons courants, …)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7725,'PCG18-ASSOC','EXPENSE',		'624',    '7703', 'Transports de biens et transports collectifs du personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7726,'PCG18-ASSOC','EXPENSE',		'6241',    '7725', 'Transports sur achats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7727,'PCG18-ASSOC','EXPENSE',		'6242',    '7725', 'Transports sur ventes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7728,'PCG18-ASSOC','EXPENSE',		'6243',    '7725', 'Transports entre établissements ou chantiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7729,'PCG18-ASSOC','EXPENSE',		'6244',    '7725', 'Transports administratifs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7730,'PCG18-ASSOC','EXPENSE',		'6247',    '7725', 'Transports collectifs du personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7731,'PCG18-ASSOC','EXPENSE',		'6248',    '7725', 'Divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7732,'PCG18-ASSOC','EXPENSE',		'625',    '7703', 'Déplacements, missions et réceptions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7733,'PCG18-ASSOC','EXPENSE',		'6251',    '7732', 'Voyages et déplacements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7734,'PCG18-ASSOC','EXPENSE',		'6255',    '7732', 'Frais de déménagement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7735,'PCG18-ASSOC','EXPENSE',		'6256',    '7732', 'Missions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7736,'PCG18-ASSOC','EXPENSE',		'6257',    '7732', 'Réceptions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7737,'PCG18-ASSOC','EXPENSE',		'626',    '7703', 'Frais postaux et de télécommunications', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7738,'PCG18-ASSOC','EXPENSE',		'627',    '7703', 'Services bancaires et assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7739,'PCG18-ASSOC','EXPENSE',		'6271',    '7738', 'Frais sur titres (achat, vente, garde)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7740,'PCG18-ASSOC','EXPENSE',		'6272',    '7738', 'Commissions et frais sur émission d''emprunts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7741,'PCG18-ASSOC','EXPENSE',		'6275',    '7738', 'Frais sur effets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7742,'PCG18-ASSOC','EXPENSE',		'6276',    '7738', 'Location de coffres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7743,'PCG18-ASSOC','EXPENSE',		'6278',    '7738', 'Autres frais et commissions sur prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7744,'PCG18-ASSOC','EXPENSE',		'628',    '7703', 'Divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7745,'PCG18-ASSOC','EXPENSE',		'6281',    '7744', 'Concours divers (cotisations, )', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7746,'PCG18-ASSOC','EXPENSE',		'6284',    '7744', 'Frais de recrutement de personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7747,'PCG18-ASSOC','EXPENSE',		'629',    '7703', 'Rabais, remises et ristournes obtenus sur autres services extérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7748,'PCG18-ASSOC','EXPENSE',		'63',    '7006', 'Impôts, taxes et versements assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7749,'PCG18-ASSOC','EXPENSE',		'631',    '7748', 'Impôts, taxes et versements assimilés sur rémunérations (administrations des impôts)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7750,'PCG18-ASSOC','EXPENSE',		'6311',    '7749', 'Taxe sur les salaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7751,'PCG18-ASSOC','EXPENSE',		'6312',    '7749', 'Taxe d''apprentissage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7752,'PCG18-ASSOC','EXPENSE',		'6313',    '7749', 'Participation des employeurs à la formation professionnelle continue', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7753,'PCG18-ASSOC','EXPENSE',		'6314',    '7749', 'Cotisation pour défaut d''investissement obligatoire dans la construction', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7754,'PCG18-ASSOC','EXPENSE',		'6318',    '7749', 'Autres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7755,'PCG18-ASSOC','EXPENSE',		'633',    '7748', 'Impôts, taxes et versements assimilés sur rémunérations (autres organismes)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7756,'PCG18-ASSOC','EXPENSE',		'6331',    '7755', 'Versement de transport', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7757,'PCG18-ASSOC','EXPENSE',		'6332',    '7755', 'Allocations logement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7758,'PCG18-ASSOC','EXPENSE',		'6333',    '7755', 'Participation des employeurs à la formation professionnelle continue', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7759,'PCG18-ASSOC','EXPENSE',		'6334',    '7755', 'Participation des employeurs à l''effort de construction', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7760,'PCG18-ASSOC','EXPENSE',		'6335',    '7755', 'Versements libératoires ouvrant droit à l''exonération de la taxe d''apprentissage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7761,'PCG18-ASSOC','EXPENSE',		'6338',    '7755', 'Autres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7762,'PCG18-ASSOC','EXPENSE',		'635',    '7748', 'Autres impôts, taxes et versements assimilés (administrations des impôts)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7763,'PCG18-ASSOC','EXPENSE',		'6351',    '7762', 'Impôts directs (sauf impôts sur les bénéfices)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7764,'PCG18-ASSOC','EXPENSE',		'63511',    '7763', 'Contribution économique territoriale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7765,'PCG18-ASSOC','EXPENSE',		'63512',    '7763', 'Taxes foncières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7766,'PCG18-ASSOC','EXPENSE',		'63513',    '7763', 'Autres impôts locaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7767,'PCG18-ASSOC','EXPENSE',		'63514',    '7763', 'Taxe sur les véhicules des sociétés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7768,'PCG18-ASSOC','EXPENSE',		'6352',    '7762', 'Taxe sur le chiffre d''affaires non récupérables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7769,'PCG18-ASSOC','EXPENSE',		'6353',    '7762', 'Impôts indirects', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7770,'PCG18-ASSOC','EXPENSE',		'6354',    '7762', 'Droits d''enregistrement et de timbre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7771,'PCG18-ASSOC','EXPENSE',		'63541',    '7770', 'Droits de mutation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7772,'PCG18-ASSOC','EXPENSE',		'6358',    '7762', 'Autres droits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7773,'PCG18-ASSOC','EXPENSE',		'637',    '7748', 'Autres impôts, taxes et versements assimilés (autres organismes)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7774,'PCG18-ASSOC','EXPENSE',		'6371',    '7773', 'Contribution sociale de solidarité à la charge des sociétés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7775,'PCG18-ASSOC','EXPENSE',		'6372',    '7773', 'Taxes perçues par les organismes publics internationaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7776,'PCG18-ASSOC','EXPENSE',		'6374',    '7773', 'Impôts et taxes exigibles à l''Etranger', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7777,'PCG18-ASSOC','EXPENSE',		'6378',    '7773', 'Taxes diverses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7778,'PCG18-ASSOC','EXPENSE',		'64',    '7006', 'Charges de personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7779,'PCG18-ASSOC','EXPENSE',		'641',    '7778', 'Rémunérations du personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7780,'PCG18-ASSOC','EXPENSE',		'6411',    '7779', 'Salaires, appointements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7781,'PCG18-ASSOC','EXPENSE',		'6412',    '7779', 'Congés payés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7782,'PCG18-ASSOC','EXPENSE',		'6413',    '7779', 'Primes et gratifications', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7783,'PCG18-ASSOC','EXPENSE',		'6414',    '7779', 'Indemnités et avantages divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7784,'PCG18-ASSOC','EXPENSE',		'6415',    '7779', 'Supplément familial', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7785,'PCG18-ASSOC','EXPENSE',		'644',    '7778', 'Rémunération du travail de l''exploitant', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7786,'PCG18-ASSOC','EXPENSE',		'645',    '7778', 'Charges de sécurité sociale et de prévoyance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7787,'PCG18-ASSOC','EXPENSE',		'6451',    '7786', 'Cotisations à l''URSSAF', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7788,'PCG18-ASSOC','EXPENSE',		'6452',    '7786', 'Cotisations aux mutuelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7789,'PCG18-ASSOC','EXPENSE',		'6453',    '7786', 'Cotisations aux caisses de retraites', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7790,'PCG18-ASSOC','EXPENSE',		'6454',    '7786', 'Cotisations aux ASSEDIC', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7791,'PCG18-ASSOC','EXPENSE',		'6458',    '7786', 'Cotisations aux autres organismes sociaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7792,'PCG18-ASSOC','EXPENSE',		'646',    '7778', 'Cotisations sociales personnelles de l''exploitant', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7793,'PCG18-ASSOC','EXPENSE',		'647',    '7778', 'Autres charges sociales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7794,'PCG18-ASSOC','EXPENSE',		'6471',    '7793', 'Prestations directes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7795,'PCG18-ASSOC','EXPENSE',		'6472',    '7793', 'Versements aux comités d''entreprise et d''établissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7796,'PCG18-ASSOC','EXPENSE',		'6473',    '7793', 'Versements aux comités d''hygiène et de sécurité', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7797,'PCG18-ASSOC','EXPENSE',		'6474',    '7793', 'Versements aux autres œuvres sociales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7798,'PCG18-ASSOC','EXPENSE',		'6475',    '7793', 'Médecine du travail, pharmacie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7799,'PCG18-ASSOC','EXPENSE',		'648',    '7778', 'Autres charges de personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7800,'PCG18-ASSOC','EXPENSE',		'65',    '7006', 'Autres charges de gestion courante', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7801,'PCG18-ASSOC','EXPENSE',		'651',    '7800', 'Redevances pour concessions, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7802,'PCG18-ASSOC','EXPENSE',		'6511',    '7801', 'Redevances pour concessions, brevets, licences, marques, procédés, logiciels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7803,'PCG18-ASSOC','EXPENSE',		'6516',    '7801', 'Droits d''auteur et de reproduction', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7804,'PCG18-ASSOC','EXPENSE',		'6518',    '7801', 'Autres droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7805,'PCG18-ASSOC','EXPENSE',		'653',    '7800', 'Charges de la générosité du public', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7806,'PCG18-ASSOC','EXPENSE',		'6531',    '7805', 'Autres charges sur legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7807,'PCG18-ASSOC','EXPENSE',		'654',    '7800', 'Pertes sur créances irrécouvrables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7808,'PCG18-ASSOC','EXPENSE',		'6541',    '7807', 'Créances de l''exercice', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7809,'PCG18-ASSOC','EXPENSE',		'6544',    '7807', 'Créances des exercices antérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7810,'PCG18-ASSOC','EXPENSE',		'655',    '7800', 'Quote-part de résultat sur opérations faites en commun', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7811,'PCG18-ASSOC','EXPENSE',		'6551',    '7810', 'Quote-part de bénéfice transférée (comptabilité du gérant)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7812,'PCG18-ASSOC','EXPENSE',		'6555',    '7810', 'Quote-part de perte supportée (comptabilité des associés non gérants)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7813,'PCG18-ASSOC','EXPENSE',		'657',    '7800', 'Aides financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7814,'PCG18-ASSOC','EXPENSE',		'6571',    '7813', 'Aides financières octroyées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7815,'PCG18-ASSOC','EXPENSE',		'6572',    '7813', 'Quotes-parts de générosité reversée', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7816,'PCG18-ASSOC','EXPENSE',		'658',    '7800', 'Charges diverses de gestion courante', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7817,'PCG18-ASSOC','EXPENSE',		'66',    '7006', 'Charges financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7818,'PCG18-ASSOC','EXPENSE',		'661',    '7817', 'Charges d''intérêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7819,'PCG18-ASSOC','EXPENSE',		'6611',    '7818', 'Intérêts des emprunts et dettes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7820,'PCG18-ASSOC','EXPENSE',		'66116',    '7819', 'des emprunts et dettes assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7821,'PCG18-ASSOC','EXPENSE',		'66117',    '7819', 'des dettes rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7822,'PCG18-ASSOC','EXPENSE',		'6612',    '7818', 'Charges de la fiducie, résultat de la période', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7823,'PCG18-ASSOC','EXPENSE',		'6615',    '7818', 'Intérêts des comptes courants et des dépôts créditeurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7824,'PCG18-ASSOC','EXPENSE',		'6616',    '7818', 'Intérêts bancaires et sur opérations de financement (escompte,…)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7825,'PCG18-ASSOC','EXPENSE',		'6617',    '7818', 'Intérêts des obligations cautionnées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7826,'PCG18-ASSOC','EXPENSE',		'6618',    '7818', 'Intérêts des autres dettes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7827,'PCG18-ASSOC','EXPENSE',		'66181',    '7826', 'des dettes commerciales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7828,'PCG18-ASSOC','EXPENSE',		'66188',    '7826', 'des dettes diverses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7829,'PCG18-ASSOC','EXPENSE',		'664',    '7817', 'Pertes sur créances liées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7830,'PCG18-ASSOC','EXPENSE',		'665',    '7817', 'Escomptes accordés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7831,'PCG18-ASSOC','EXPENSE',		'666',    '7817', 'Pertes de change', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7832,'PCG18-ASSOC','EXPENSE',		'667',    '7817', 'Charges nettes sur cessions de valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7833,'PCG18-ASSOC','EXPENSE',		'668',    '7817', 'Autres charges financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7834,'PCG18-ASSOC','EXPENSE',		'67',    '7006', 'Charges exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7835,'PCG18-ASSOC','EXPENSE',		'671',    '7834', 'Charges exceptionnelles sur opérations de gestion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7836,'PCG18-ASSOC','EXPENSE',		'6711',    '7835', 'Pénalités sur marchés (et dédits payés sur achats et ventes)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7837,'PCG18-ASSOC','EXPENSE',		'6712',    '7835', 'Pénalités, amendes fiscales et pénales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7838,'PCG18-ASSOC','EXPENSE',		'6713',    '7835', 'Dons, libéralités', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7839,'PCG18-ASSOC','EXPENSE',		'6714',    '7835', 'Créances devenues irrécouvrables dans l''exercice', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7840,'PCG18-ASSOC','EXPENSE',		'6715',    '7835', 'Subventions accordées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7841,'PCG18-ASSOC','EXPENSE',		'6717',    '7835', 'Rappel d''impôts (autres qu''impôts sur les bénéfices)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7842,'PCG18-ASSOC','EXPENSE',		'6718',    '7835', 'Autres charges exceptionnelles sur opérations de gestion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7843,'PCG18-ASSOC','EXPENSE',		'672',    '7834', '(Compte à la disposition des entités pour enregistrer, en cours d''exercice, les charges sur exercices antérieurs)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7844,'PCG18-ASSOC','EXPENSE',		'673',    '7834', 'Apports ou affectations en numéraire', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7845,'PCG18-ASSOC','EXPENSE',		'674',    '7834', 'Opérations de constitution ou liquidation des fiducies', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7846,'PCG18-ASSOC','EXPENSE',		'6741',    '7845', 'Opérations liées à la constitution de fiducie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7847,'PCG18-ASSOC','EXPENSE',		'6742',    '7845', 'Opérations liées à la liquidation de la fiducie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7848,'PCG18-ASSOC','EXPENSE',		'675',    '7834', 'Valeurs comptables des éléments d''actifs cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7849,'PCG18-ASSOC','EXPENSE',		'6751',    '7848', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7850,'PCG18-ASSOC','EXPENSE',		'6752',    '7848', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7851,'PCG18-ASSOC','EXPENSE',		'6754',    '7848', 'Immobilisations reçues par legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7852,'PCG18-ASSOC','EXPENSE',		'6756',    '7848', 'Immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7853,'PCG18-ASSOC','EXPENSE',		'6758',    '7848', 'Autres éléments d''actif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7854,'PCG18-ASSOC','EXPENSE',		'678',    '7834', 'Autres charges exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7855,'PCG18-ASSOC','EXPENSE',		'6781',    '7854', 'Malis provenant de clauses d''indexation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7856,'PCG18-ASSOC','EXPENSE',		'6782',    '7854', 'Lots', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7857,'PCG18-ASSOC','EXPENSE',		'6783',    '7854', 'Malis provenant du rachat par l''entreprise d''actions et obligations émises par ellemême', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7858,'PCG18-ASSOC','EXPENSE',		'6788',    '7854', 'Charges exceptionnelles diverses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7859,'PCG18-ASSOC','EXPENSE',		'68',    '7006', 'Dotations aux amortissements, provisions et engagements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7860,'PCG18-ASSOC','EXPENSE',		'681',    '7859', 'Dotations aux amortissements, aux dépréciations et aux provisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7861,'PCG18-ASSOC','EXPENSE',		'6811',    '7860', 'Dotations aux amortissements sur immobilisations incorporelles et corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7862,'PCG18-ASSOC','EXPENSE',		'68111',    '7861', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7863,'PCG18-ASSOC','EXPENSE',		'68112',    '7861', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7864,'PCG18-ASSOC','EXPENSE',		'6812',    '7860', 'Dotations aux amortissements des charges d''exploitation à répartir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7865,'PCG18-ASSOC','EXPENSE',		'6815',    '7860', 'Dotations aux provisions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7866,'PCG18-ASSOC','EXPENSE',		'6816',    '7860', 'Dotations pour dépréciations des immobilisations incorporelles et corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7867,'PCG18-ASSOC','EXPENSE',		'68161',    '7866', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7868,'PCG18-ASSOC','EXPENSE',		'68162',    '7866', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7869,'PCG18-ASSOC','EXPENSE',		'68164',    '7866', 'Dotations pour dépréciation d''actifs reçus par legs ou donations destinés à être cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7870,'PCG18-ASSOC','EXPENSE',		'6817',    '7860', 'Dotations pour dépréciations des actifs circulants', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7871,'PCG18-ASSOC','EXPENSE',		'68173',    '7870', 'Stocks et en-cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7872,'PCG18-ASSOC','EXPENSE',		'68174',    '7870', 'Créances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7873,'PCG18-ASSOC','EXPENSE',		'686',    '7859', 'Dotations aux amortissements, aux dépréciations et aux provisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7874,'PCG18-ASSOC','EXPENSE',		'6861',    '7873', 'Dotations aux amortissements des primes de remboursement des obligations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7875,'PCG18-ASSOC','EXPENSE',		'6865',    '7873', 'Dotations aux provisions financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7876,'PCG18-ASSOC','EXPENSE',		'6866',    '7873', 'Dotations pour dépréciations des éléments financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7877,'PCG18-ASSOC','EXPENSE',		'68662',    '7876', 'Immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7878,'PCG18-ASSOC','EXPENSE',		'68665',    '7876', 'Valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7879,'PCG18-ASSOC','EXPENSE',		'6868',    '7873', 'Autres dotations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7880,'PCG18-ASSOC','EXPENSE',		'687',    '7859', 'Dotations aux amortissements, aux dépréciations et aux provisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7881,'PCG18-ASSOC','EXPENSE',		'6871',    '7880', 'Dotations aux amortissements exceptionnels des immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7882,'PCG18-ASSOC','EXPENSE',		'6872',    '7880', 'Dotations aux provisions réglementées (immobilisations)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7883,'PCG18-ASSOC','EXPENSE',		'68725',    '7882', 'Amortissements dérogatoires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7884,'PCG18-ASSOC','EXPENSE',		'6873',    '7880', 'Dotations aux provisions réglementées (stocks)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7885,'PCG18-ASSOC','EXPENSE',		'6874',    '7880', 'Dotations aux autres provisions réglementées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7886,'PCG18-ASSOC','EXPENSE',		'6875',    '7880', 'Dotations aux provisions exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7887,'PCG18-ASSOC','EXPENSE',		'6876',    '7880', 'Dotations pour dépréciations exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7888,'PCG18-ASSOC','EXPENSE',		'689',    '7859', 'Reports en fonds dédiés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7889,'PCG18-ASSOC','EXPENSE',		'6891',    '7888', 'Reports en fonds reportés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7890,'PCG18-ASSOC','EXPENSE',		'6894',    '7888', 'Reports en fonds dédiés sur subventions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7891,'PCG18-ASSOC','EXPENSE',		'6895',    '7888', 'Reports en fonds dédiés sur contributions financières d''autres organismes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7892,'PCG18-ASSOC','EXPENSE',		'6896',    '7888', 'Reports en fonds dédiés sur ressources liées à la générosité du public', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7893,'PCG18-ASSOC','EXPENSE',		'69',    '7006', 'Participation des salariés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7894,'PCG18-ASSOC','EXPENSE',		'691',    '7893', 'Participation des salariés aux résultats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7895,'PCG18-ASSOC','EXPENSE',		'695',    '7893', 'Impôts sur les bénéfices', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7896,'PCG18-ASSOC','EXPENSE',		'6951',    '7895', 'Impôts dus en France', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7897,'PCG18-ASSOC','EXPENSE',		'6952',    '7895', 'Contribution additionnelle à l''impôt sur les bénéfices', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7898,'PCG18-ASSOC','EXPENSE',		'6954',    '7895', 'Impôts dus à l''étranger', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7899,'PCG18-ASSOC','EXPENSE',		'696',    '7893', 'Suppléments d''impôt sur les sociétés liés aux distributions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7900,'PCG18-ASSOC','EXPENSE',		'698',    '7893', 'Intégration fiscale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7901,'PCG18-ASSOC','EXPENSE',		'6981',    '7900', 'Intégration fiscale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7902,'PCG18-ASSOC','EXPENSE',		'6989',    '7900', 'Intégration fiscale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7903,'PCG18-ASSOC','EXPENSE',		'699',    '7893', 'Produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7905,'PCG18-ASSOC','INCOME',		'70',    '7007', 'Ventes de produits fabriqués, prestations de services, marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7906,'PCG18-ASSOC','INCOME',		'701',    '7905', 'Ventes de produits finis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7907,'PCG18-ASSOC','INCOME',		'7011',    '7906', 'Produits finis (ou groupe) A', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7908,'PCG18-ASSOC','INCOME',		'7012',    '7906', 'Produits finis (ou groupe) B', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7909,'PCG18-ASSOC','INCOME',		'702',    '7905', 'Ventes de produits intermédiaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7910,'PCG18-ASSOC','INCOME',		'703',    '7905', 'Ventes de produits résiduels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7911,'PCG18-ASSOC','INCOME',		'704',    '7905', 'Travaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7912,'PCG18-ASSOC','INCOME',		'7041',    '7911', 'Travaux de catégorie (ou activité) A', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7913,'PCG18-ASSOC','INCOME',		'7042',    '7911', 'Travaux de catégorie (ou activité) B', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7914,'PCG18-ASSOC','INCOME',		'705',    '7905', 'Etudes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7915,'PCG18-ASSOC','INCOME',		'706',    '7905', 'Ventes de prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7916,'PCG18-ASSOC','INCOME',		'7063',    '7915', 'Parrainages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7917,'PCG18-ASSOC','INCOME',		'707',    '7905', 'Ventes de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7918,'PCG18-ASSOC','INCOME',		'7071',    '7917', 'Marchandises (ou groupe) A', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7919,'PCG18-ASSOC','INCOME',		'7072',    '7917', 'Marchandises (ou groupe) B', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7920,'PCG18-ASSOC','INCOME',		'7073',    '7917', 'Ventes de dons en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7921,'PCG18-ASSOC','INCOME',		'708',    '7905', 'Produits des activités annexes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7922,'PCG18-ASSOC','INCOME',		'7081',    '7921', 'Produits des services exploités dans l''intérêt du personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7923,'PCG18-ASSOC','INCOME',		'7082',    '7921', 'Commissions et courtages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7924,'PCG18-ASSOC','INCOME',		'7083',    '7921', 'Locations diverses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7925,'PCG18-ASSOC','INCOME',		'7084',    '7921', 'Mise à disposition de personnel facturée', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7926,'PCG18-ASSOC','INCOME',		'7085',    '7921', 'Ports et frais accessoires facturés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7927,'PCG18-ASSOC','INCOME',		'7086',    '7921', 'Bonis sur reprises d''emballages consignés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7928,'PCG18-ASSOC','INCOME',		'7087',    '7921', 'Bonifications obtenues des clients et primes sur ventes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7929,'PCG18-ASSOC','INCOME',		'7088',    '7921', 'Autres produits d''activités annexes (cessions d''approvisionnements,)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7930,'PCG18-ASSOC','INCOME',		'709',    '7905', 'Rabais, remises et ristournes accordés par l''entreprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7931,'PCG18-ASSOC','INCOME',		'7091',    '7930', 'sur ventes de produits finis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7932,'PCG18-ASSOC','INCOME',		'7092',    '7930', 'sur ventes de produits intermédiaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7933,'PCG18-ASSOC','INCOME',		'7094',    '7930', 'sur travaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7934,'PCG18-ASSOC','INCOME',		'7095',    '7930', 'sur études', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7935,'PCG18-ASSOC','INCOME',		'7096',    '7930', 'sur prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7936,'PCG18-ASSOC','INCOME',		'7097',    '7930', 'sur ventes de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7937,'PCG18-ASSOC','INCOME',		'7098',    '7930', 'sur produits des activités annexes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7938,'PCG18-ASSOC','INCOME',		'71',    '7007', 'Production stockée (ou déstockage)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7939,'PCG18-ASSOC','INCOME',		'713',    '7938', 'Variation des stocks (en-cours de production, produits)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7940,'PCG18-ASSOC','INCOME',		'7133',    '7939', 'Variation des en-cours de production de biens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7941,'PCG18-ASSOC','INCOME',		'71331',    '7940', 'Produits en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7942,'PCG18-ASSOC','INCOME',		'71335',    '7940', 'Travaux en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7943,'PCG18-ASSOC','INCOME',		'7134',    '7939', 'Variation des en-cours de production de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7944,'PCG18-ASSOC','INCOME',		'71341',    '7943', 'Etudes en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7945,'PCG18-ASSOC','INCOME',		'71345',    '7943', 'Prestations de services en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7946,'PCG18-ASSOC','INCOME',		'7135',    '7939', 'Variation des stocks de produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7947,'PCG18-ASSOC','INCOME',		'71351',    '7946', 'Produits intermédiaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7948,'PCG18-ASSOC','INCOME',		'71355',    '7946', 'Produits finis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7949,'PCG18-ASSOC','INCOME',		'71358',    '7946', 'Produits résiduels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7950,'PCG18-ASSOC','INCOME',		'72',    '7007', 'Production immobilisée', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7951,'PCG18-ASSOC','INCOME',		'721',    '7950', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7952,'PCG18-ASSOC','INCOME',		'722',    '7950', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7953,'PCG18-ASSOC','INCOME',		'73',    '7007', 'Concours publics', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7954,'PCG18-ASSOC','INCOME',		'74',    '7007', 'Subventions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7955,'PCG18-ASSOC','INCOME',		'75',    '7007', 'Autres produits de gestion courante', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7956,'PCG18-ASSOC','INCOME',		'751',    '7955', 'Redevances pour concessions, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7957,'PCG18-ASSOC','INCOME',		'7511',    '7956', 'Redevances pour concessions, brevets, licences, marques, procédés, logiciels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7958,'PCG18-ASSOC','INCOME',		'7516',    '7956', 'Droits d''auteur et de reproduction', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7959,'PCG18-ASSOC','INCOME',		'7518',    '7956', 'Autres droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7960,'PCG18-ASSOC','INCOME',		'752',    '7955', 'Revenus des immeubles non affectés à des activités professionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7961,'PCG18-ASSOC','INCOME',		'753',    '7955', 'Versements des fondateurs ou consommation de la dotation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7962,'PCG18-ASSOC','INCOME',		'7531',    '7961', 'Versements des fondateurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7963,'PCG18-ASSOC','INCOME',		'7532',    '7961', 'Quotes-parts de dotation consomptible virée au compte de résultat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7964,'PCG18-ASSOC','INCOME',		'754',    '7955', 'Ressources liées à la générosité du public', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7965,'PCG18-ASSOC','INCOME',		'7541',    '7964', 'Dons manuels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7966,'PCG18-ASSOC','INCOME',		'75411',    '7965', 'Dons manuels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7967,'PCG18-ASSOC','INCOME',		'75412',    '7965', 'Abandons de frais par les bénévoles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7968,'PCG18-ASSOC','INCOME',		'7542',    '7964', 'Mécénats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7969,'PCG18-ASSOC','INCOME',		'75431',    '7964', 'Assurances-vie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7970,'PCG18-ASSOC','INCOME',		'75432',    '7964', 'Legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7971,'PCG18-ASSOC','INCOME',		'75433',    '7964', 'Autres produits sur legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7972,'PCG18-ASSOC','INCOME',		'755',    '7955', 'Contributions financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7973,'PCG18-ASSOC','INCOME',		'7551',    '7972', 'Contributions financières d''autres organismes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7974,'PCG18-ASSOC','INCOME',		'7552',    '7972', 'Quotes-parts de générosité reçues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7975,'PCG18-ASSOC','INCOME',		'7555',    '7972', 'Quote-part de bénéfice attribuée (comptabilité des associés non', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7976,'PCG18-ASSOC','INCOME',		'756',    '7955', 'Cotisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7977,'PCG18-ASSOC','INCOME',		'7561',    '7976', 'Cotisations sans contrepartie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7978,'PCG18-ASSOC','INCOME',		'7562',    '7976', 'Cotisations avec contrepartie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7979,'PCG18-ASSOC','INCOME',		'757',    '7955', 'Gains de change sur créances et dettes d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7980,'PCG18-ASSOC','INCOME',		'758',    '7955', 'Produits divers de gestion courante', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7981,'PCG18-ASSOC','INCOME',		'76',    '7007', 'Produits financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7982,'PCG18-ASSOC','INCOME',		'761',    '7981', 'Produits de participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7983,'PCG18-ASSOC','INCOME',		'7611',    '7982', 'Revenus des titres de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7984,'PCG18-ASSOC','INCOME',		'7612',    '7982', 'Produits de la fiducie, résultat de la période', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7985,'PCG18-ASSOC','INCOME',		'7616',    '7982', 'Revenus sur autres formes de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7986,'PCG18-ASSOC','INCOME',		'7617',    '7982', 'Revenus des créances rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7987,'PCG18-ASSOC','INCOME',		'762',    '7981', 'Produits des autres immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7988,'PCG18-ASSOC','INCOME',		'7621',    '7987', 'Revenus des titres immobilisés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7989,'PCG18-ASSOC','INCOME',		'7626',    '7987', 'Revenus des prêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7990,'PCG18-ASSOC','INCOME',		'7627',    '7987', 'Revenus des créances immobilisées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7991,'PCG18-ASSOC','INCOME',		'763',    '7981', 'Revenus des autres créances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7992,'PCG18-ASSOC','INCOME',		'7631',    '7991', 'Revenus des créances commerciales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7993,'PCG18-ASSOC','INCOME',		'7638',    '7991', 'Revenus des créances diverses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7994,'PCG18-ASSOC','INCOME',		'764',    '7981', 'Revenus des valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7995,'PCG18-ASSOC','INCOME',		'765',    '7981', 'Escomptes obtenus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7996,'PCG18-ASSOC','INCOME',		'766',    '7981', 'Gains de change', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7997,'PCG18-ASSOC','INCOME',		'767',    '7981', 'Produits nets sur cessions de valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7998,'PCG18-ASSOC','INCOME',		'768',    '7981', 'Autres produits financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7999,'PCG18-ASSOC','INCOME',		'77',    '7007', 'Produits exceptionnels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8000,'PCG18-ASSOC','INCOME',		'771',    '7999', 'Produits exceptionnels sur opérations de gestion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8001,'PCG18-ASSOC','INCOME',		'7711',    '8000', 'Dédits et pénalités perçus sur achats et sur ventes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8002,'PCG18-ASSOC','INCOME',		'7713',    '8000', 'Libéralités reçues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8003,'PCG18-ASSOC','INCOME',		'7714',    '8000', 'Rentrées sur créances amorties', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8004,'PCG18-ASSOC','INCOME',		'7715',    '8000', 'Subventions d''équilibre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8005,'PCG18-ASSOC','INCOME',		'7717',    '8000', 'Dégrèvements d''impôts autres qu''impôts sur les bénéfices', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8006,'PCG18-ASSOC','INCOME',		'7718',    '8000', 'Autres produits exceptionnels sur opérations de gestion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8007,'PCG18-ASSOC','INCOME',		'772',    '7999', '(Compte à la disposition des entités pour enregistrer, en cours d''exercice, les produits sur exercices antérieurs)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8008,'PCG18-ASSOC','INCOME',		'774',    '7999', 'Opérations de constitution ou liquidation des fiducies', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8009,'PCG18-ASSOC','INCOME',		'7741',    '8008', 'Opérations liées à la constitution de fiducie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8010,'PCG18-ASSOC','INCOME',		'7742',    '8008', 'Opérations liées à la liquidation de la fiducie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8011,'PCG18-ASSOC','INCOME',		'775',    '7999', 'Produits des cessions d''éléments d''actifs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8012,'PCG18-ASSOC','INCOME',		'7751',    '8011', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8013,'PCG18-ASSOC','INCOME',		'7752',    '8011', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8014,'PCG18-ASSOC','INCOME',		'7754',    '8011', 'Immobilisations reçues en legs ou donations destinées à être cédées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8015,'PCG18-ASSOC','INCOME',		'7756',    '8011', 'Immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8016,'PCG18-ASSOC','INCOME',		'7758',    '8011', 'Autres éléments d''actif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8017,'PCG18-ASSOC','INCOME',		'777',    '7999', 'Quote-part des subventions d''investissement virée au résultat de l''exercice', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8018,'PCG18-ASSOC','INCOME',		'778',    '7999', 'Autres produits exceptionnels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8019,'PCG18-ASSOC','INCOME',		'7781',    '8018', 'Bonis provenant de clauses d''indexation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8020,'PCG18-ASSOC','INCOME',		'7782',    '8018', 'Lots', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8021,'PCG18-ASSOC','INCOME',		'7783',    '8018', 'Bonis provenant du rachat par l''entreprise d''actions et d''obligations émises par elle-même', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8022,'PCG18-ASSOC','INCOME',		'7788',    '8018', 'Produits exceptionnels divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8023,'PCG18-ASSOC','INCOME',		'78',    '7007', 'Reprises sur amortissements, dépréciations et provisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8024,'PCG18-ASSOC','INCOME',		'781',    '8023', 'Reprises sur amortissements des immobilisations dépréciations et provisions (à inscrire dans les produits d''exploitation)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8025,'PCG18-ASSOC','INCOME',		'7811',    '8024', 'Reprises sur amortissements des immobilisations incorporelles et corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8026,'PCG18-ASSOC','INCOME',		'78111',    '8025', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8027,'PCG18-ASSOC','INCOME',		'78112',    '8025', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8028,'PCG18-ASSOC','INCOME',		'7815',    '8024', 'Reprises sur provisions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8029,'PCG18-ASSOC','INCOME',		'7816',    '8024', 'Reprises sur dépréciations des immobilisations incorporelles et corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8030,'PCG18-ASSOC','INCOME',		'78161',    '8029', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8031,'PCG18-ASSOC','INCOME',		'78162',    '8029', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8032,'PCG18-ASSOC','INCOME',		'78164',    '8029', 'Reprises sur dépréciations d''actifs reçus par legs ou donations destinés à être cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8033,'PCG18-ASSOC','INCOME',		'7817',    '8024', 'Reprises sur dépréciations des actifs circulants', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8034,'PCG18-ASSOC','INCOME',		'78173',    '8033', 'Stocks et en-cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8035,'PCG18-ASSOC','INCOME',		'78174',    '8033', 'Créances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8036,'PCG18-ASSOC','INCOME',		'786',    '8023', 'Reprises sur provisions pour risques et dépréciations (à inscrire dans les produits financiers)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8037,'PCG18-ASSOC','INCOME',		'7865',    '8036', 'Reprises sur provisions financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8038,'PCG18-ASSOC','INCOME',		'7866',    '8036', 'Reprises sur dépréciations des éléments financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8039,'PCG18-ASSOC','INCOME',		'78662',    '8038', 'Immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8040,'PCG18-ASSOC','INCOME',		'78665',    '8038', 'Valeurs mobilières de placements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8041,'PCG18-ASSOC','INCOME',		'787',    '8023', 'Reprises sur provisions et dépréciations (à inscrire dans les produits exceptionnels)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8042,'PCG18-ASSOC','INCOME',		'7872',    '8041', 'Reprises sur provisions réglementées (immobilisations)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8043,'PCG18-ASSOC','INCOME',		'78725',    '8042', 'Amortissements dérogatoires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8044,'PCG18-ASSOC','INCOME',		'78726',    '8042', 'Provision spéciale de réévaluation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8045,'PCG18-ASSOC','INCOME',		'78727',    '8042', 'Plus-values réinvesties', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8046,'PCG18-ASSOC','INCOME',		'7873',    '8041', 'Reprises sur provisions réglementées (stocks)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8047,'PCG18-ASSOC','INCOME',		'7874',    '8041', 'Reprises sur autres provisions réglementées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8048,'PCG18-ASSOC','INCOME',		'7875',    '8041', 'Reprises sur provisions exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8049,'PCG18-ASSOC','INCOME',		'7876',    '8041', 'Reprises sur dépréciations exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8050,'PCG18-ASSOC','INCOME',		'789',    '8023', 'Utilisations de fonds reportés et de fonds dédiés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8051,'PCG18-ASSOC','INCOME',		'7891',    '8050', 'Utilisations de fonds reportés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8052,'PCG18-ASSOC','INCOME',		'7894',    '8050', 'Utilisations des fonds dédiés sur subventions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8053,'PCG18-ASSOC','INCOME',		'7895',    '8050', 'Utilisations des fonds dédiés sur contributions financières d''autres organismes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8054,'PCG18-ASSOC','INCOME',		'7896',    '8050', 'Utilisations des fonds dédiés sur ressources liées à la générosité du public', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8055,'PCG18-ASSOC','INCOME',		'79',    '7007', 'Transferts de charges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8056,'PCG18-ASSOC','INCOME',		'791',    '8055', 'Transferts de charges d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8057,'PCG18-ASSOC','INCOME',		'796',    '8055', 'Transferts de charges financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8058,'PCG18-ASSOC','INCOME',		'797',    '8055', 'Transferts de charges exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8060,'PCG18-ASSOC','SPECIAL',		'86',    '7008', 'Emplois des contributions volontaires en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8061,'PCG18-ASSOC','SPECIAL',		'860',    '8060', 'Secours en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8062,'PCG18-ASSOC','SPECIAL',		'861',    '8060', 'Mises à disposition gratuite de biens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8063,'PCG18-ASSOC','SPECIAL',		'862',    '8060', 'Prestations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8064,'PCG18-ASSOC','SPECIAL',		'864',    '8060', 'Personnel bénévole', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8065,'PCG18-ASSOC','SPECIAL',		'87',    '7008', 'Contributions volontaires en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8066,'PCG18-ASSOC','SPECIAL',		'870',    '8065', 'Dons en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8067,'PCG18-ASSOC','SPECIAL',		'871',    '8065', 'Prestations en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8068,'PCG18-ASSOC','SPECIAL',		'875',    '8065', 'Bénévolat', 1);
 
 
 --

From 059dfdb9493cc53561d772181b2c974f805fe19a Mon Sep 17 00:00:00 2001
From: SebHashe <sebastien.hacout@gmail.com>
Date: Sat, 18 Jan 2025 12:33:16 +0100
Subject: [PATCH 191/243] Update llx_accounting_account_fr.sql

Add details
---
 .../mysql/data/llx_accounting_account_fr.sql  | 134 +++++++++---------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_accounting_account_fr.sql b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
index 653449f469f..b623f740ceb 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_fr.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
@@ -908,9 +908,9 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7008,'PCG18-ASSOC','SPECIAL',		'8',    '0', 'Comptes spéciaux', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7009,'PCG18-ASSOC','CAPIT',		'10',    '7001', 'Fonds propres et réserves', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7010,'PCG18-ASSOC','CAPIT',		'101',    '7009', 'Capital', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7011,'PCG18-ASSOC','CAPIT',		'1011',    '7010', 'Capital souscrit', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7012,'PCG18-ASSOC','CAPIT',		'1012',    '7010', 'Capital souscrit', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7013,'PCG18-ASSOC','CAPIT',		'1013',    '7010', 'Capital souscrit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7011,'PCG18-ASSOC','CAPIT',		'1011',    '7010', 'Capital souscrit – non appelé', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7012,'PCG18-ASSOC','CAPIT',		'1012',    '7010', 'Capital souscrit – appelé, non versé', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7013,'PCG18-ASSOC','CAPIT',		'1013',    '7010', 'Capital souscrit – appelé, versé', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7014,'PCG18-ASSOC','CAPIT',		'10131',    '7013', 'Capital non amorti', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7015,'PCG18-ASSOC','CAPIT',		'10132',    '7013', 'Capital amorti', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7016,'PCG18-ASSOC','CAPIT',		'1018',    '7010', 'Capital souscrit soumis à des réglementations particulières', 1);
@@ -954,7 +954,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7054,'PCG18-ASSOC','CAPIT',		'108',    '7009', 'Dotations consomptibles', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7055,'PCG18-ASSOC','CAPIT',		'1081',    '7054', 'Dotations consomptibles', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7056,'PCG18-ASSOC','CAPIT',		'1089',    '7054', 'Dotations consomptibles inscrites au compte de résultat', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7057,'PCG18-ASSOC','CAPIT',		'109',    '7009', 'Actionnaires : Capital souscrit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7057,'PCG18-ASSOC','CAPIT',		'109',    '7009', 'Actionnaires : Capital souscrit – non appelé', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7058,'PCG18-ASSOC','CAPIT',		'11',    '7001', 'Report à nouveau (solde créditeur ou débiteur)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7059,'PCG18-ASSOC','CAPIT',		'110',    '7058', 'Report à nouveau (solde créditeur)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7060,'PCG18-ASSOC','CAPIT',		'119',    '7058', 'Report à nouveau (solde débiteur)', 1);
@@ -1078,7 +1078,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7179,'PCG18-ASSOC','IMMO',		'211',    '7178', 'Terrains', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7180,'PCG18-ASSOC','IMMO',		'2111',    '7179', 'Terrains nus', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7181,'PCG18-ASSOC','IMMO',		'2112',    '7179', 'Terrains aménagés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7182,'PCG18-ASSOC','IMMO',		'2113',    '7179', 'Sous', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7182,'PCG18-ASSOC','IMMO',		'2113',    '7179', 'Sous – sols et sursols', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7183,'PCG18-ASSOC','IMMO',		'2114',    '7179', 'Terrains de carrières (Tréfonds)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7184,'PCG18-ASSOC','IMMO',		'2115',    '7179', 'Terrains bâtis', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7185,'PCG18-ASSOC','IMMO',		'21151',    '7184', 'Ensembles immobiliers industriels (A, B)', 1);
@@ -1095,7 +1095,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7196,'PCG18-ASSOC','IMMO',		'21318',    '7193', 'Autres ensembles immobiliers', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7197,'PCG18-ASSOC','IMMO',		'213181',    '7196', 'affectés aux opérations professionnelles (A, B)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7198,'PCG18-ASSOC','IMMO',		'213188',    '7196', 'affectés aux opérations non professionnelles (A, B)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7199,'PCG18-ASSOC','IMMO',		'2135',    '7192', 'Installations générales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7199,'PCG18-ASSOC','IMMO',		'2135',    '7192', 'Installations générales – agencements – aménagements des constructions', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7200,'PCG18-ASSOC','IMMO',		'21351',    '7199', 'Ensembles immobiliers industriels (A, B)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7201,'PCG18-ASSOC','IMMO',		'21355',    '7199', 'Ensembles immobiliers administratifs et commerciaux (A, B)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7202,'PCG18-ASSOC','IMMO',		'21358',    '7199', 'Autres ensembles immobiliers', 1);
@@ -1224,7 +1224,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7325,'PCG18-ASSOC','IMMO',		'2967',    '7322', 'Créances rattachées à des participations (même ventilation que celle du compte 267)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7326,'PCG18-ASSOC','IMMO',		'2968',    '7322', 'Créances rattachées à des sociétés en participation (même ventilation que celle du compte 268)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7327,'PCG18-ASSOC','IMMO',		'297',    '7308', 'Dépréciations des autres immobilisations financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7328,'PCG18-ASSOC','IMMO',		'2971',    '7327', 'Titres immobilisés autres que les titres immobilisés de l''activité de portefeuille', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7328,'PCG18-ASSOC','IMMO',		'2971',    '7327', 'Titres immobilisés autres que les titres immobilisés de l''activité de portefeuille – droit de propriété (même ventilation que celle du compte 271)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7329,'PCG18-ASSOC','IMMO',		'2972',    '7327', 'Droit de créance (même ventilation que celle du compte 272)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7330,'PCG18-ASSOC','IMMO',		'2973',    '7327', 'Titres immobilisés de l''activité de portefeuille', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7331,'PCG18-ASSOC','IMMO',		'2974',    '7327', 'Prêts (même ventilation que celle du compte 274)', 1);
@@ -1303,49 +1303,49 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7406,'PCG18-ASSOC','THIRDPARTY',		'40',    '7004', 'Fournisseurs et comptes rattachés', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7407,'PCG18-ASSOC','THIRDPARTY',		'400',    '7406', 'Fournisseurs et comptes rattachés', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7408,'PCG18-ASSOC','THIRDPARTY',		'401',    '7406', 'Fournisseurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7409,'PCG18-ASSOC','THIRDPARTY',		'4011',    '7408', 'Fournisseurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7410,'PCG18-ASSOC','THIRDPARTY',		'4017',    '7408', 'Fournisseurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7411,'PCG18-ASSOC','THIRDPARTY',		'403',    '7406', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7409,'PCG18-ASSOC','THIRDPARTY',		'4011',    '7408', 'Fournisseurs – Achats de biens et prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7410,'PCG18-ASSOC','THIRDPARTY',		'4017',    '7408', 'Fournisseurs – Retenues de garantie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7411,'PCG18-ASSOC','THIRDPARTY',		'403',    '7406', 'Fournisseurs – Effets à payer', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7412,'PCG18-ASSOC','THIRDPARTY',		'404',    '7406', 'Fournisseurs d''immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7413,'PCG18-ASSOC','THIRDPARTY',		'4041',    '7412', 'Fournisseurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7414,'PCG18-ASSOC','THIRDPARTY',		'4047',    '7412', 'Fournisseurs d''immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7415,'PCG18-ASSOC','THIRDPARTY',		'405',    '7406', 'Fournisseurs d''immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7416,'PCG18-ASSOC','THIRDPARTY',		'408',    '7406', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7413,'PCG18-ASSOC','THIRDPARTY',		'4041',    '7412', 'Fournisseurs – Achats d''immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7414,'PCG18-ASSOC','THIRDPARTY',		'4047',    '7412', 'Fournisseurs d''immobilisations – Retenues de garantie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7415,'PCG18-ASSOC','THIRDPARTY',		'405',    '7406', 'Fournisseurs d''immobilisations – Effets à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7416,'PCG18-ASSOC','THIRDPARTY',		'408',    '7406', 'Fournisseurs – Factures non parvenues', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7417,'PCG18-ASSOC','THIRDPARTY',		'4081',    '7416', 'Fournisseurs', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7418,'PCG18-ASSOC','THIRDPARTY',		'4084',    '7416', 'Fournisseurs d''immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7419,'PCG18-ASSOC','THIRDPARTY',		'4088',    '7416', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7419,'PCG18-ASSOC','THIRDPARTY',		'4088',    '7416', 'Fournisseurs – Intérêts courus', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7420,'PCG18-ASSOC','THIRDPARTY',		'409',    '7406', 'Fournisseurs débiteurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7421,'PCG18-ASSOC','THIRDPARTY',		'4091',    '7420', 'Fournisseurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7422,'PCG18-ASSOC','THIRDPARTY',		'4096',    '7420', 'Fournisseurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7423,'PCG18-ASSOC','THIRDPARTY',		'4097',    '7420', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7421,'PCG18-ASSOC','THIRDPARTY',		'4091',    '7420', 'Fournisseurs – Avances et acomptes versés sur commandes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7422,'PCG18-ASSOC','THIRDPARTY',		'4096',    '7420', 'Fournisseurs – Créances pour emballages et matériel à rendre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7423,'PCG18-ASSOC','THIRDPARTY',		'4097',    '7420', 'Fournisseurs – Autres avoirs', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7424,'PCG18-ASSOC','THIRDPARTY',		'40971',    '7423', 'Fournisseurs d''exploitation', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7425,'PCG18-ASSOC','THIRDPARTY',		'40974',    '7423', 'Fournisseurs d''immobilisations', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7426,'PCG18-ASSOC','THIRDPARTY',		'4098',    '7420', 'Rabais, remises, ristournes à obtenir et autres avoirs non encore reçus', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7427,'PCG18-ASSOC','THIRDPARTY',		'41',    '7004', 'Clients, adhérents, usagers et comptes rattachés', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7428,'PCG18-ASSOC','THIRDPARTY',		'410',    '7427', 'Clients et comptes rattachés', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7429,'PCG18-ASSOC','THIRDPARTY',		'411',    '7427', 'Clients', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7430,'PCG18-ASSOC','THIRDPARTY',		'4111',    '7429', 'Clients', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7431,'PCG18-ASSOC','THIRDPARTY',		'4117',    '7429', 'Clients', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7432,'PCG18-ASSOC','THIRDPARTY',		'413',    '7427', 'Clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7430,'PCG18-ASSOC','THIRDPARTY',		'4111',    '7429', 'Clients – Ventes de biens ou de prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7431,'PCG18-ASSOC','THIRDPARTY',		'4117',    '7429', 'Clients – Retenues de garantie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7432,'PCG18-ASSOC','THIRDPARTY',		'413',    '7427', 'Clients – Effets à recevoir', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7433,'PCG18-ASSOC','THIRDPARTY',		'416',    '7427', 'Clients douteux ou litigieux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7434,'PCG18-ASSOC','THIRDPARTY',		'418',    '7427', 'Clients', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7435,'PCG18-ASSOC','THIRDPARTY',		'4181',    '7434', 'Clients', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7436,'PCG18-ASSOC','THIRDPARTY',		'4188',    '7434', 'Clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7434,'PCG18-ASSOC','THIRDPARTY',		'418',    '7427', 'Clients – Produits non encore facturés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7435,'PCG18-ASSOC','THIRDPARTY',		'4181',    '7434', 'Clients – Factures à établir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7436,'PCG18-ASSOC','THIRDPARTY',		'4188',    '7434', 'Clients – Intérêts courus', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7437,'PCG18-ASSOC','THIRDPARTY',		'419',    '7427', 'Clients créditeurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7438,'PCG18-ASSOC','THIRDPARTY',		'4191',    '7437', 'Clients', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7439,'PCG18-ASSOC','THIRDPARTY',		'4196',    '7437', 'Clients', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7440,'PCG18-ASSOC','THIRDPARTY',		'4197',    '7437', 'Clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7438,'PCG18-ASSOC','THIRDPARTY',		'4191',    '7437', 'Clients – Avances et acomptes reçus sur commandes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7439,'PCG18-ASSOC','THIRDPARTY',		'4196',    '7437', 'Clients – Dettes sur emballages et matériels consignés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7440,'PCG18-ASSOC','THIRDPARTY',		'4197',    '7437', 'Clients – Autres avoirs', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7441,'PCG18-ASSOC','THIRDPARTY',		'4198',    '7437', 'Rabais, remises, ristournes à accorder et autres avoirs à établir', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7442,'PCG18-ASSOC','THIRDPARTY',		'42',    '7004', 'Personnel et comptes rattachés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7443,'PCG18-ASSOC','THIRDPARTY',		'421',    '7442', 'Personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7443,'PCG18-ASSOC','THIRDPARTY',		'421',    '7442', 'Personnel – Rémunérations dues', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7444,'PCG18-ASSOC','THIRDPARTY',		'422',    '7442', 'Comités d''entreprises, d''établissement, …', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7445,'PCG18-ASSOC','THIRDPARTY',		'424',    '7442', 'Participation des salariés aux résultats', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7446,'PCG18-ASSOC','THIRDPARTY',		'4246',    '7445', 'Réserve spéciale', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7447,'PCG18-ASSOC','THIRDPARTY',		'4248',    '7445', 'Comptes courants', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7448,'PCG18-ASSOC','THIRDPARTY',		'425',    '7442', 'Personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7449,'PCG18-ASSOC','THIRDPARTY',		'426',    '7442', 'Personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7450,'PCG18-ASSOC','THIRDPARTY',		'427',    '7442', 'Personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7451,'PCG18-ASSOC','THIRDPARTY',		'428',    '7442', 'Personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7448,'PCG18-ASSOC','THIRDPARTY',		'425',    '7442', 'Personnel – Avances et acomptes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7449,'PCG18-ASSOC','THIRDPARTY',		'426',    '7442', 'Personnel – Dépôts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7450,'PCG18-ASSOC','THIRDPARTY',		'427',    '7442', 'Personnel – Oppositions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7451,'PCG18-ASSOC','THIRDPARTY',		'428',    '7442', 'Personnel – Charges à payer et produits à recevoir', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7452,'PCG18-ASSOC','THIRDPARTY',		'4282',    '7451', 'Dettes provisionnées pour congés à payer', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7453,'PCG18-ASSOC','THIRDPARTY',		'4284',    '7451', 'Dettes provisionnées pour participation des salariés aux résultats', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7454,'PCG18-ASSOC','THIRDPARTY',		'4286',    '7451', 'Autres charges à payer', 1);
@@ -1353,24 +1353,24 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7456,'PCG18-ASSOC','THIRDPARTY',		'43',    '7004', 'Legs, donations et assurances-vie', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7457,'PCG18-ASSOC','THIRDPARTY',		'431',    '7456', 'Sécurité sociale', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7458,'PCG18-ASSOC','THIRDPARTY',		'437',    '7456', 'Autres organismes sociaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7459,'PCG18-ASSOC','THIRDPARTY',		'438',    '7456', 'Organismes sociaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7459,'PCG18-ASSOC','THIRDPARTY',		'438',    '7456', 'Organismes sociaux – Charges à payer et produits à recevoir', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7460,'PCG18-ASSOC','THIRDPARTY',		'4382',    '7459', 'Charges sociales sur congés à payer', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7461,'PCG18-ASSOC','THIRDPARTY',		'4386',    '7459', 'Autres charges à payer', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7462,'PCG18-ASSOC','THIRDPARTY',		'4387',    '7459', 'Produits à recevoir', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7463,'PCG18-ASSOC','THIRDPARTY',		'44',    '7004', 'État et autres collectivités publiques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7464,'PCG18-ASSOC','THIRDPARTY',		'441',    '7463', 'État', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7464,'PCG18-ASSOC','THIRDPARTY',		'441',    '7463', 'État – Subventions à recevoir', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7465,'PCG18-ASSOC','THIRDPARTY',		'4411',    '7464', 'Subventions d''investissement', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7466,'PCG18-ASSOC','THIRDPARTY',		'4417',    '7464', 'Subventions d''exploitation', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7467,'PCG18-ASSOC','THIRDPARTY',		'4418',    '7464', 'Subventions d''équilibre', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7468,'PCG18-ASSOC','THIRDPARTY',		'4419',    '7464', 'Avances sur subventions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7469,'PCG18-ASSOC','THIRDPARTY',		'442',    '7463', 'Etat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7469,'PCG18-ASSOC','THIRDPARTY',		'442',    '7463', 'Etat – Impôts et taxes recouvrables sur des tiers', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7470,'PCG18-ASSOC','THIRDPARTY',		'4424',    '7469', 'Obligataires', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7471,'PCG18-ASSOC','THIRDPARTY',		'4425',    '7469', 'Associés', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7472,'PCG18-ASSOC','THIRDPARTY',		'443',    '7463', 'Opérations particulières avec l''Etat les collectivités publiques, les organismes internationaux', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7473,'PCG18-ASSOC','THIRDPARTY',		'4431',    '7472', 'Créances sur l''Etat résultant de la suppression de la règle du décalage d''un mois en matière de TVA', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7474,'PCG18-ASSOC','THIRDPARTY',		'4438',    '7472', 'Intérêts courus sur créances figurant au 4431', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7475,'PCG18-ASSOC','THIRDPARTY',		'444',    '7463', 'Etat', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7476,'PCG18-ASSOC','THIRDPARTY',		'445',    '7463', 'Etat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7475,'PCG18-ASSOC','THIRDPARTY',		'444',    '7463', 'Etat – Impôts sur les bénéfices', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7476,'PCG18-ASSOC','THIRDPARTY',		'445',    '7463', 'Etat – Taxes sur le chiffre d''affaires', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7477,'PCG18-ASSOC','THIRDPARTY',		'4452',    '7476', 'TVA due intracommunautaire', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7478,'PCG18-ASSOC','THIRDPARTY',		'4455',    '7476', 'Taxes sur le chiffre d''affaires à décaisser', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7479,'PCG18-ASSOC','THIRDPARTY',		'44551',    '7478', 'TVA à décaisser', 1);
@@ -1385,37 +1385,37 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7488,'PCG18-ASSOC','THIRDPARTY',		'44571',    '7487', 'TVA collectée', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7489,'PCG18-ASSOC','THIRDPARTY',		'44578',    '7487', 'Taxes assimilées à la TVA', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7490,'PCG18-ASSOC','THIRDPARTY',		'4458',    '7476', 'Taxes sur le chiffre d''affaires à régulariser ou en attente', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7491,'PCG18-ASSOC','THIRDPARTY',		'44581',    '7490', 'Acomptes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7492,'PCG18-ASSOC','THIRDPARTY',		'44582',    '7490', 'Acomptes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7491,'PCG18-ASSOC','THIRDPARTY',		'44581',    '7490', 'Acomptes – Régime simplifié d''imposition', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7492,'PCG18-ASSOC','THIRDPARTY',		'44582',    '7490', 'Acomptes – Régime de forfait', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7493,'PCG18-ASSOC','THIRDPARTY',		'44583',    '7490', 'Remboursement de taxes sur le chiffre d''affaires demandé', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7494,'PCG18-ASSOC','THIRDPARTY',		'44584',    '7490', 'TVA récupérée d''avance', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7495,'PCG18-ASSOC','THIRDPARTY',		'44586',    '7490', 'Taxes sur le chiffre d''affaires sur factures non parvenues', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7496,'PCG18-ASSOC','THIRDPARTY',		'44587',    '7490', 'Taxes sur le chiffre d''affaires sur factures à établir', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7497,'PCG18-ASSOC','THIRDPARTY',		'446',    '7463', 'Obligations cautionnées', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7498,'PCG18-ASSOC','THIRDPARTY',		'447',    '7463', 'Autres impôts, taxes et versements assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7499,'PCG18-ASSOC','THIRDPARTY',		'448',    '7463', 'Etat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7499,'PCG18-ASSOC','THIRDPARTY',		'448',    '7463', 'Etat – Charges à payer et produits à recevoir', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7500,'PCG18-ASSOC','THIRDPARTY',		'4482',    '7499', 'Charges fiscales sur congés à payer', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7501,'PCG18-ASSOC','THIRDPARTY',		'4486',    '7499', 'Charges à payer', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7502,'PCG18-ASSOC','THIRDPARTY',		'4487',    '7499', 'Produits à recevoir', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7503,'PCG18-ASSOC','THIRDPARTY',		'449',    '7463', 'Quotas d''émission à acquérir', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7504,'PCG18-ASSOC','THIRDPARTY',		'45',    '7004', 'Confédération, fédération, union, entités affiliées', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7505,'PCG18-ASSOC','THIRDPARTY',		'451',    '7504', 'Groupe', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7506,'PCG18-ASSOC','THIRDPARTY',		'455',    '7504', 'Associés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7506,'PCG18-ASSOC','THIRDPARTY',		'455',    '7504', 'Associés – Comptes courants', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7507,'PCG18-ASSOC','THIRDPARTY',		'4551',    '7506', 'Principal', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7508,'PCG18-ASSOC','THIRDPARTY',		'4558',    '7506', 'Intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7509,'PCG18-ASSOC','THIRDPARTY',		'456',    '7504', 'Associés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7510,'PCG18-ASSOC','THIRDPARTY',		'4561',    '7509', 'Associés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7509,'PCG18-ASSOC','THIRDPARTY',		'456',    '7504', 'Associés – Opérations sur le capital', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7510,'PCG18-ASSOC','THIRDPARTY',		'4561',    '7509', 'Associés – Comptes d''apport en société', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7511,'PCG18-ASSOC','THIRDPARTY',		'45611',    '7510', 'Apports en nature', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7512,'PCG18-ASSOC','THIRDPARTY',		'45615',    '7510', 'Apports en numéraire', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7513,'PCG18-ASSOC','THIRDPARTY',		'4562',    '7509', 'Apporteurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7514,'PCG18-ASSOC','THIRDPARTY',		'45621',    '7513', 'Actionnaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7515,'PCG18-ASSOC','THIRDPARTY',		'45625',    '7513', 'Associés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7516,'PCG18-ASSOC','THIRDPARTY',		'4563',    '7509', 'Associés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7517,'PCG18-ASSOC','THIRDPARTY',		'4564',    '7509', 'Associés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7513,'PCG18-ASSOC','THIRDPARTY',		'4562',    '7509', 'Apporteurs – Capital appelé, non versé', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7514,'PCG18-ASSOC','THIRDPARTY',		'45621',    '7513', 'Actionnaires – Capital souscrit et appelé, non versé', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7515,'PCG18-ASSOC','THIRDPARTY',		'45625',    '7513', 'Associés – Capital appelé, non versé', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7516,'PCG18-ASSOC','THIRDPARTY',		'4563',    '7509', 'Associés – Versements reçus sur augmentation de capital', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7517,'PCG18-ASSOC','THIRDPARTY',		'4564',    '7509', 'Associés – Versements anticipés', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7518,'PCG18-ASSOC','THIRDPARTY',		'4566',    '7509', 'Actionnaires défaillants', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7519,'PCG18-ASSOC','THIRDPARTY',		'4567',    '7509', 'Associés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7520,'PCG18-ASSOC','THIRDPARTY',		'457',    '7504', 'Associés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7521,'PCG18-ASSOC','THIRDPARTY',		'458',    '7504', 'Associés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7519,'PCG18-ASSOC','THIRDPARTY',		'4567',    '7509', 'Associés – Capital à rembourser', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7520,'PCG18-ASSOC','THIRDPARTY',		'457',    '7504', 'Associés – Dividendes à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7521,'PCG18-ASSOC','THIRDPARTY',		'458',    '7504', 'Associés – Opérations faites en commun et en GIE', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7522,'PCG18-ASSOC','THIRDPARTY',		'4581',    '7521', 'Opérations courantes', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7523,'PCG18-ASSOC','THIRDPARTY',		'4588',    '7521', 'Intérêts courus', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7524,'PCG18-ASSOC','THIRDPARTY',		'46',    '7004', 'Débiteurs et créditeurs divers', 1);
@@ -1425,7 +1425,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7528,'PCG18-ASSOC','THIRDPARTY',		'465',    '7524', 'Créances sur cessions de valeurs mobilières de placement', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7529,'PCG18-ASSOC','THIRDPARTY',		'466',    '7524', 'Dettes des legs ou donations', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7530,'PCG18-ASSOC','THIRDPARTY',		'467',    '7524', 'Autres comptes débiteurs ou créditeurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7531,'PCG18-ASSOC','THIRDPARTY',		'468',    '7524', 'Divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7531,'PCG18-ASSOC','THIRDPARTY',		'468',    '7524', 'Divers – charges à payer et produits à recevoir', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7532,'PCG18-ASSOC','THIRDPARTY',		'4681',    '7531', 'Frais des bénévoles', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7533,'PCG18-ASSOC','THIRDPARTY',		'4686',    '7531', 'Charges à payer', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7534,'PCG18-ASSOC','THIRDPARTY',		'4687',    '7531', 'Produits à recevoir', 1);
@@ -1435,11 +1435,11 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7538,'PCG18-ASSOC','THIRDPARTY',		'473',    '7535', 'Comptes d''attente', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7539,'PCG18-ASSOC','THIRDPARTY',		'474',    '7535', 'Comptes d''attente', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7540,'PCG18-ASSOC','THIRDPARTY',		'475',    '7535', 'Comptes d''attente', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7541,'PCG18-ASSOC','THIRDPARTY',		'476',    '7535', 'Différence de conversion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7541,'PCG18-ASSOC','THIRDPARTY',		'476',    '7535', 'Différence de conversion – Actif', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7542,'PCG18-ASSOC','THIRDPARTY',		'4761',    '7541', 'Diminution des créances', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7543,'PCG18-ASSOC','THIRDPARTY',		'4762',    '7541', 'Augmentation des dettes', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7544,'PCG18-ASSOC','THIRDPARTY',		'4768',    '7541', 'Différences compensées par couverture de change', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7545,'PCG18-ASSOC','THIRDPARTY',		'477',    '7535', 'Différences de conversion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7545,'PCG18-ASSOC','THIRDPARTY',		'477',    '7535', 'Différences de conversion – Passif', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7546,'PCG18-ASSOC','THIRDPARTY',		'4771',    '7545', 'Augmentation des créances', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7547,'PCG18-ASSOC','THIRDPARTY',		'4772',    '7545', 'Diminution des dettes', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7548,'PCG18-ASSOC','THIRDPARTY',		'4778',    '7545', 'Différences compensées par couverture de change', 1);
@@ -1517,11 +1517,11 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7622,'PCG18-ASSOC','FINAN',		'5906',    '7619', 'Obligations', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7623,'PCG18-ASSOC','FINAN',		'5908',    '7619', 'Autres valeurs mobilières de placement et créances assimilées', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7625,'PCG18-ASSOC','EXPENSE',		'60',    '7006', 'Achats (sauf 603)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7626,'PCG18-ASSOC','EXPENSE',		'601',    '7625', 'Achats stockés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7626,'PCG18-ASSOC','EXPENSE',		'601',    '7625', 'Achats stockés – Matières premières (et fournitures)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7627,'PCG18-ASSOC','EXPENSE',		'6011',    '7626', 'Matières (ou groupe) A', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7628,'PCG18-ASSOC','EXPENSE',		'6012',    '7626', 'Matières (ou groupe) B', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7629,'PCG18-ASSOC','EXPENSE',		'6017',    '7626', 'Fournitures A, B, C,', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7630,'PCG18-ASSOC','EXPENSE',		'602',    '7625', 'Achats stockés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7630,'PCG18-ASSOC','EXPENSE',		'602',    '7625', 'Achats stockés – Autres approvisionnements', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7631,'PCG18-ASSOC','EXPENSE',		'6021',    '7630', 'Matières consommables', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7632,'PCG18-ASSOC','EXPENSE',		'60211',    '7631', 'Matières (ou groupe) C', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7633,'PCG18-ASSOC','EXPENSE',		'60212',    '7631', 'Matières (ou groupe) D', 1);
@@ -1582,7 +1582,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7688,'PCG18-ASSOC','EXPENSE',		'616',    '7674', 'Primes d''assurances', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7689,'PCG18-ASSOC','EXPENSE',		'6161',    '7688', 'Multirisques', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7690,'PCG18-ASSOC','EXPENSE',		'6162',    '7688', 'Assurance obligatoire dommage construction', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7691,'PCG18-ASSOC','EXPENSE',		'6163',    '7688', 'Assurance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7691,'PCG18-ASSOC','EXPENSE',		'6163',    '7688', 'Assurance – transport', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7692,'PCG18-ASSOC','EXPENSE',		'61636',    '7691', 'sur achats', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7693,'PCG18-ASSOC','EXPENSE',		'61637',    '7691', 'sur ventes', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7694,'PCG18-ASSOC','EXPENSE',		'61638',    '7691', 'sur autres biens', 1);
@@ -1737,7 +1737,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7843,'PCG18-ASSOC','EXPENSE',		'672',    '7834', '(Compte à la disposition des entités pour enregistrer, en cours d''exercice, les charges sur exercices antérieurs)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7844,'PCG18-ASSOC','EXPENSE',		'673',    '7834', 'Apports ou affectations en numéraire', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7845,'PCG18-ASSOC','EXPENSE',		'674',    '7834', 'Opérations de constitution ou liquidation des fiducies', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7846,'PCG18-ASSOC','EXPENSE',		'6741',    '7845', 'Opérations liées à la constitution de fiducie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7846,'PCG18-ASSOC','EXPENSE',		'6741',    '7845', 'Opérations liées à la constitution de fiducie – Transfert des éléments', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7847,'PCG18-ASSOC','EXPENSE',		'6742',    '7845', 'Opérations liées à la liquidation de la fiducie', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7848,'PCG18-ASSOC','EXPENSE',		'675',    '7834', 'Valeurs comptables des éléments d''actifs cédés', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7849,'PCG18-ASSOC','EXPENSE',		'6751',    '7848', 'Immobilisations incorporelles', 1);
@@ -1751,7 +1751,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7857,'PCG18-ASSOC','EXPENSE',		'6783',    '7854', 'Malis provenant du rachat par l''entreprise d''actions et obligations émises par ellemême', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7858,'PCG18-ASSOC','EXPENSE',		'6788',    '7854', 'Charges exceptionnelles diverses', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7859,'PCG18-ASSOC','EXPENSE',		'68',    '7006', 'Dotations aux amortissements, provisions et engagements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7860,'PCG18-ASSOC','EXPENSE',		'681',    '7859', 'Dotations aux amortissements, aux dépréciations et aux provisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7860,'PCG18-ASSOC','EXPENSE',		'681',    '7859', 'Dotations aux amortissements, aux dépréciations et aux provisions – Charges d''exploitation', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7861,'PCG18-ASSOC','EXPENSE',		'6811',    '7860', 'Dotations aux amortissements sur immobilisations incorporelles et corporelles', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7862,'PCG18-ASSOC','EXPENSE',		'68111',    '7861', 'Immobilisations incorporelles', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7863,'PCG18-ASSOC','EXPENSE',		'68112',    '7861', 'Immobilisations corporelles', 1);
@@ -1764,14 +1764,14 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7870,'PCG18-ASSOC','EXPENSE',		'6817',    '7860', 'Dotations pour dépréciations des actifs circulants', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7871,'PCG18-ASSOC','EXPENSE',		'68173',    '7870', 'Stocks et en-cours', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7872,'PCG18-ASSOC','EXPENSE',		'68174',    '7870', 'Créances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7873,'PCG18-ASSOC','EXPENSE',		'686',    '7859', 'Dotations aux amortissements, aux dépréciations et aux provisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7873,'PCG18-ASSOC','EXPENSE',		'686',    '7859', 'Dotations aux amortissements, aux dépréciations et aux provisions – Charges financières', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7874,'PCG18-ASSOC','EXPENSE',		'6861',    '7873', 'Dotations aux amortissements des primes de remboursement des obligations', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7875,'PCG18-ASSOC','EXPENSE',		'6865',    '7873', 'Dotations aux provisions financières', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7876,'PCG18-ASSOC','EXPENSE',		'6866',    '7873', 'Dotations pour dépréciations des éléments financiers', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7877,'PCG18-ASSOC','EXPENSE',		'68662',    '7876', 'Immobilisations financières', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7878,'PCG18-ASSOC','EXPENSE',		'68665',    '7876', 'Valeurs mobilières de placement', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7879,'PCG18-ASSOC','EXPENSE',		'6868',    '7873', 'Autres dotations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7880,'PCG18-ASSOC','EXPENSE',		'687',    '7859', 'Dotations aux amortissements, aux dépréciations et aux provisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7880,'PCG18-ASSOC','EXPENSE',		'687',    '7859', 'Dotations aux amortissements, aux dépréciations et aux provisions – Charges exceptionnelles', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7881,'PCG18-ASSOC','EXPENSE',		'6871',    '7880', 'Dotations aux amortissements exceptionnels des immobilisations', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7882,'PCG18-ASSOC','EXPENSE',		'6872',    '7880', 'Dotations aux provisions réglementées (immobilisations)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7883,'PCG18-ASSOC','EXPENSE',		'68725',    '7882', 'Amortissements dérogatoires', 1);
@@ -1784,7 +1784,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7890,'PCG18-ASSOC','EXPENSE',		'6894',    '7888', 'Reports en fonds dédiés sur subventions d''exploitation', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7891,'PCG18-ASSOC','EXPENSE',		'6895',    '7888', 'Reports en fonds dédiés sur contributions financières d''autres organismes', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7892,'PCG18-ASSOC','EXPENSE',		'6896',    '7888', 'Reports en fonds dédiés sur ressources liées à la générosité du public', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7893,'PCG18-ASSOC','EXPENSE',		'69',    '7006', 'Participation des salariés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7893,'PCG18-ASSOC','EXPENSE',		'69',    '7006', 'Participation des salariés – Impôts sur les bénéfices et assimilés', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7894,'PCG18-ASSOC','EXPENSE',		'691',    '7893', 'Participation des salariés aux résultats', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7895,'PCG18-ASSOC','EXPENSE',		'695',    '7893', 'Impôts sur les bénéfices', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7896,'PCG18-ASSOC','EXPENSE',		'6951',    '7895', 'Impôts dus en France', 1);
@@ -1792,9 +1792,9 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7898,'PCG18-ASSOC','EXPENSE',		'6954',    '7895', 'Impôts dus à l''étranger', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7899,'PCG18-ASSOC','EXPENSE',		'696',    '7893', 'Suppléments d''impôt sur les sociétés liés aux distributions', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7900,'PCG18-ASSOC','EXPENSE',		'698',    '7893', 'Intégration fiscale', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7901,'PCG18-ASSOC','EXPENSE',		'6981',    '7900', 'Intégration fiscale', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7902,'PCG18-ASSOC','EXPENSE',		'6989',    '7900', 'Intégration fiscale', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7903,'PCG18-ASSOC','EXPENSE',		'699',    '7893', 'Produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7901,'PCG18-ASSOC','EXPENSE',		'6981',    '7900', 'Intégration fiscale – Charges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7902,'PCG18-ASSOC','EXPENSE',		'6989',    '7900', 'Intégration fiscale – Produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7903,'PCG18-ASSOC','EXPENSE',		'699',    '7893', 'Produits – Reports en arrière des déficits', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7905,'PCG18-ASSOC','INCOME',		'70',    '7007', 'Ventes de produits fabriqués, prestations de services, marchandises', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7906,'PCG18-ASSOC','INCOME',		'701',    '7905', 'Ventes de produits finis', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7907,'PCG18-ASSOC','INCOME',		'7011',    '7906', 'Produits finis (ou groupe) A', 1);
@@ -1865,7 +1865,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7972,'PCG18-ASSOC','INCOME',		'755',    '7955', 'Contributions financières', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7973,'PCG18-ASSOC','INCOME',		'7551',    '7972', 'Contributions financières d''autres organismes', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7974,'PCG18-ASSOC','INCOME',		'7552',    '7972', 'Quotes-parts de générosité reçues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7975,'PCG18-ASSOC','INCOME',		'7555',    '7972', 'Quote-part de bénéfice attribuée (comptabilité des associés non', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7975,'PCG18-ASSOC','INCOME',		'7555',    '7972', 'Quote-part de bénéfice attribuée (comptabilité des associés non – gérants)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7976,'PCG18-ASSOC','INCOME',		'756',    '7955', 'Cotisations', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7977,'PCG18-ASSOC','INCOME',		'7561',    '7976', 'Cotisations sans contrepartie', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7978,'PCG18-ASSOC','INCOME',		'7562',    '7976', 'Cotisations avec contrepartie', 1);
@@ -1899,7 +1899,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8006,'PCG18-ASSOC','INCOME',		'7718',    '8000', 'Autres produits exceptionnels sur opérations de gestion', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8007,'PCG18-ASSOC','INCOME',		'772',    '7999', '(Compte à la disposition des entités pour enregistrer, en cours d''exercice, les produits sur exercices antérieurs)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8008,'PCG18-ASSOC','INCOME',		'774',    '7999', 'Opérations de constitution ou liquidation des fiducies', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8009,'PCG18-ASSOC','INCOME',		'7741',    '8008', 'Opérations liées à la constitution de fiducie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8009,'PCG18-ASSOC','INCOME',		'7741',    '8008', 'Opérations liées à la constitution de fiducie – Transfert des éléments', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8010,'PCG18-ASSOC','INCOME',		'7742',    '8008', 'Opérations liées à la liquidation de la fiducie', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8011,'PCG18-ASSOC','INCOME',		'775',    '7999', 'Produits des cessions d''éléments d''actifs', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8012,'PCG18-ASSOC','INCOME',		'7751',    '8011', 'Immobilisations incorporelles', 1);

From 89f040c69edb926ba7779a51c8e22b409b02fafc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 18 Jan 2025 14:28:35 +0100
Subject: [PATCH 192/243] Qual: Fix ci, PHPdoc fk_website needs to match
 default value

# Qual: Fix ci, PHPdoc fk_website needs to match default value

Correct doctype for new $fk_website in getCustomerAccount.
Also made definition of type for $status more strict.
---
 htdocs/societe/class/societeaccount.class.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 2a6447d6ca1..e97ec89d8fa 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -261,7 +261,7 @@ class SocieteAccount extends CommonObject
 	}
 
 	/**
-	 * Clone and object into another one
+	 * Clone an object into another one
 	 *
 	 * @param  	User 	$user      	User that creates
 	 * @param  	int 	$fromid     Id of object to clone
@@ -340,14 +340,14 @@ class SocieteAccount extends CommonObject
 	}
 
 	/**
-	 * Try to find the external customer id of a thirdparty for another site/system.
+	 * Try to find the external customer id of a third party for another site/system.
 	 *
-	 * @param	int		$id				Id of third party
-	 * @param	string	$site			Site (example: 'stripe', '...')
-	 * @param	int		$status			Status (0=test, 1=live, -1=we don't mind)
-	 * @param	string	$site_account 	Value to use to identify with account to use on site when site can offer several accounts. For example: 'pk_live_123456' when using Stripe service.
-	 * @param	string	$fk_website		Id website
-	 * @return	string					Stripe customer ref 'cu_xxxxxxxxxxxxx' or ''
+	 * @param	int			$id				Id of third party
+	 * @param	string		$site			Site (example: 'stripe', '...')
+	 * @param	int<-1,1>	$status			Status (0=test, 1=live, -1=we don't mind)
+	 * @param	string		$site_account 	Value to use to identify with account to use on site when site can offer several accounts. For example: 'pk_live_123456' when using Stripe service.
+	 * @param	int			$fk_website		Id website
+	 * @return	string						Stripe customer ref 'cu_xxxxxxxxxxxxx' or ''
 	 * @see getThirdPartyID()
 	 */
 	public function getCustomerAccount($id, $site, $status = 0, $site_account = '', $fk_website = 0)
@@ -442,6 +442,7 @@ class SocieteAccount extends CommonObject
 
 	/**
 	 * getTooltipContentArray
+	 *
 	 * @param array<string,mixed> $params params to construct tooltip data
 	 * @since v18
 	 * @return array{picto?:string,ref?:string,refsupplier?:string,label?:string,date?:string,date_echeance?:string,amountht?:string,total_ht?:string,totaltva?:string,amountlt1?:string,amountlt2?:string,amountrevenustamp?:string,totalttc?:string}|array{optimize:string}

From 55591fc8c6c8bb22136d72f79f24d2df1f94fea4 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sat, 18 Jan 2025 19:20:55 +0100
Subject: [PATCH 193/243] Debug v21

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 63f4f2f27f0..7cce1de80c1 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1662,7 +1662,7 @@ if (!empty($arrayfields['c.ref']['checked'])) {
 // Ref ext
 if (!empty($arrayfields['c.ref_ext']['checked'])) {
 	print '<td class="liste_titre">';
-	print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref_ext).'">';
+	print '<input class="flat" size="6" type="text" name="search_ref_ext" value="'.dol_escape_htmltag($search_ref_ext).'">';
 	print '</td>';
 }
 // Ref customer

From 79580ce14fad7cee70718ee91a3592e2af21357f Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sat, 18 Jan 2025 19:37:36 +0100
Subject: [PATCH 194/243] Trans

---
 htdocs/langs/en_US/website.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 1f4dea08683..212147881ff 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -286,6 +286,7 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing

From d39ef7b75203bdf8613d5f9bfa559c8795d378e9 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sun, 19 Jan 2025 13:18:36 +0100
Subject: [PATCH 195/243] NEW add creditnotelist var in fetch

---
 htdocs/compta/facture/card.php                   | 11 +++++------
 htdocs/compta/facture/class/facture.class.php    |  4 ++++
 htdocs/compta/facture/prelevement.php            | 13 ++++++-------
 htdocs/core/class/commoninvoice.class.php        |  5 +++++
 htdocs/fourn/class/fournisseur.facture.class.php |  4 ++++
 htdocs/fourn/facture/card.php                    | 11 +++++------
 htdocs/fourn/facture/contact.php                 | 11 +++++------
 htdocs/fourn/facture/document.php                | 11 +++++------
 htdocs/fourn/facture/note.php                    | 11 +++++------
 9 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index b9b152943ab..a5feab87d9b 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4743,19 +4743,18 @@ if ($action == 'create') {
 			print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1, '', 32)).'</span>';
 		}
 
-		$facidavoir = $object->getListIdAvoirFromInvoice();
-		if (count($facidavoir) > 0) {
+		if (!empty($object->creditnotelist)) {
 			print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir");
 			$i = 0;
-			foreach ($facidavoir as $id) {
+			foreach ($object->creditnotelist as $invoiceid) {
 				if ($i == 0) {
 					print ' ';
 				} else {
 					print ',';
 				}
-				$facavoir = new Facture($db);
-				$facavoir->fetch($id);
-				print $facavoir->getNomUrl(1, '', 32);
+				$creditnote = new Facture($db);
+				$creditnote->fetch($id);
+				print $creditnote->getNomUrl(1, '', 32);
 			}
 			print '</span>';
 		}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 179385b1aba..d48dc07bf53 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2300,6 +2300,10 @@ class Facture extends CommonInvoice
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
+				if ($this->type != self::TYPE_CREDIT_NOTE) {
+					$this->creditnotelist = $this->getListIdAvoirFromInvoice();
+				}
+
 				if (($this->type == self::TYPE_SITUATION || ($this->type == self::TYPE_CREDIT_NOTE && $this->situation_cycle_ref > 0)) && $fetch_situation) {
 					$this->fetchPreviousNextSituationInvoice();
 				}
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 50a513a994f..b9b060ccc96 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -439,17 +439,16 @@ if ($object->id > 0) {
 		print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).'</span>';
 	}
 
-	$facidavoir = $object->getListIdAvoirFromInvoice();
-	if (count($facidavoir) > 0) {
+	if (!empty($object->creditnotelist)) {
 		$invoicecredits = array();
-		foreach ($facidavoir as $facid) {
+		foreach (!empty($object->creditnotelist) as $invoiceid) {
 			if ($type == 'bank-transfer') {
-				$facavoir = new FactureFournisseur($db);
+				$creditnote = new FactureFournisseur($db);
 			} else {
-				$facavoir = new Facture($db);
+				$creditnote = new Facture($db);
 			}
-			$facavoir->fetch($facid);
-			$invoicecredits[] = $facavoir->getNomUrl(1);
+			$creditnote->fetch($invoiceid);
+			$invoicecredits[] = $creditnote->getNomUrl(1);
 		}
 		print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir");
 		print ' '. (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits);
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 321533eb28d..bd2fec6d460 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -162,6 +162,11 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	public $nbofopendirectdebitorcredittransfer;
 
+	/**
+	 * @var string[] return of getListIdAvoirFromInvoice()
+	 */
+	public $creditnotelist;
+
 	/**
 	 * @var int
 	 */
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index dab5dea6d6c..128694f0f0d 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1013,6 +1013,10 @@ class FactureFournisseur extends CommonInvoice
 
 				$this->socid  = $obj->socid;
 
+				if ($this->type != self::TYPE_CREDIT_NOTE) {
+					$this->creditnotelist = $this->getListIdAvoirFromInvoice();
+				}
+
 				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 39d971bba99..0ed41bb4682 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3339,13 +3339,12 @@ if ($action == 'create') {
 				}
 			}
 
-			$facidavoir = $object->getListIdAvoirFromInvoice();
-			if (count($facidavoir) > 0) {
+			if (!empty($object->creditnotelist)) {
 				$invoicecredits = array();
-				foreach ($facidavoir as $id) {
-					$facavoir = new FactureFournisseur($db);
-					$facavoir->fetch($id);
-					$invoicecredits[] = $facavoir->getNomUrl(1);
+				foreach ($object->creditnotelist as $invoiceid) {
+					$creditnote = new FactureFournisseur($db);
+					$creditnote->fetch($invoiceid);
+					$invoicecredits[] = $creditnote->getNomUrl(1);
 				}
 				print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits);
 				print '</span>';
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index d15646059f3..fe65695eb20 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -211,13 +211,12 @@ if ($id > 0 || !empty($ref)) {
 			print ' '.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1));
 		}
 
-		$facidavoir = $object->getListIdAvoirFromInvoice();
-		if (count($facidavoir) > 0) {
+		if (!empty($object->creditnotelist)) {
 			$invoicecredits = array();
-			foreach ($facidavoir as $facid) {
-				$facavoir = new FactureFournisseur($db);
-				$facavoir->fetch($facid);
-				$invoicecredits[] = $facavoir->getNomUrl(1);
+			foreach ($object->creditnotelist as $invoiceid) {
+				$creditnote = new FactureFournisseur($db);
+				$creditnote->fetch($invoiceid);
+				$invoicecredits[] = $creditnote->getNomUrl(1);
 			}
 			print ' '.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits);
 		}
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index ddbf73ccf39..d4f22a9a4f7 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -187,13 +187,12 @@ if ($object->id > 0) {
 		print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
 	}
 
-	$facidavoir = $object->getListIdAvoirFromInvoice();
-	if (count($facidavoir) > 0) {
+	if (!empty($object->creditnotelist)) {
 		$invoicecredits = array();
-		foreach ($facidavoir as $facid) {
-			$facavoir = new FactureFournisseur($db);
-			$facavoir->fetch($facid);
-			$invoicecredits[] = $facavoir->getNomUrl(1);
+		foreach ($object->creditnotelist as $invoiceid) {
+			$creditnote = new FactureFournisseur($db);
+			$creditnote->fetch($invoiceid);
+			$invoicecredits[] = $creditnote->getNomUrl(1);
 		}
 		print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')';
 	}
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 0f9d53b18d3..fb0f024afb6 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -169,13 +169,12 @@ if ($object->id > 0) {
 		print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
 	}
 
-	$facidavoir = $object->getListIdAvoirFromInvoice();
-	if (count($facidavoir) > 0) {
+	if (!empty($object->creditnotelist)) {
 		$invoicecredits = array();
-		foreach ($facidavoir as $facid) {
-			$facavoir = new FactureFournisseur($db);
-			$facavoir->fetch($facid);
-			$invoicecredits[] = $facavoir->getNomUrl(1);
+		foreach ($object->creditnotelist as $invoiceid) {
+			$creditnote = new FactureFournisseur($db);
+			$creditnote->fetch($invoiceid);
+			$invoicecredits[] = $creditnote->getNomUrl(1);
 		}
 		print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')';
 	}

From 313716a027bf41df0d00ea6cf5b608b93f11dba3 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sun, 19 Jan 2025 13:21:21 +0100
Subject: [PATCH 196/243] FIX syntax error

---
 htdocs/compta/facture/prelevement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index b9b060ccc96..fe3b93cc597 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -441,7 +441,7 @@ if ($object->id > 0) {
 
 	if (!empty($object->creditnotelist)) {
 		$invoicecredits = array();
-		foreach (!empty($object->creditnotelist) as $invoiceid) {
+		foreach ($object->creditnotelist as $invoiceid) {
 			if ($type == 'bank-transfer') {
 				$creditnote = new FactureFournisseur($db);
 			} else {

From 62b5964462185938af43bb0035fe771140aa1459 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sun, 19 Jan 2025 13:30:09 +0100
Subject: [PATCH 197/243] FIX wrong var type

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

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index bd2fec6d460..983c35512b8 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -163,7 +163,7 @@ abstract class CommonInvoice extends CommonObject
 	public $nbofopendirectdebitorcredittransfer;
 
 	/**
-	 * @var string[] return of getListIdAvoirFromInvoice()
+	 * @var int[] return of getListIdAvoirFromInvoice()
 	 */
 	public $creditnotelist;
 

From 0f83ffe24b14ab247736b5bfe42bdfeb7d6f6185 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sun, 19 Jan 2025 13:39:34 +0100
Subject: [PATCH 198/243] FIX phan error

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

diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 2a6447d6ca1..b8502557547 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -346,7 +346,7 @@ class SocieteAccount extends CommonObject
 	 * @param	string	$site			Site (example: 'stripe', '...')
 	 * @param	int		$status			Status (0=test, 1=live, -1=we don't mind)
 	 * @param	string	$site_account 	Value to use to identify with account to use on site when site can offer several accounts. For example: 'pk_live_123456' when using Stripe service.
-	 * @param	string	$fk_website		Id website
+	 * @param	int		$fk_website		Id website
 	 * @return	string					Stripe customer ref 'cu_xxxxxxxxxxxxx' or ''
 	 * @see getThirdPartyID()
 	 */

From 5dc07a805f3c60642357ba6a4c36fc444ac36419 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 14:15:45 +0100
Subject: [PATCH 199/243] Debug v21

---
 htdocs/fourn/paiement/document.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/fourn/paiement/document.php b/htdocs/fourn/paiement/document.php
index 09beeb47a0e..ef68272e1c8 100644
--- a/htdocs/fourn/paiement/document.php
+++ b/htdocs/fourn/paiement/document.php
@@ -178,6 +178,9 @@ if ($object->id > 0) {
 
 	print dol_get_fiche_end();
 
+	print '<br>';
+
+
 	$modulepart = 'supplier_payment';
 	// TODO: get the appropriate permission
 	$permissiontoadd = true;

From a13d88d179632b972edf92ecc7c47a0596f08477 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 14:57:07 +0100
Subject: [PATCH 200/243] Debug v22

---
 htdocs/compta/bank/annuel.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 28ad1b8081d..2f2d5bad823 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -76,8 +76,6 @@ if (!$year_start) {
  */
 $error = 0;
 
-$form = new Form($db);
-
 // Get account information
 $object = new Account($db);
 if ($id > 0 && !preg_match('/,/', $id)) {	// if for a particular account and not a list
@@ -186,7 +184,7 @@ if (!empty($id)) {
 print dol_get_fiche_end();
 
 $head = bank_report_prepare_head($object);
-print dol_get_fiche_head($head, 'annual', $langs->trans("FinancialAccount"), 0);
+print dol_get_fiche_head($head, 'annual', $langs->trans("FinancialAccount"), -1);
 
 // Affiche tableau
 print load_fiche_titre('', $link, '');
@@ -194,16 +192,16 @@ print load_fiche_titre('', $link, '');
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="noborder centpercent">';
 
-print '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Month").'</td>';
+print '<tr class="liste_titre"><td class="liste_titre borderrightlight">'.$langs->trans("Month").'</td>';
 for ($annee = $year_start; $annee <= $year_end; $annee++) {
 	print '<td align="center" width="20%" colspan="2" class="liste_titre borderrightlight">'.$annee.'</td>';
 }
 print '</tr>';
 
 print '<tr class="liste_titre">';
-print '<td class="liste_titre">&nbsp;</td>';
+print '<td class="liste_titre borderrightlight">&nbsp;</td>';
 for ($annee = $year_start; $annee <= $year_end; $annee++) {
-	print '<td class="liste_titre" align="center">'.$langs->trans("Debit").'</td><td class="liste_titre" align="center">'.$langs->trans("Credit").'</td>';
+	print '<td class="liste_titre center">'.$langs->trans("Debit").'</td><td class="liste_titre center borderrightlight">'.$langs->trans("Credit").'</td>';
 }
 print '</tr>';
 
@@ -214,7 +212,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++) {
 
 for ($mois = 1; $mois < 13; $mois++) {
 	print '<tr class="oddeven">';
-	print "<td>".dol_print_date(dol_mktime(1, 1, 1, $mois, 1, 2000), "%B")."</td>";
+	print '<td class="borderrightlight">'.dol_print_date(dol_mktime(1, 1, 1, $mois, 1, 2000), "%B")."</td>";
 
 	for ($annee = $year_start; $annee <= $year_end; $annee++) {
 		$case = sprintf("%04d-%02d", $annee, $mois);
@@ -237,10 +235,10 @@ for ($mois = 1; $mois < 13; $mois++) {
 }
 
 // Total debit-credit
-print '<tr class="liste_total"><td><b>'.$langs->trans("Total")."</b></td>";
+print '<tr class="liste_total"><td class="borderrightlight liste_total"><b>'.$langs->trans("Total")."</b></td>";
 for ($annee = $year_start; $annee <= $year_end; $annee++) {
-	print '<td class="right nowraponall"><b>'. (isset($totsorties[$annee]) ? price($totsorties[$annee]) : '') .'</b></td>';
-	print '<td class="right nowraponall"><b>'. (isset($totentrees[$annee]) ? price($totentrees[$annee]) : '') .'</b></td>';
+	print '<td class="right nowraponall liste_total"><b>'. (isset($totsorties[$annee]) ? price($totsorties[$annee]) : '') .'</b></td>';
+	print '<td class="right nowraponall liste_total borderrightlight"><b>'. (isset($totentrees[$annee]) ? price($totentrees[$annee]) : '') .'</b></td>';
 }
 print "</tr>\n";
 

From 74bfddeeab8eddd210db3e4b977ce5d58d4d5138 Mon Sep 17 00:00:00 2001
From: John BOTELLA <68917336+thersane-john@users.noreply.github.com>
Date: Sun, 19 Jan 2025 14:59:35 +0100
Subject: [PATCH 201/243] Fix supplier ref search

---
 htdocs/core/class/html.form.class.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a3787797c25..52ff50b6791 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2999,11 +2999,6 @@ class Form
 			$sql .= ' AND e.statut IN (' . $this->db->sanitize($this->db->escape(implode(',', $warehouseStatusArray))) . ')'; // Return line if product is inside the selected stock. If not, an empty line will be returned so we will count 0.
 		}
 
-		// include search in supplier ref
-		if (getDolGlobalString('MAIN_SEARCH_PRODUCT_BY_FOURN_REF')) {
-			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
-		}
-
 		//Price by customer
 		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') && !empty($socid)) {
 			$sql .= " LEFT JOIN  " . $this->db->prefix() . "product_customer_price as pcp ON pcp.fk_soc=" . ((int) $socid) . " AND pcp.fk_product=p.rowid";
@@ -3064,6 +3059,8 @@ class Form
 		$sql .= $hookmanager->resPrint;
 		// Add criteria on ref/label
 		if ($filterkey != '') {
+			$sqlSupplierSearch= '';
+
 			$sql .= ' AND (';
 			$prefix = !getDolGlobalString('PRODUCT_DONOTSEARCH_ANYWHERE') ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
 			// For natural search
@@ -3089,8 +3086,11 @@ class Form
 						$sql .= " OR pl.description LIKE '" . $this->db->escape($prefix . $crit) . "%'";
 					}
 				}
+
+				// include search in supplier ref
 				if (getDolGlobalString('MAIN_SEARCH_PRODUCT_BY_FOURN_REF')) {
-					$sql .= " OR pfp.ref_fourn LIKE '" . $this->db->escape($prefix . $crit) . "%'";
+					$sqlSupplierSearch .= !empty($sqlSupplierSearch) ? ' OR ':'';
+					$sqlSupplierSearch .= " pfp.ref_fourn LIKE '" . $this->db->escape($prefix . $crit) . "%'";
 				}
 				$sql .= ")";
 				$i++;
@@ -3101,6 +3101,12 @@ class Form
 			if (isModEnabled('barcode')) {
 				$sql .= " OR p.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";
 			}
+
+			// include search in supplier ref
+			if (getDolGlobalString('MAIN_SEARCH_PRODUCT_BY_FOURN_REF')) {
+				$sql .= ' OR EXISTS (SELECT pfp.fk_product FROM ' . $this->db->prefix() . 'product_fournisseur_price as pfp WHERE p.rowid = pfp.fk_product AND ('.$sqlSupplierSearch.') )';
+			}
+
 			$sql .= ')';
 		}
 		if (count($warehouseStatusArray)) {

From 9c5e0747c64c21365ed1bcfa11c087a6f3de1153 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 15:01:26 +0100
Subject: [PATCH 202/243] Fix change position of graph

---
 htdocs/compta/bank/annuel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 2f2d5bad823..fbab89d7e74 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -478,9 +478,9 @@ if ($result < 0) {
 	unset($tblyear[2]);
 
 	print '<div class="fichecenter"><div class="fichehalfleft"><div align="center">'; // do not use class="center" here, it will have no effect for the js graph inside.
-	print $show1;
+	print $show2;	// debit
 	print '</div></div><div class="fichehalfright"><div align="center">'; // do not use class="center" here, it will have no effect for the js graph inside.
-	print $show2;
+	print $show1;	// credit
 	print '</div></div></div>';
 	print '<div class="clearboth"></div>';
 }

From e239e2f29fa3ac903c50bb377f68f9fbcf218b8d Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 15:01:51 +0100
Subject: [PATCH 203/243] css

---
 htdocs/compta/bank/annuel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 8132b0729a7..c8979605118 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -153,7 +153,7 @@ if ($resql) {
 }
 
 
-// Onglets
+// Tabs tab / graph
 $head = bank_prepare_head($object);
 print dol_get_fiche_head($head, 'annual', $langs->trans("FinancialAccount"), 0, 'account');
 
@@ -194,7 +194,7 @@ print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Month").'</td>';
 for ($annee = $year_start; $annee <= $year_end; $annee++) {
-	print '<td align="center" width="20%" colspan="2" class="liste_titre borderrightlight">'.$annee.'</td>';
+	print '<td width="20%" colspan="2" class="liste_titre borderrightlight center">'.$annee.'</td>';
 }
 print '</tr>';
 

From 4ff29f3e76d5c1381a8ca5b3937e917ced8ce666 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 15:15:24 +0100
Subject: [PATCH 204/243] Fix position of columns

---
 htdocs/compta/bank/annuel.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index b9141ba9bb5..3da2f8f3671 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -320,7 +320,7 @@ if ($result < 0) {
 	$tblyear[2] = array();
 
 	for ($annee = 0; $annee < 3; $annee++) {
-		$sql = "SELECT date_format(b.datev,'%m')";
+		$sql = "SELECT date_format(b.datev, '%m')";
 		$sql .= ", SUM(b.amount)";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
@@ -332,7 +332,7 @@ if ($result < 0) {
 		if ($id && GETPOST("option") != 'all') {
 			$sql .= " AND b.fk_account IN (".$db->sanitize($id).")";
 		}
-		$sql .= " GROUP BY date_format(b.datev,'%m');";
+		$sql .= " GROUP BY date_format(b.datev, '%m');";
 
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -369,12 +369,12 @@ if ($result < 0) {
 	$title = $langs->transnoentities("Credit").' - '.$langs->transnoentities("Year").': '.($year - 2).' - '.($year - 1)." - ".$year;
 	$graph_datas = array();
 	for ($i = 0; $i < 12; $i++) {
-		$graph_datas[$i] = array($labels[$i], $data_year_0[$i], $data_year_1[$i], $data_year_2[$i]);
+		$graph_datas[$i] = array($labels[$i], $data_year_2[$i], $data_year_1[$i], $data_year_0[$i]);
 	}
 
 	$px1 = new DolGraph();
 	$px1->SetData($graph_datas);
-	$px1->SetLegend(array(($year), ($year - 1), ($year - 2)));
+	$px1->SetLegend(array(($year - 2), ($year - 1), $year));
 	$px1->SetLegendWidthMin(180);
 	$px1->SetMaxValue($px1->GetCeilMaxValue() < 0 ? 0 : $px1->GetCeilMaxValue());
 	$px1->SetMinValue($px1->GetFloorMinValue() > 0 ? 0 : $px1->GetFloorMinValue());
@@ -403,7 +403,7 @@ if ($result < 0) {
 	$tblyear[2] = array();
 
 	for ($annee = 0; $annee < 3; $annee++) {
-		$sql = "SELECT date_format(b.datev,'%m')";
+		$sql = "SELECT date_format(b.datev, '%m')";
 		$sql .= ", SUM(b.amount)";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
@@ -415,7 +415,7 @@ if ($result < 0) {
 		if ($id && GETPOST("option") != 'all') {
 			$sql .= " AND b.fk_account IN (".$db->sanitize($id).")";
 		}
-		$sql .= " GROUP BY date_format(b.datev,'%m');";
+		$sql .= " GROUP BY date_format(b.datev, '%m');";
 
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -431,6 +431,7 @@ if ($result < 0) {
 			dol_print_error($db);
 		}
 	}
+
 	// Chargement de labels et data_xxx pour tableau 4 Movements
 	$labels = array();
 	$data_year_0 = array();
@@ -450,12 +451,12 @@ if ($result < 0) {
 	$title = $langs->transnoentities("Debit").' - '.$langs->transnoentities("Year").': '.($year - 2).' - '.($year - 1)." - ".$year;
 	$graph_datas = array();
 	for ($i = 0; $i < 12; $i++) {
-		$graph_datas[$i] = array($labels[$i], $data_year_0[$i], $data_year_1[$i], $data_year_2[$i]);
+		$graph_datas[$i] = array($labels[$i], $data_year_2[$i], $data_year_1[$i], $data_year_0[$i]);
 	}
 
 	$px2 = new DolGraph();
 	$px2->SetData($graph_datas);
-	$px2->SetLegend(array(($year), ($year - 1), ($year - 2)));
+	$px2->SetLegend(array(($year - 2), ($year - 1), $year));
 	$px2->SetLegendWidthMin(180);
 	$px2->SetMaxValue($px2->GetCeilMaxValue() < 0 ? 0 : $px2->GetCeilMaxValue());
 	$px2->SetMinValue($px2->GetFloorMinValue() > 0 ? 0 : $px2->GetFloorMinValue());

From 03125565d56921dc82843feb4e98d273e7fe5465 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 15:43:04 +0100
Subject: [PATCH 205/243] Debug error message

---
 htdocs/accountancy/bookkeeping/card.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 0da31291160..aa5709bdf14 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -248,12 +248,11 @@ if (empty($reshook)) {
 
 		$result = $object->fetch($id, null, $mode);
 		$piece_num = (int) $object->piece_num;
-
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 
 			$action = 'create';
-		} else {
+		} elseif ($result > 0) {
 			$result = $object->delete($user, 0, $mode);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -980,7 +979,7 @@ if ($action == 'create') {
 			print '</form>';
 		}
 	} else {
-		print load_fiche_titre($langs->trans("NoRecords"));
+		print $langs->trans("NoRecordFound");
 	}
 }
 

From 8bf02f0d832fc2ed648cc964873573815d285886 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 15:43:04 +0100
Subject: [PATCH 206/243] Debug error message

---
 htdocs/accountancy/bookkeeping/card.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 0da31291160..aa5709bdf14 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -248,12 +248,11 @@ if (empty($reshook)) {
 
 		$result = $object->fetch($id, null, $mode);
 		$piece_num = (int) $object->piece_num;
-
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 
 			$action = 'create';
-		} else {
+		} elseif ($result > 0) {
 			$result = $object->delete($user, 0, $mode);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -980,7 +979,7 @@ if ($action == 'create') {
 			print '</form>';
 		}
 	} else {
-		print load_fiche_titre($langs->trans("NoRecords"));
+		print $langs->trans("NoRecordFound");
 	}
 }
 

From 38da2a61e4a7f2f10ce9577bc4274ff106f2ad91 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 17:38:34 +0100
Subject: [PATCH 207/243] Clean code

---
 htdocs/commande/class/commande.class.php | 124 ++---------------------
 1 file changed, 8 insertions(+), 116 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 392382ce3d4..474c50a7ff7 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -534,7 +534,7 @@ class Commande extends CommonOrder
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " SET ref = '".$this->db->escape($num)."',";
 		$sql .= " fk_statut = ".self::STATUS_VALIDATED.",";
-		$sql .= " date_valid='".$this->db->idate($now)."',";
+		$sql .= " date_valid = '".$this->db->idate($now)."',";
 		$sql .= " fk_user_valid = ".($user->id > 0 ? (int) $user->id : "null").",";
 		$sql .= " fk_user_modif = ".((int) $user->id);
 		$sql .= " WHERE rowid = ".((int) $this->id);
@@ -655,7 +655,7 @@ class Commande extends CommonOrder
 	public function setDraft($user, $idwarehouse = -1)
 	{
 		//phpcs:enable
-		global $conf, $langs;
+		global $langs;
 
 		$error = 0;
 
@@ -1234,7 +1234,7 @@ class Commande extends CommonOrder
 	 */
 	public function createFromClone(User $user, $socid = 0)
 	{
-		global $conf, $user, $hookmanager;
+		global $user, $hookmanager;
 
 		$error = 0;
 
@@ -1537,7 +1537,7 @@ class Commande extends CommonOrder
 	 */
 	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $info_bits = 0, $fk_remise_except = 0, $price_base_type = 'HT', $pu_ttc = 0, $date_start = '', $date_end = '', $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $array_options = array(), $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $ref_ext = '', $noupdateafterinsertline = 0)
 	{
-		global $mysoc, $conf, $langs, $user;
+		global $mysoc, $langs, $user;
 
 		$logtext = "::addline commandeid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent";
 		$logtext .= ", info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start";
@@ -1910,16 +1910,16 @@ class Commande extends CommonOrder
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
 
 		if ($id) {
-			$sql .= " WHERE c.rowid=".((int) $id);
+			$sql .= " WHERE c.rowid = ".((int) $id);
 		} else {
 			$sql .= " WHERE c.entity IN (".getEntity('commande').")"; // Don't use entity if you use rowid
 		}
 
 		if ($ref) {
-			$sql .= " AND c.ref='".$this->db->escape($ref)."'";
+			$sql .= " AND c.ref = '".$this->db->escape($ref)."'";
 		}
 		if ($ref_ext) {
-			$sql .= " AND c.ref_ext='".$this->db->escape($ref_ext)."'";
+			$sql .= " AND c.ref_ext = '".$this->db->escape($ref_ext)."'";
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -2372,45 +2372,6 @@ class Commande extends CommonOrder
 		return 0;
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *	Return a array with the pending stock by product
-	 *
-	 *	@param      int		$filtre_statut      Filtre sur statut
-	 *	@return     int                 		0 si OK, <0 si KO
-	 *
-	 *	TODO		FONCTION NON FINIE A FINIR
-	 */
-	/*public function stock_array($filtre_statut = self::STATUS_CANCELED)
-	{
-		// phpcs:enable
-		$this->stocks = array();
-
-		// Tableau des id de produit de la commande
-		$array_of_product = array();
-
-		// Recherche total en stock pour chaque produit
-		// TODO $array_of_product est défini vide juste au dessus !!
-		if (count($array_of_product)) {
-			$sql = "SELECT fk_product, sum(ps.reel) as total";
-			$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
-			$sql .= " WHERE ps.fk_product IN (".$this->db->sanitize(join(',', $array_of_product)).")";
-			$sql .= ' GROUP BY fk_product';
-			$resql = $this->db->query($sql);
-			if ($resql) {
-				$num = $this->db->num_rows($resql);
-				$i = 0;
-				while ($i < $num) {
-					$obj = $this->db->fetch_object($resql);
-					$this->stocks[$obj->fk_product] = $obj->total;
-					$i++;
-				}
-				$this->db->free($resql);
-			}
-		}
-		return 0;
-	}*/
-
 	/**
 	 *  Delete an order line
 	 *
@@ -2544,73 +2505,6 @@ class Commande extends CommonOrder
 	}
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * 		Set a fixed amount discount
-	 *
-	 * 		@param     	User		$user 		User qui positionne la remise
-	 * 		@param     	float		$remise		Discount
-	 * 		@param     	int			$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *		@return		int 					Return integer <0 if KO, >0 if OK
-	 */
-	/*
-	public function set_remise_absolue($user, $remise, $notrigger = 0)
-	{
-		// phpcs:enable
-		if (empty($remise)) {
-			$remise = 0;
-		}
-
-		$remise = price2num($remise);
-
-		if ($user->hasRight('commande', 'creer')) {
-			$error = 0;
-
-			$this->db->begin();
-
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' SET remise_absolue = '.((float) $remise);
-			$sql .= ' WHERE rowid = '.((int) $this->id).' AND fk_statut = '.self::STATUS_DRAFT;
-
-			dol_syslog(__METHOD__, LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$this->errors[] = $this->db->error();
-				$error++;
-			}
-
-			if (!$error) {
-				$this->oldcopy = clone $this;
-				$this->remise_absolue = $remise;
-				$this->update_price(1);
-			}
-
-			if (!$notrigger && empty($error)) {
-				// Call trigger
-				$result = $this->call_trigger('ORDER_MODIFY', $user);
-				if ($result < 0) {
-					$error++;
-				}
-				// End call triggers
-			}
-
-			if (!$error) {
-				$this->db->commit();
-				return 1;
-			} else {
-				foreach ($this->errors as $errmsg) {
-					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-				}
-				$this->db->rollback();
-				return -1 * $error;
-			}
-		}
-
-		return 0;
-	}
-	*/
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set the order date
@@ -3138,7 +3032,7 @@ class Commande extends CommonOrder
 	 */
 	public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $price_base_type = 'HT', $info_bits = 0, $date_start = '', $date_end = '', $type = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = array(), $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0, $ref_ext = '', $rang = 0)
 	{
-		global $conf, $mysoc, $langs, $user;
+		global $mysoc, $langs, $user;
 
 		dol_syslog(get_class($this)."::updateline id=$rowid, desc=$desc, pu=$pu, qty=$qty, remise_percent=$remise_percent, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, price_base_type=$price_base_type, info_bits=$info_bits, date_start=$date_start, date_end=$date_end, type=$type, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, special_code=$special_code, ref_ext=$ref_ext");
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@@ -3350,8 +3244,6 @@ class Commande extends CommonOrder
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
-		global $conf;
-
 		$error = 0;
 
 		// Clean parameters

From 4538c8935a23f9f7c4309ae5e8b9ec11df1be53a Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 19:05:01 +0100
Subject: [PATCH 208/243] Debug v21 - The cachedelay was wrong

---
 htdocs/website/index.php           | 2 +-
 htdocs/website/samples/wrapper.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 7a8acf4e21b..bb683e00854 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -4149,7 +4149,7 @@ if ($action == 'editcss') {
 	$htmlhelp = $langs->trans('RSSFeedDesc');
 	print $form->textwithpicto($langs->trans('RSSFeed'), $htmlhelp, 1, 'help', '', 0, 2, '');
 	print '</td><td>';
-	print '/wrapper.php?rss=1[&l=XX][&limit=123]';
+	print '/wrapper.php?rss=1[&l=XX][&limit=99][&cachedelay=99]';
 	print '</td></tr>';
 
 	print '</table>';
diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index f7127a3d815..abcea982bcc 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -35,6 +35,7 @@ $entity = GETPOSTINT('entity') ? GETPOSTINT('entity') : $conf->entity;
 $original_file = GETPOST("file", "alpha");
 $l = GETPOST('l', 'aZ09');
 $limit = GETPOSTINT('limit');
+$cachedelay = GETPOSTINT('cachedelay');		// The delay in second of the cache
 
 // Parameters for RSS
 $rss = GETPOST('rss', 'aZ09');
@@ -115,7 +116,6 @@ $refname = basename(dirname($original_file)."/");
 if ($rss) {
 	$format = 'rss';
 	$type = '';
-	$cachedelay = 0;
 	$filename = $original_file;
 	$dir_temp = $conf->website->dir_temp;
 

From 88bb2cbd44cd9f9d56f2d0e21b5c4d53b7b56c44 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 19:50:52 +0100
Subject: [PATCH 209/243] Cache management implementation not finished

---
 htdocs/core/lib/website.lib.php | 56 +++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 8c6673a2bbc..2de1a8e1bd9 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -593,14 +593,15 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 
 
 /**
- * Clean an HTML page to report only content, so we can include it into another page.
- * It outputs content of file sanitized from html and body part.
+ * Execute content of a php page and report result to be included into another page.
+ * It outputs content of file where the html and body part have been removed.
  *
  * @param 	string	$containerref		Path to file to include (must be a page from website root. Example: 'mypage.php' means 'mywebsite/mypage.php')
  * @param 	int		$once				If set to 1, we use include_once.
+ * @param	int		$cachedelay			A cache delay in seconds.
  * @return  void
  */
-function includeContainer($containerref, $once = 0)
+function includeContainer($containerref, $once = 0, $cachedelay = 0)
 {
 	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running included containers.
 	global $includehtmlcontentopened;
@@ -614,6 +615,11 @@ function includeContainer($containerref, $once = 0)
 	}
 
 	$fullpathfile = DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$websitekey.'/'.$containerref;
+	$fullpathcache = '';
+	// If we ask to use the cache delay
+	if ($cachedelay > 0 && !getDolGlobalString("WEBSITE_DISABLE_CACHE_OF_CONTAINERS")) {
+		$fullpathcache = DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/temp/'.$websitekey.'-'.$websitepage->id.'-'.$containerref.'cache';
+	}
 
 	if (empty($includehtmlcontentopened)) {
 		$includehtmlcontentopened = 0;
@@ -626,27 +632,43 @@ function includeContainer($containerref, $once = 0)
 
 	//dol_syslog("Include container ".$containerref.' includehtmlcontentopened='.$includehtmlcontentopened);
 
-	// file_get_contents is not possible. We must execute code with include
+	// We don't print info messages for pages of type library or service
+	if (!empty($websitepage->type_container) && !in_array($websitepage->type_container, array('library', 'service'))) {
+		print "\n".'<!-- include '.$websitekey.'/'.$containerref.(is_object($websitepage) ? ' parent id='.$websitepage->id : '').' level='.$includehtmlcontentopened.' -->'."\n";
+	}
+
+	$tmpoutput = '';
+
+	if ($fullpathcache) {
+		// TODO Cache management
+		//$tmpoutput = file_get_contents($fullpathcache);
+	}
+
+	// file_get_contents is not possible because we must execute code with include
 	//$content = file_get_contents($fullpathfile);
 	//print preg_replace(array('/^.*<body[^>]*>/ims','/<\/body>.*$/ims'), array('', ''), $content);*/
 
-	ob_start();
-	if ($once) {
-		$res = @include_once $fullpathfile;
-	} else {
-		$res = @include $fullpathfile;
-	}
-	$tmpoutput = ob_get_contents();
-	ob_end_clean();
+	if (empty($tmpoutput)) {
+		ob_start();
+		if ($once) {
+			$res = @include_once $fullpathfile;
+		} else {
+			$res = @include $fullpathfile;
+		}
+		$tmpoutput = ob_get_contents();
+		ob_end_clean();
 
-	// We don't print info messages for pages of type library or service
-	if (!empty($websitepage->type_container) && !in_array($websitepage->type_container, array('library', 'service'))) {
-		print "\n".'<!-- include '.$websitekey.'/'.$containerref.(is_object($websitepage) ? ' parent id='.$websitepage->id : '').' level = '.$includehtmlcontentopened.' -->'."\n";
+		print preg_replace(array('/^.*<body[^>]*>/ims', '/<\/body>.*$/ims'), array('', ''), $tmpoutput);
+
+		// Save the content into cache file
+		if ($fullpathcache) {
+			file_put_contents($fullpathcache, $tmpoutput);
+			dolChmod($fullpathcache);
+		}
 	}
-	print preg_replace(array('/^.*<body[^>]*>/ims', '/<\/body>.*$/ims'), array('', ''), $tmpoutput);
 
 	if (!$res) {
-		print 'ERROR: FAILED TO INCLUDE PAGE '.$containerref.".\n";
+		print 'ERROR: FAILED TO INCLUDE PAGE '.$containerref."(once=".$once.")\n";
 	}
 
 	$includehtmlcontentopened--;

From 2db62b7e8076145e45ebeab31f664b94ece111a9 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 20:56:16 +0100
Subject: [PATCH 210/243] Fix cache management

---
 htdocs/core/lib/website.lib.php | 35 ++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 2de1a8e1bd9..08d284e5a3d 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -618,7 +618,7 @@ function includeContainer($containerref, $once = 0, $cachedelay = 0)
 	$fullpathcache = '';
 	// If we ask to use the cache delay
 	if ($cachedelay > 0 && !getDolGlobalString("WEBSITE_DISABLE_CACHE_OF_CONTAINERS")) {
-		$fullpathcache = DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/temp/'.$websitekey.'-'.$websitepage->id.'-'.$containerref.'cache';
+		$fullpathcache = DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/temp/'.$websitekey.'-'.$websitepage->id.'-'.$containerref.'.cache';
 	}
 
 	if (empty($includehtmlcontentopened)) {
@@ -639,16 +639,27 @@ function includeContainer($containerref, $once = 0, $cachedelay = 0)
 
 	$tmpoutput = '';
 
-	if ($fullpathcache) {
-		// TODO Cache management
-		//$tmpoutput = file_get_contents($fullpathcache);
+	if ($cachedelay > 0 && $fullpathcache) {
+		if (is_file($fullpathcache)) {
+			// Get the last modification time of the file
+				$lastModifiedTime = dol_filemtime($fullpathcache);
+
+				// Get the current time
+				$currentTime = time();
+
+				// Check if the file is not older than X seconds
+			if (($currentTime - $lastModifiedTime) <= $cachedelay) {
+				// The file is too recent
+				$tmpoutput = file_get_contents($fullpathcache);
+			}
+		}
 	}
 
-	// file_get_contents is not possible because we must execute code with include
-	//$content = file_get_contents($fullpathfile);
-	//print preg_replace(array('/^.*<body[^>]*>/ims','/<\/body>.*$/ims'), array('', ''), $content);*/
-
 	if (empty($tmpoutput)) {
+		// file_get_contents is not possible because we must execute code with include
+		//$content = file_get_contents($fullpathfile);
+		//print preg_replace(array('/^.*<body[^>]*>/ims','/<\/body>.*$/ims'), array('', ''), $content);*/
+
 		ob_start();
 		if ($once) {
 			$res = @include_once $fullpathfile;
@@ -658,13 +669,15 @@ function includeContainer($containerref, $once = 0, $cachedelay = 0)
 		$tmpoutput = ob_get_contents();
 		ob_end_clean();
 
-		print preg_replace(array('/^.*<body[^>]*>/ims', '/<\/body>.*$/ims'), array('', ''), $tmpoutput);
+		$tmpoutput = preg_replace(array('/^.*<body[^>]*>/ims', '/<\/body>.*$/ims'), array('', ''), $tmpoutput);
 
-		// Save the content into cache file
-		if ($fullpathcache) {
+		// Save the content into cache file if content is lower than 10M
+		if ($fullpathcache && strlen($tmpoutput) < 10000000) {
 			file_put_contents($fullpathcache, $tmpoutput);
 			dolChmod($fullpathcache);
 		}
+
+		return $tmpoutput;
 	}
 
 	if (!$res) {

From 0d5231f095782b9651dc344e5ececd267b0f0c62 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 21:05:50 +0100
Subject: [PATCH 211/243] Fix cache management

---
 htdocs/core/lib/website.lib.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 08d284e5a3d..13329e30f58 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -642,12 +642,12 @@ function includeContainer($containerref, $once = 0, $cachedelay = 0)
 	if ($cachedelay > 0 && $fullpathcache) {
 		if (is_file($fullpathcache)) {
 			// Get the last modification time of the file
-				$lastModifiedTime = dol_filemtime($fullpathcache);
+			$lastModifiedTime = filemtime($fullpathcache);
 
-				// Get the current time
-				$currentTime = time();
+			// Get the current time
+			$currentTime = time();
 
-				// Check if the file is not older than X seconds
+			// Check if the file is not older than X seconds
 			if (($currentTime - $lastModifiedTime) <= $cachedelay) {
 				// The file is too recent
 				$tmpoutput = file_get_contents($fullpathcache);

From 14c53297ce9a40f306a7300b70adbed7048ffe8f Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 21:09:23 +0100
Subject: [PATCH 212/243] Fix regression

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

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 13329e30f58..948754ec57a 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -677,7 +677,7 @@ function includeContainer($containerref, $once = 0, $cachedelay = 0)
 			dolChmod($fullpathcache);
 		}
 
-		return $tmpoutput;
+		print $tmpoutput;
 	}
 
 	if (!$res) {

From cb03e317ec5a4af71d3b216f0772069b9f17d2a0 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 21:09:23 +0100
Subject: [PATCH 213/243] Fix regression

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

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 13329e30f58..948754ec57a 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -677,7 +677,7 @@ function includeContainer($containerref, $once = 0, $cachedelay = 0)
 			dolChmod($fullpathcache);
 		}
 
-		return $tmpoutput;
+		print $tmpoutput;
 	}
 
 	if (!$res) {

From 42e6d4661f4e1bf48b97a731539b007974f74bd5 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 21:10:25 +0100
Subject: [PATCH 214/243] Fix regression

---
 htdocs/core/lib/website.lib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 948754ec57a..0b3a20084e2 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -678,10 +678,10 @@ function includeContainer($containerref, $once = 0, $cachedelay = 0)
 		}
 
 		print $tmpoutput;
-	}
 
-	if (!$res) {
-		print 'ERROR: FAILED TO INCLUDE PAGE '.$containerref."(once=".$once.")\n";
+		if (!$res) {
+			print 'ERROR: FAILED TO INCLUDE PAGE '.$containerref."(once=".$once.")\n";
+		}
 	}
 
 	$includehtmlcontentopened--;

From d314c1e3d60018ab932668bfb79166f3d02773a8 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 21:25:55 +0100
Subject: [PATCH 215/243] Fix cache file for rss

---
 htdocs/website/samples/wrapper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index abcea982bcc..25eea31f189 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -40,7 +40,7 @@ $cachedelay = GETPOSTINT('cachedelay');		// The delay in second of the cache
 // Parameters for RSS
 $rss = GETPOST('rss', 'aZ09');
 if ($rss) {
-	$original_file = 'blog.rss';
+	$original_file = 'blog-'.$websitekey.'.rss.cache';
 }
 
 // If we have a hash public (hashp), we guess the original_file.

From 47a2162b885c80a0e38023e8327ac4e2f3b46b9c Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 21:35:21 +0100
Subject: [PATCH 216/243] Fix cache file

---
 htdocs/website/samples/wrapper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index 25eea31f189..524591e241c 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -40,7 +40,7 @@ $cachedelay = GETPOSTINT('cachedelay');		// The delay in second of the cache
 // Parameters for RSS
 $rss = GETPOST('rss', 'aZ09');
 if ($rss) {
-	$original_file = 'blog-'.$websitekey.'.rss.cache';
+	$original_file = 'blog'.(($limit > 0 && $limit <= 100) ? '-'.$limit : '').(preg_match('/^[a-z][a-z](_[A-Z][A-Z])?$/', $l) ? '-'.$l : '').'-'.$websitekey.'.rss.cache';
 }
 
 // If we have a hash public (hashp), we guess the original_file.

From f563ae7aafd306898d7cd4e8d237ffb6b513dd72 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 21:40:23 +0100
Subject: [PATCH 217/243] Fix limit

---
 htdocs/website/samples/wrapper.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index 524591e241c..fe55987a77a 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -35,6 +35,9 @@ $entity = GETPOSTINT('entity') ? GETPOSTINT('entity') : $conf->entity;
 $original_file = GETPOST("file", "alpha");
 $l = GETPOST('l', 'aZ09');
 $limit = GETPOSTINT('limit');
+if ($limit <= 0 || $limit > 100) {
+	$limit = 20;
+}
 $cachedelay = GETPOSTINT('cachedelay');		// The delay in second of the cache
 
 // Parameters for RSS
@@ -131,7 +134,7 @@ if ($rss) {
 		$filters['lang'] = $l;
 	}
 
-	$MAXNEWS = ($limit ? $limit : 20);
+	$MAXNEWS = $limit;
 	$arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', $MAXNEWS, 0, $filters);
 	$eventarray = array();
 	if (is_array($arrayofblogs)) {

From 4087afb8948277feadf90eb284cf83bda038d3ad Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 21:50:58 +0100
Subject: [PATCH 218/243] Fix another try to fix the cache pb

---
 htdocs/core/lib/website.lib.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 0b3a20084e2..845db06e602 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -669,21 +669,21 @@ function includeContainer($containerref, $once = 0, $cachedelay = 0)
 		$tmpoutput = ob_get_contents();
 		ob_end_clean();
 
-		$tmpoutput = preg_replace(array('/^.*<body[^>]*>/ims', '/<\/body>.*$/ims'), array('', ''), $tmpoutput);
-
-		// Save the content into cache file if content is lower than 10M
-		if ($fullpathcache && strlen($tmpoutput) < 10000000) {
-			file_put_contents($fullpathcache, $tmpoutput);
-			dolChmod($fullpathcache);
-		}
-
-		print $tmpoutput;
-
 		if (!$res) {
 			print 'ERROR: FAILED TO INCLUDE PAGE '.$containerref."(once=".$once.")\n";
+		} else {
+			$tmpoutput = preg_replace(array('/^.*<body[^>]*>/ims', '/<\/body>.*$/ims'), array('', ''), $tmpoutput);
+
+			// Save the content into cache file if content is lower than 10M
+			if ($fullpathcache && strlen($tmpoutput) < 10000000) {
+				file_put_contents($fullpathcache, $tmpoutput);
+				dolChmod($fullpathcache);
+			}
 		}
 	}
 
+	print $tmpoutput;
+
 	$includehtmlcontentopened--;
 }
 

From 1d373a4ae51cb1311105b29c65205569d1e86093 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 21:56:54 +0100
Subject: [PATCH 219/243] Fix missing deletion of cache files

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

diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 66f3da97ced..98fe79aa763 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -1526,6 +1526,10 @@ class Website extends CommonObject
 			dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object);	// This includes also a version of index.php into sublanguage directories
 		}
 
+		// Erase cache files
+		$filecacheglob = $conf->website->dir_output.'/temp/'.$object->ref.'-*.php.cache';
+		dol_delete_file($filecacheglob, 0, 1, 1, null, false, 0, 1);
+
 		if ($error) {
 			return -1;
 		} else {

From cce24b50455e823b5fe0d84563461d8724a4c673 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 19 Jan 2025 23:19:05 +0100
Subject: [PATCH 220/243] Debug v21

---
 htdocs/projet/tasks/time.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 85387794588..e72ccc48706 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -2342,7 +2342,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			if (!empty($arrayfields['t.note']['checked'])) {
 				if ($action == 'editline' && GETPOSTINT('lineid') == $task_time->rowid) {
 					print '<td class="small">';
-					print '<textarea name="timespent_note_line" width="95%" rows="' . ROWS_1 . '">' . dol_escape_htmltag($task_time->note, 0, 1) . '</textarea>';
+					print '<textarea name="timespent_note_line" width="95%" rows="' . ROWS_2 . '">' . dol_escape_htmltag($task_time->note, 0, 1) . '</textarea>';
 					print '</td>';
 				} else {
 					print '<td class="small tdoverflowmax150 classfortooltip" title="'.dol_string_onlythesehtmltags(dol_htmlentitiesbr($task_time->note)).'">';
@@ -2643,13 +2643,13 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				if (!empty($arrayfields['t.note']['checked'])) {
 					print '<td class="tdoverflowmax300">';
 					if ($action == 'splitline' && GETPOSTINT('lineid') == $task_time->rowid) {
-						print '<textarea name="timespent_note_line" width="95%" rows="' . ROWS_1 . '">' . dol_escape_htmltag($task_time->note, 0, 1) . '</textarea>';
+						print '<textarea name="timespent_note_line" width="95%" rows="' . ROWS_2 . '">' . dol_escape_htmltag($task_time->note, 0, 1) . '</textarea>';
 					} else {
 						print dol_nl2br($task_time->note);
 					}
 					print '</td>';
 				} elseif ($action == 'splitline' && GETPOSTINT('lineid') == $task_time->rowid) {
-					print '<input type="hidden" name="timespent_note_line" rows="' . ROWS_1 . '" value="' . dol_escape_htmltag($task_time->note, 0, 1) . '">';
+					print '<input type="hidden" name="timespent_note_line" rows="' . ROWS_2 . '" value="' . dol_escape_htmltag($task_time->note, 0, 1) . '">';
 				}
 
 				// Time spent
@@ -2808,7 +2808,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				if (!empty($arrayfields['t.note']['checked'])) {
 					print '<td class="small tdoverflowmax300"">';
 					if ($action == 'splitline' && GETPOSTINT('lineid') == $task_time->rowid) {
-						print '<textarea name="timespent_note_line_2" width="95%" rows="' . ROWS_1 . '">' . dol_escape_htmltag($task_time->note, 0, 1) . '</textarea>';
+						print '<textarea name="timespent_note_line_2" width="95%" rows="' . ROWS_2 . '">' . dol_escape_htmltag($task_time->note, 0, 1) . '</textarea>';
 					} else {
 						print dol_nl2br($task_time->note);
 					}

From 162878ecf4598eb9f061db7cbbb8dffe61209ac6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 20 Jan 2025 00:44:02 +0100
Subject: [PATCH 221/243] Fix phpunit

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

diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 2a6447d6ca1..b8502557547 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -346,7 +346,7 @@ class SocieteAccount extends CommonObject
 	 * @param	string	$site			Site (example: 'stripe', '...')
 	 * @param	int		$status			Status (0=test, 1=live, -1=we don't mind)
 	 * @param	string	$site_account 	Value to use to identify with account to use on site when site can offer several accounts. For example: 'pk_live_123456' when using Stripe service.
-	 * @param	string	$fk_website		Id website
+	 * @param	int		$fk_website		Id website
 	 * @return	string					Stripe customer ref 'cu_xxxxxxxxxxxxx' or ''
 	 * @see getThirdPartyID()
 	 */

From ff6cafd4954b8ed01ed81e9fcd0eca9978d3d4cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 20 Jan 2025 00:56:26 +0100
Subject: [PATCH 222/243] Fix yaml ci syntax

---
 .github/workflows/pre-commit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index ea75985f83f..82d2d9ad068 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -67,7 +67,7 @@ jobs:
 
       - name: Setup PHPCS
         uses: shivammathur/setup-php@v2
-		# Install proper php version, and also install phpcs which may be needed
+        # Install proper php version, and also install phpcs which may be needed
         if: |
           ! cancelled() &&
           (

From 8d3e7bfc6d5bcdefd7d36ce6a228d6cd5de2b0ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 20 Jan 2025 02:31:41 +0100
Subject: [PATCH 223/243] Fix phpunit

---
 htdocs/website/samples/wrapper.php | 74 +++++++++++++++---------------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index fe55987a77a..5d32d0e23ca 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -208,45 +208,43 @@ if ($rss) {
 		}
 	}
 
-	if ($result >= 0) {
-		$attachment = false;
-		if (GETPOSTISSET("attachment")) {
-			$attachment = GETPOST("attachment");
-		}
-		//$attachment = false;
-		$contenttype = 'application/rss+xml';
-		if (GETPOSTISSET("contenttype")) {
-			$contenttype = GETPOST("contenttype");
-		}
-		//$contenttype='text/plain';
-		$outputencoding = 'UTF-8';
-
-		if ($contenttype) {
-			header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
-		}
-		if ($attachment) {
-			header('Content-Disposition: attachment; filename="'.$filename.'"');
-		}
-
-		// Ajout directives pour resoudre bug IE
-		//header('Cache-Control: Public, must-revalidate');
-		//header('Pragma: public');
-		if ($cachedelay) {
-			header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
-		} else {
-			header('Cache-Control: private, must-revalidate');
-		}
-
-		// Clean parameters
-		$outputfile = $dir_temp.'/'.$filename;
-		$result = readfile($outputfile);
-		if (!$result) {
-			print 'File '.$outputfile.' was empty.';
-		}
-
-		// header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
-		exit;
+	$attachment = false;
+	if (GETPOSTISSET("attachment")) {
+		$attachment = GETPOST("attachment");
 	}
+	//$attachment = false;
+	$contenttype = 'application/rss+xml';
+	if (GETPOSTISSET("contenttype")) {
+		$contenttype = GETPOST("contenttype");
+	}
+	//$contenttype='text/plain';
+	$outputencoding = 'UTF-8';
+
+	if ($contenttype) {
+		header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
+	}
+	if ($attachment) {
+		header('Content-Disposition: attachment; filename="'.$filename.'"');
+	}
+
+	// Ajout directives pour resoudre bug IE
+	//header('Cache-Control: Public, must-revalidate');
+	//header('Pragma: public');
+	if ($cachedelay) {
+		header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
+	} else {
+		header('Cache-Control: private, must-revalidate');
+	}
+
+	// Clean parameters
+	$outputfile = $dir_temp.'/'.$filename;
+	$result = readfile($outputfile);
+	if (!$result) {
+		print 'File '.$outputfile.' was empty.';
+	}
+
+	// header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
+	exit;
 } elseif ($modulepart == "mycompany" && preg_match('/^\/?logos\//', $original_file)) {
 	// Get logos
 	readfile(dol_osencode($conf->mycompany->dir_output."/".$original_file));

From 35a07af56bf88928f718a4282378997593f085fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Jan 2025 03:14:47 +0100
Subject: [PATCH 224/243] Update html.form.class.php

---
 htdocs/core/class/html.form.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 52ff50b6791..a3b36ddd962 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3104,7 +3104,10 @@ class Form
 
 			// include search in supplier ref
 			if (getDolGlobalString('MAIN_SEARCH_PRODUCT_BY_FOURN_REF')) {
-				$sql .= ' OR EXISTS (SELECT pfp.fk_product FROM ' . $this->db->prefix() . 'product_fournisseur_price as pfp WHERE p.rowid = pfp.fk_product AND ('.$sqlSupplierSearch.') )';
+				$sql .= " OR EXISTS (SELECT pfp.fk_product FROM " . $this->db->prefix() . "product_fournisseur_price as pfp WHERE p.rowid = pfp.fk_product";
+				$sql .= " AND (";
+				$sql .= $sqlSupplierSearch;
+				$sql .= "))";
 			}
 
 			$sql .= ')';

From 67521e9c4ff8a2a8bfcd0d05d82c26bb98e30f2e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 20 Jan 2025 03:54:04 +0100
Subject: [PATCH 225/243] Clean code

---
 htdocs/admin/external_rss.php                 |  2 +-
 htdocs/comm/contact.php                       |  2 +-
 htdocs/commande/customer.php                  |  2 +-
 htdocs/core/boxes/box_fediverse.php           |  2 +-
 htdocs/core/lib/functions.lib.php             | 24 +++++++++----------
 htdocs/core/lib/functions2.lib.php            | 17 +++++++------
 htdocs/core/modules/DolibarrModules.class.php |  4 ++--
 .../modules/societe/mod_codeclient_monkey.php |  4 ++--
 htdocs/cron/list.php                          |  2 +-
 .../class/emailcollector.class.php            |  2 +-
 .../class/conferenceorbooth.class.php         | 10 ++++----
 htdocs/exports/class/export.class.php         |  4 ++--
 htdocs/fourn/contact.php                      | 13 +++++-----
 htdocs/install/repair.php                     |  2 +-
 htdocs/mrp/class/moline.class.php             |  6 ++---
 .../class/productcustomerprice.class.php      |  6 ++---
 .../class/productfournisseurprice.class.php   |  8 +++----
 htdocs/societe/consumption.php                |  2 +-
 htdocs/ticket/class/ticket.class.php          |  2 +-
 htdocs/website/class/website.class.php        |  2 +-
 20 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 2b94e599a2c..991a0553406 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -92,7 +92,7 @@ if ($action == 'add' || GETPOST("modify")) {
 			// Supprime boite box_external_rss de definition des boites
 			/* $sql = "UPDATE ".MAIN_DB_PREFIX."boxes_def";
 			$sql.= " SET name = '".$db->escape($boxlabel)."'";
-			$sql.= " WHERE file ='box_external_rss.php' AND note like '".$db->escape(GETPOST("norss"))." %'";
+			$sql.= " WHERE file ='box_external_rss.php' AND note LIKE '".$db->escape(GETPOST("norss"))." %'";
 
 			$resql=$db->query($sql);
 			if (! $resql)
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 28d10fd9644..6b05f59a921 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -120,7 +120,7 @@ if (!empty($search_company)) {
 	$sql .= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
 }
 if (!empty($contactname)) { // access a partir du module de recherche
-	$sql .= " AND (p.lastname LIKE '%".$db->escape($contactname)."%' OR lower(p.firstname) LIKE '%".$db->escape($contactname)."%') ";
+	$sql .= " AND (p.lastname LIKE '%".$db->escape($contactname)."%' OR p.firstname LIKE '%".$db->escape($contactname)."%') ";
 	$sortfield = "p.lastname";
 	$sortorder = "ASC";
 }
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index f06ac75dcc9..843a55e0112 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -101,7 +101,7 @@ if (GETPOST("search_code_client")) {
 	$sql .= natural_search("s.code_client", GETPOST("search_code_client"));
 }
 if (dol_strlen($begin)) {
-	$sql .= " AND s.nom like '".$db->escape($begin)."'";
+	$sql .= " AND s.nom LIKE '".$db->escape($begin)."'";
 }
 // If the internal user must only see his customers, force searching by him
 $search_sale = 0;
diff --git a/htdocs/core/boxes/box_fediverse.php b/htdocs/core/boxes/box_fediverse.php
index b4cd84fc642..5682e7119d7 100644
--- a/htdocs/core/boxes/box_fediverse.php
+++ b/htdocs/core/boxes/box_fediverse.php
@@ -73,7 +73,7 @@ class box_fediverse extends ModeleBoxes
 		$sql = '';
 		if (!empty($this->paramdef)) {
 			$sql = "SELECT value FROM ".MAIN_DB_PREFIX."const";
-			$sql .= " WHERE name like '%SOCIAL_NETWORKS_DATA_".$this->db->escape($this->paramdef)."%'";
+			$sql .= " WHERE name LIKE '%SOCIAL_NETWORKS_DATA_".$this->db->escape($this->paramdef)."%'";
 		}
 		$resql = $this->db->query($sql);
 		$num = $this->db->num_rows($resql);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f6d1e48eccc..b4540e15941 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -11722,7 +11722,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					if ($newcrit != '') {
 						$numnewcrit = price2num($newcrit);
 						if (is_numeric($numnewcrit)) {
-							$newres .= $field.' '.$operator.' '.((float) $numnewcrit); // should be a numeric
+							$newres .= $db->sanitize($field).' '.$operator.' '.((float) $numnewcrit); // should be a numeric
 						} else {
 							$newres .= '1 = 2'; // force false, we received a corrupted data
 						}
@@ -11732,10 +11732,10 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 				$i2++; // a criteria for 1 more field was added to string
 			} elseif ($mode == 2 || $mode == -2) {
 				$crit = preg_replace('/[^0-9,]/', '', $crit); // ID are always integer
-				$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -2 ? 'NOT ' : '');
+				$newres .= ($i2 > 0 ? ' OR ' : '').$db->sanitize($field)." ".($mode == -2 ? 'NOT ' : '');
 				$newres .= $crit ? "IN (".$db->sanitize($db->escape($crit)).")" : "IN (0)";
 				if ($mode == -2) {
-					$newres .= ' OR '.$field.' IS NULL';
+					$newres .= ' OR '.$db->sanitize($field).' IS NULL';
 				}
 				$i2++; // a criteria for 1 more field was added to string
 			} elseif ($mode == 3 || $mode == -3) {
@@ -11749,11 +11749,11 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 							$listofcodes .= "'".$db->escape($val)."'";
 						}
 					}
-					$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -3 ? 'NOT ' : '')."IN (".$db->sanitize($listofcodes, 1).")";
+					$newres .= ($i2 > 0 ? ' OR ' : '').$db->sanitize($field)." ".($mode == -3 ? 'NOT ' : '')."IN (".$db->sanitize($listofcodes, 1).")";
 					$i2++; // a criteria for 1 more field was added to string
 				}
 				if ($mode == -3) {
-					$newres .= ' OR '.$field.' IS NULL';
+					$newres .= ' OR '.$db->sanitize($field).' IS NULL';
 				}
 			} elseif ($mode == 4) {
 				$tmparray = explode(',', $crit);
@@ -11762,10 +11762,10 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					foreach ($tmparray as $val) {
 						$val = trim($val);
 						if ($val) {
-							$newres .= ($i2 > 0 ? " OR (" : "(").$field." LIKE '".$db->escape($val).",%'";
-							$newres .= ' OR '.$field." = '".$db->escape($val)."'";
-							$newres .= ' OR '.$field." LIKE '%,".$db->escape($val)."'";
-							$newres .= ' OR '.$field." LIKE '%,".$db->escape($val).",%'";
+							$newres .= ($i2 > 0 ? " OR (" : "(").$db->sanitize($field)." LIKE '".$db->escape($val).",%'";
+							$newres .= ' OR '.$db->sanitize($field)." = '".$db->escape($val)."'";
+							$newres .= ' OR '.$db->sanitize($field)." LIKE '%,".$db->escape($val)."'";
+							$newres .= ' OR '.$db->sanitize($field)." LIKE '%,".$db->escape($val).",%'";
 							$newres .= ')';
 							$i2++; // a criteria for 1 more field was added to string (we can add several criteria for the same field as it is a multiselect search criteria)
 						}
@@ -11787,7 +11787,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					}
 
 					if (preg_match('/\.(id|rowid)$/', $field)) {	// Special case for rowid that is sometimes a ref so used as a search field
-						$newres .= $field." = ".(is_numeric($tmpcrit) ? ((float) $tmpcrit) : '0');
+						$newres .= $db->sanitize($field)." = ".(is_numeric($tmpcrit) ? ((float) $tmpcrit) : '0');
 					} else {
 						$tmpcrit2 = $tmpcrit;
 						$tmpbefore = '%';
@@ -11795,10 +11795,10 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 						$tmps = '';
 
 						if (preg_match('/^!/', $tmpcrit)) {
-							$tmps .= $field." NOT LIKE "; // ! as exclude character
+							$tmps .= $db->sanitize($field)." NOT LIKE "; // ! as exclude character
 							$tmpcrit2 = preg_replace('/^!/', '', $tmpcrit2);
 						} else {
-							$tmps .= $field." LIKE ";
+							$tmps .= $db->sanitize($field)." LIKE ";
 						}
 						$tmps .= "'";
 
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 53eb88ee5e3..2720a51cc67 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1231,9 +1231,9 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	// Get counter in database
 	$counter = 0;
 	$sql = "SELECT MAX(".$sqlstring.") as val";
-	$sql .= " FROM ".MAIN_DB_PREFIX.$table;
-	$sql .= " WHERE ".$field." LIKE '".$db->escape($maskLike) . (getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "") . "'";
-	$sql .= " AND ".$field." NOT LIKE '(PROV%)'";
+	$sql .= " FROM ".MAIN_DB_PREFIX.$db->sanitize($table);
+	$sql .= " WHERE ".$db->sanitize($field)." LIKE '".$db->escape($maskLike) . (getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "") . "'";
+	$sql .= " AND ".$db->sanitize($field)." NOT LIKE '(PROV%)'";
 
 	// To ensure that all variables within the MAX() brackets are integers
 	// This avoid bad detection of max when data are noised with non numeric values at the position of the numero
@@ -1299,10 +1299,10 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 		}
 
 		$ref = '';
-		$sql = "SELECT ".$field." as ref";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$table;
-		$sql .= " WHERE ".$field." LIKE '".$db->escape($maskLike) . (getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "") . "'";
-		$sql .= " AND ".$field." NOT LIKE '%PROV%'";
+		$sql = "SELECT ".$db->sanitize($field)." as ref";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$db->sanitize($table);
+		$sql .= " WHERE ".$db->sanitize($field)." LIKE '".$db->escape($maskLike) . (getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "") . "'";
+		$sql .= " AND ".$db->sanitize($field)." NOT LIKE '%PROV%'";
 		if ($bentityon) { // only if entity enable
 			$sql .= " AND entity IN (".getEntity($sharetable).")";
 		} elseif (!empty($forceentity)) {
@@ -1364,8 +1364,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 			// Get counter in database
 			$maskrefclient_sql = "SELECT MAX(".$maskrefclient_sqlstring.") as val";
 			$maskrefclient_sql .= " FROM ".MAIN_DB_PREFIX.$table;
-			//$sql.= " WHERE ".$field." not like '(%'";
-			$maskrefclient_sql .= " WHERE ".$field." LIKE '".$db->escape($maskrefclient_maskLike) . (getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "") . "'";
+			$maskrefclient_sql .= " WHERE ".$db->sanitize($field)." LIKE '".$db->escape($maskrefclient_maskLike) . (getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "") . "'";
 			if ($bentityon) { // only if entity enable
 				$maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")";
 			} elseif (!empty($forceentity)) {
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 0f401ef70a8..6e5c0fddea4 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1762,8 +1762,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		$err = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-		$sql .= " WHERE ".$this->db->decrypt('name')." like '".$this->db->escape($this->const_name)."_TABS_%'";
-		$sql .= " AND entity = ".$conf->entity;
+		$sql .= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->db->escape($this->const_name)."_TABS_%'";
+		$sql .= " AND entity = ".((int) $conf->entity);
 
 		dol_syslog(get_class($this)."::delete_tabs", LOG_DEBUG);
 		if (!$this->db->query($sql)) {
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index 5eb500d61c9..fa62b16021e 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -112,9 +112,9 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 
 		// First, we get the max value (response immediate car champ indexe)
 		$posindice = strlen($prefix) + 6;
-		$sql = "SELECT MAX(CAST(SUBSTRING(".$field." FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		$sql = "SELECT MAX(CAST(SUBSTRING(".$db->sanitize($field)." FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql .= " WHERE ".$field." LIKE '".$db->escape($prefix)."____-%'";
+		$sql .= " WHERE ".$db->sanitize($field)." LIKE '".$db->escape($prefix)."____-%'";
 		$sql .= " AND entity IN (".getEntity('societe').")";
 
 		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index c65e63af98b..36769c6ec44 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -312,7 +312,7 @@ if (GETPOSTISSET('search_processing')) {
 // Manage filter
 if (is_array($filter) && count($filter) > 0) {
 	foreach ($filter as $key => $value) {
-		$sql .= " AND ".$key." LIKE '%".$db->escape($value)."%'";
+		$sql .= " AND ".$db->sanitize($key)." LIKE '%".$db->escape($value)."%'";
 	}
 }
 if (!empty($search_module_name)) {
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 344c25a7baf..344ac3e1ac4 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2242,7 +2242,7 @@ class EmailCollector extends CommonObject
 						// This is an external reference, we check if we have it in our database
 						if (is_null($objectemail) && isModEnabled('ticket')) {
 							$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."ticket";
-							$sql .= " WHERE email_msgid = '".$this->db->escape($reg[1])."' OR origin_references like '%".$this->db->escape($this->db->escapeforlike($reg[1]))."%'";
+							$sql .= " WHERE email_msgid = '".$this->db->escape($reg[1])."' OR origin_references LIKE '%".$this->db->escape($this->db->escapeforlike($reg[1]))."%'";
 							$resql = $this->db->query($sql);
 							if ($resql) {
 								$obj = $this->db->fetch_object($resql);
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 12245ab9643..6d435671c79 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -336,15 +336,15 @@ class ConferenceOrBooth extends ActionComm
 			if (count($filter) > 0) {
 				foreach ($filter as $key => $value) {
 					if ($key == 't.id' || $key == 't.fk_project' || $key == 't.fk_soc' || $key == 't.fk_action') {
-						$sqlwhere[] = $key." = ".((int) $value);
+						$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
 					} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-						$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
 					} elseif ($key == 'customsql') {
-						$sqlwhere[] = $value;
+						$sqlwhere[] = $value;	// deprecated
 					} elseif (strpos($value, '%') === false) {
-						$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+						$sqlwhere[] = $this->db->sanitize($key).' IN ('.$this->db->sanitize($this->db->escape($value)).')';
 					} else {
-						$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+						$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($value)."%'";
 					}
 				}
 			}
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index c53b2d2b506..7da403be52e 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -406,9 +406,9 @@ class Export
 		switch ($InfoFieldList[0]) {
 			case 'Text':
 				if (!(strpos($ValueField, '%') === false)) {
-					$szFilterQuery = " ".$NameField." LIKE '".$this->db->escape($ValueField)."'";
+					$szFilterQuery = " ".$this->db->sanitize($NameField)." LIKE '".$this->db->escape($ValueField)."'";
 				} else {
-					$szFilterQuery = " ".$NameField." = '".$this->db->escape($ValueField)."'";
+					$szFilterQuery = " ".$this->db->sanitize($NameField)." = '".$this->db->escape($ValueField)."'";
 				}
 				break;
 			case 'Date':
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index db229d8de5b..302379acf8e 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -89,25 +89,24 @@ if (!$user->hasRight("societe", "client", "voir") && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 
+/*
 if (dol_strlen($stcomm)) {
-	$sql .= " AND s.fk_stcomm=$stcomm";
+	$sql .= " AND s.fk_stcomm = ".((int) $stcomm);
 }
-
 if (dol_strlen($begin)) {
-	$sql .= " AND p.lastname LIKE '$begin%'";
+	$sql .= " AND p.lastname LIKE '".$db->escape($begin)."%'";
 }
-
 if ($contactname) {
-	$sql .= " AND p.lastname LIKE '%".strtolower($contactname)."%'";
+	$sql .= " AND p.lastname LIKE '%".$db->escape($contactname)."%'";
 	$sortfield = "p.lastname";
 	$sortorder = "ASC";
 }
-
+*/
 if ($socid) {
 	$sql .= " AND s.rowid = ".((int) $socid);
 }
 
-$sql .= " ORDER BY $sortfield $sortorder ";
+$sql .= " ORDER BY $sortfield $sortorder";
 $sql .= $db->plimit($limit, $offset);
 
 $result = $db->query($sql);
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index d3d8364b810..fc8a3f36c2a 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -1148,7 +1148,7 @@ if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha')) {
 	foreach ($arraylistofkey as $key) {
 		$sql = "SELECT DISTINCT name, value";
 		$sql .= " FROM ".MAIN_DB_PREFIX."const as c";
-		$sql .= " WHERE name LIKE 'MAIN_MODULE_%_".strtoupper($key)."'";
+		$sql .= " WHERE name LIKE 'MAIN_MODULE_%_".strtoupper($db->escape($key))."'";
 		$sql .= " ORDER BY name";
 
 		$resql = $db->query($sql);
diff --git a/htdocs/mrp/class/moline.class.php b/htdocs/mrp/class/moline.class.php
index 49339ff7055..fc157e805a3 100644
--- a/htdocs/mrp/class/moline.class.php
+++ b/htdocs/mrp/class/moline.class.php
@@ -299,11 +299,11 @@ class MoLine extends CommonObjectLine
 			if (count($filter) > 0) {
 				foreach ($filter as $key => $value) {
 					if ($key == 't.rowid') {
-						$sqlwhere[] = $key." = ".((int) $value);
+						$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
 					} elseif (strpos($key, 'date') !== false) {
-						$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
 					} else {
-						$sqlwhere[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+						$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 					}
 				}
 			}
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index ec755c8d94c..4e3a7bcc92f 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -605,11 +605,11 @@ class ProductCustomerPrice extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) { 				// To allow $filter['YEAR(s.dated)']=>$year
-					$sql .= " AND ".$key." = '".$this->db->escape($value)."'";
+					$sql .= " AND ".$this->db->sanitize($key)." = '".$this->db->escape($value)."'";
 				} elseif ($key == 'soc.nom') {
-					$sql .= " AND ".$key." LIKE '%".$this->db->escape($value)."%'";
+					$sql .= " AND ".$this->db->sanitize($key)." LIKE '%".$this->db->escape($value)."%'";
 				} else {
-					$sql .= " AND ".$key." = ".((int) $value);
+					$sql .= " AND ".$this->db->sanitize($key)." = ".((int) $value);
 				}
 			}
 		}
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index 3cdb939670f..d6421263010 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -440,13 +440,13 @@ class ProductFournisseurPrice extends CommonObject
 			if (count($filter) > 0) {
 				foreach ($filter as $key => $value) {
 					if ($key == 't.rowid') {
-						$sqlwhere[] = $key." = ".((int) $value);
+						$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
 					} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-						$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
 					} elseif (strpos($value, '%') === false) {
-						$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+						$sqlwhere[] = $this->db->sanitize($key).' IN ('.$this->db->sanitize($this->db->escape($value)).')';
 					} else {
-						$sqlwhere[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+						$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 					}
 				}
 			}
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 128761b3b8e..2a6d965b012 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -416,7 +416,7 @@ if (!empty($sql_select)) {
 	$sql .= $where;
 	$sql .= dolSqlDateFilter($dateprint, 0, $month, $year);
 	if ($sref) {
-		$sql .= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
+		$sql .= " AND ".$db->sanitize($doc_number)." LIKE '%".$db->escape($sref)."%'";
 	}
 	if ($sprod_fulldescr) {
 		// We test both case description is correctly saved of was save after dol_escape_htmltag().
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 643ebf548f4..cd1e659e1f5 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2104,7 +2104,7 @@ class Ticket extends CommonObject
 		}
 		if (is_array($filters) && !empty($filters)) {
 			foreach ($filters as $field => $value) {
-				$sql .= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'";
+				$sql .= " ".$clause." ".$this->db->sanitize($field)." LIKE '".$this->db->escape($value)."'";
 			}
 			if (!empty($email)) {
 				$sql .= ")";
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 98fe79aa763..43dc5599601 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -416,7 +416,7 @@ class Website extends CommonObject
 			$sqlwhere = array();
 			if (count($filter) > 0) {
 				foreach ($filter as $key => $value) {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+					$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 			if (count($sqlwhere) > 0) {

From 8623166d59d22fbb5d7e5a7b244df32c9073d150 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 20 Jan 2025 06:53:03 +0100
Subject: [PATCH 226/243] FIX remove from CRUD

---
 htdocs/compta/facture/card.php                     |  9 ++++++---
 htdocs/compta/facture/class/api_invoices.class.php |  6 ++++++
 htdocs/compta/facture/class/facture.class.php      |  4 ----
 htdocs/compta/facture/prelevement.php              |  7 +++++--
 htdocs/core/class/commoninvoice.class.php          |  5 ++++-
 htdocs/fourn/class/api_supplier_invoices.class.php | 13 ++++++++-----
 htdocs/fourn/class/fournisseur.facture.class.php   |  4 ----
 htdocs/fourn/facture/card.php                      |  7 +++++--
 htdocs/fourn/facture/contact.php                   |  7 +++++--
 htdocs/fourn/facture/document.php                  |  7 +++++--
 htdocs/fourn/facture/note.php                      |  7 +++++--
 11 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index a5feab87d9b..2b6251167a8 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4743,17 +4743,20 @@ if ($action == 'create') {
 			print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1, '', 32)).'</span>';
 		}
 
-		if (!empty($object->creditnotelist)) {
+		// Retrieve credit note ids
+		$object->getListIdAvoirFromInvoice();
+
+		if (!empty($object->creditnote_ids)) {
 			print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir");
 			$i = 0;
-			foreach ($object->creditnotelist as $invoiceid) {
+			foreach ($object->creditnote_ids as $invoiceid) {
 				if ($i == 0) {
 					print ' ';
 				} else {
 					print ',';
 				}
 				$creditnote = new Facture($db);
-				$creditnote->fetch($id);
+				$creditnote->fetch($invoiceid);
 				print $creditnote->getNomUrl(1, '', 32);
 			}
 			print '</span>';
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 1476eb8e764..6a3171be197 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -149,6 +149,9 @@ class Invoices extends DolibarrApi
 			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
+		// Retrieve credit note ids
+		$this->getListIdAvoirFromInvoice();
+
 		// Add external contacts ids
 		if ($contact_list > -1) {
 			$tmparray = $this->invoice->liste_contact(-1, 'external', $contact_list);
@@ -268,6 +271,9 @@ class Invoices extends DolibarrApi
 					$invoice_static->totaldeposits = $invoice_static->getSumDepositsUsed();
 					$invoice_static->remaintopay = price2num($invoice_static->total_ttc - $invoice_static->totalpaid - $invoice_static->totalcreditnotes - $invoice_static->totaldeposits, 'MT');
 
+					// Retrieve credit note ids
+					$invoice_static->getListIdAvoirFromInvoice();
+
 					// Add external contacts ids
 					$tmparray = $invoice_static->liste_contact(-1, 'external', 1);
 					if (is_array($tmparray)) {
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index d48dc07bf53..179385b1aba 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2300,10 +2300,6 @@ class Facture extends CommonInvoice
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
-				if ($this->type != self::TYPE_CREDIT_NOTE) {
-					$this->creditnotelist = $this->getListIdAvoirFromInvoice();
-				}
-
 				if (($this->type == self::TYPE_SITUATION || ($this->type == self::TYPE_CREDIT_NOTE && $this->situation_cycle_ref > 0)) && $fetch_situation) {
 					$this->fetchPreviousNextSituationInvoice();
 				}
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index fe3b93cc597..fd22234a7a9 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -439,9 +439,12 @@ if ($object->id > 0) {
 		print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).'</span>';
 	}
 
-	if (!empty($object->creditnotelist)) {
+	// Retrieve credit note ids
+	$object->getListIdAvoirFromInvoice();
+
+	if (!empty($object->creditnote_ids)) {
 		$invoicecredits = array();
-		foreach ($object->creditnotelist as $invoiceid) {
+		foreach ($object->creditnote_ids as $invoiceid) {
 			if ($type == 'bank-transfer') {
 				$creditnote = new FactureFournisseur($db);
 			} else {
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 983c35512b8..13561f2de64 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -165,7 +165,7 @@ abstract class CommonInvoice extends CommonObject
 	/**
 	 * @var int[] return of getListIdAvoirFromInvoice()
 	 */
-	public $creditnotelist;
+	public $creditnote_ids;
 
 	/**
 	 * @var int
@@ -455,6 +455,9 @@ abstract class CommonInvoice extends CommonObject
 		} else {
 			dol_print_error($this->db);
 		}
+
+		$this->creditnote_ids = $idarray;
+
 		return $idarray;
 	}
 
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 06d9efaee2a..401ee44743a 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2016   Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2023	Joachim Kueter		    <git-jk@bloxera.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+/* Copyright (C) 2015	Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2023	Joachim Kueter			<git-jk@bloxera.com>
+ * Copyright (C) 2024	MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024	Frédéric France			<frederic.france@free.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
@@ -82,6 +82,9 @@ class SupplierInvoices extends DolibarrApi
 			throw new RestException(404, 'Supplier invoice not found');
 		}
 
+		// Retrieve credit note ids
+		$this->getListIdAvoirFromInvoice();
+
 		$this->invoice->fetchObjectLinked();
 		return $this->_cleanObjectDatas($this->invoice);
 	}
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 128694f0f0d..dab5dea6d6c 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1013,10 +1013,6 @@ class FactureFournisseur extends CommonInvoice
 
 				$this->socid  = $obj->socid;
 
-				if ($this->type != self::TYPE_CREDIT_NOTE) {
-					$this->creditnotelist = $this->getListIdAvoirFromInvoice();
-				}
-
 				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 0ed41bb4682..ab1ce229e1f 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3339,9 +3339,12 @@ if ($action == 'create') {
 				}
 			}
 
-			if (!empty($object->creditnotelist)) {
+			// Retrieve credit note ids
+			$object->getListIdAvoirFromInvoice();
+
+			if (!empty($object->creditnote_ids)) {
 				$invoicecredits = array();
-				foreach ($object->creditnotelist as $invoiceid) {
+				foreach ($object->creditnote_ids as $invoiceid) {
 					$creditnote = new FactureFournisseur($db);
 					$creditnote->fetch($invoiceid);
 					$invoicecredits[] = $creditnote->getNomUrl(1);
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index fe65695eb20..5fd19773108 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -211,9 +211,12 @@ if ($id > 0 || !empty($ref)) {
 			print ' '.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1));
 		}
 
-		if (!empty($object->creditnotelist)) {
+		// Retrieve credit note ids
+		$object->getListIdAvoirFromInvoice();
+
+		if (!empty($object->creditnote_ids)) {
 			$invoicecredits = array();
-			foreach ($object->creditnotelist as $invoiceid) {
+			foreach ($object->creditnote_ids as $invoiceid) {
 				$creditnote = new FactureFournisseur($db);
 				$creditnote->fetch($invoiceid);
 				$invoicecredits[] = $creditnote->getNomUrl(1);
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index d4f22a9a4f7..75d961308b0 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -187,9 +187,12 @@ if ($object->id > 0) {
 		print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
 	}
 
-	if (!empty($object->creditnotelist)) {
+	// Retrieve credit note ids
+	$object->getListIdAvoirFromInvoice();
+
+	if (!empty($object->creditnote_ids)) {
 		$invoicecredits = array();
-		foreach ($object->creditnotelist as $invoiceid) {
+		foreach ($object->creditnote_ids as $invoiceid) {
 			$creditnote = new FactureFournisseur($db);
 			$creditnote->fetch($invoiceid);
 			$invoicecredits[] = $creditnote->getNomUrl(1);
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index fb0f024afb6..001797dc5a6 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -169,9 +169,12 @@ if ($object->id > 0) {
 		print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
 	}
 
-	if (!empty($object->creditnotelist)) {
+	// Retrieve credit note ids
+	$object->getListIdAvoirFromInvoice();
+
+	if (!empty($object->creditnote_ids)) {
 		$invoicecredits = array();
-		foreach ($object->creditnotelist as $invoiceid) {
+		foreach ($object->creditnote_ids as $invoiceid) {
 			$creditnote = new FactureFournisseur($db);
 			$creditnote->fetch($invoiceid);
 			$invoicecredits[] = $creditnote->getNomUrl(1);

From bf5e6ac88ba12122b864ca81f213cae936b5867a Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 20 Jan 2025 07:00:55 +0100
Subject: [PATCH 227/243] FIX wrong API object

---
 htdocs/compta/facture/class/api_invoices.class.php | 2 +-
 htdocs/fourn/class/api_supplier_invoices.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 6a3171be197..d58000dd683 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -150,7 +150,7 @@ class Invoices extends DolibarrApi
 		}
 
 		// Retrieve credit note ids
-		$this->getListIdAvoirFromInvoice();
+		$this->invoice->getListIdAvoirFromInvoice();
 
 		// Add external contacts ids
 		if ($contact_list > -1) {
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 401ee44743a..71408521d4b 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -83,7 +83,7 @@ class SupplierInvoices extends DolibarrApi
 		}
 
 		// Retrieve credit note ids
-		$this->getListIdAvoirFromInvoice();
+		$this->invoice->getListIdAvoirFromInvoice();
 
 		$this->invoice->fetchObjectLinked();
 		return $this->_cleanObjectDatas($this->invoice);

From df861e76bceeae2226f310a8525f943aee57cb3d Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 20 Jan 2025 08:53:47 +0100
Subject: [PATCH 228/243] FIX code not visible correctly into view of
 dictionnary

---
 htdocs/admin/dict.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 320d8ca9e82..6218c894c62 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -2367,7 +2367,10 @@ if ($id > 0) {
 								continue;
 							}
 
-							if ($value == 'element') {
+							// Management of several special cases and exceptions
+							if ($value == 'code' && $id == DICT_PRODUCT_NATURE) {
+								$valuetoshow = (int) $valuetoshow;
+							} elseif ($value == 'element') {
 								$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
 							} elseif ($value == 'source') {
 								$valuetoshow = isset($sourceList[$valuetoshow]) ? $sourceList[$valuetoshow] : $valuetoshow;
@@ -2543,6 +2546,7 @@ if ($id > 0) {
 									$valuetoshow = $TDurationTypes[$obj->{$value}];
 								}
 							}
+
 							$class .= ($class ? ' ' : '').'tddict';
 							if ($value == 'name') {
 								$class .= ' tdoverflowmax200';

From 5729995b21105eef0532294210fc32474d55d28b Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 20 Jan 2025 08:53:47 +0100
Subject: [PATCH 229/243] FIX code not visible correctly into view of
 dictionnary

---
 htdocs/admin/dict.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index d5492e16956..6d10c1de384 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -2286,7 +2286,10 @@ if ($id > 0) {
 								continue;
 							}
 
-							if ($value == 'element') {
+							// Management of several special cases and exceptions
+							if ($value == 'code' && $id == DICT_PRODUCT_NATURE) {
+								$valuetoshow = (int) $valuetoshow;
+							} elseif ($value == 'element') {
 								$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
 							} elseif ($value == 'source') {
 								$valuetoshow = isset($sourceList[$valuetoshow]) ? $sourceList[$valuetoshow] : $valuetoshow;
@@ -2460,6 +2463,7 @@ if ($id > 0) {
 									$valuetoshow = $TDurationTypes[$obj->{$value}];
 								}
 							}
+
 							$class .= ($class ? ' ' : '').'tddict';
 							if ($value == 'note' && $id == DICT_TVA) {
 								$class .= ' tdoverflowmax200';

From 695b0e12a786ba94978f38f0b901339970a7b0c0 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 20 Jan 2025 10:07:40 +0100
Subject: [PATCH 230/243] Fix sql

---
 htdocs/install/mysql/tables/llx_blockedlog.key.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_blockedlog.key.sql b/htdocs/install/mysql/tables/llx_blockedlog.key.sql
index 065be82aba1..e1e2c956609 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog.key.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog.key.sql
@@ -22,4 +22,5 @@ ALTER TABLE llx_blockedlog ADD INDEX entity (entity);
 ALTER TABLE llx_blockedlog ADD INDEX fk_user (fk_user);
 ALTER TABLE llx_blockedlog ADD INDEX entity_action_certified (entity,action,certified);
 
-ALTER TABLE llx_blockedlog ADD INDEX entity_rowid (entity, rowid);	-- for the "SELECT rowid, signature FROM llx_blockedlog FORCE INDEX entity_rowid WHERE entity = x AND rowid < z ORDER BY rowid DESC"
+-- We add this index for the "SELECT rowid, signature FROM llx_blockedlog FORCE INDEX entity_rowid WHERE entity = x AND rowid < z ORDER BY rowid DESC"
+ALTER TABLE llx_blockedlog ADD INDEX entity_rowid (entity, rowid);

From 736890b244e3de3d6c397310cf339d8ced9604fe Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 20 Jan 2025 10:15:31 +0100
Subject: [PATCH 231/243] Merge

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

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 68d17fe99f6..cf1898daa07 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -619,7 +619,7 @@ class ActionComm extends CommonObject
 				foreach ($this->userassigned as $key => $val) {
 					// Common value with new behavior is to have $val = array('id'=>iduser, 'transparency'=>0|1) and $this->userassigned is an array of iduser => $val.
 					if (!is_array($val)) {	// For backward compatibility when $val='id'.
-						$val = array('id'=>$val);
+						$val = array('id' => $val);
 					}
 
 					if ($val['id'] > 0) {

From e49c37106b624bcc0fbc6e67fe224172727261e5 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 20 Jan 2025 12:17:39 +0100
Subject: [PATCH 232/243] Confirmation useless

---
 htdocs/projet/card.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 0eb947f56a6..4fc99beac08 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -1658,7 +1658,8 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			// Validate
 			if ($object->status == Project::STATUS_DRAFT && $user->hasRight('projet', 'creer')) {
 				if ($userWrite > 0) {
-					print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=validate&amp;token='.newToken().'&amp;id='.$object->id, '');
+					//print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=validate&token='.newToken().'&id='.$object->id, '');
+					print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=confirm_validate&confirm=yes&token='.newToken().'&id='.$object->id, '');
 				} else {
 					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 				}
@@ -1667,7 +1668,8 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			// Close
 			if ($object->status == Project::STATUS_VALIDATED && $user->hasRight('projet', 'creer')) {
 				if ($userWrite > 0) {
-					print dolGetButtonAction('', $langs->trans('Close'), 'default', $_SERVER["PHP_SELF"].'?action=close&amp;token='.newToken().'&amp;id='.$object->id, '');
+					//print dolGetButtonAction('', $langs->trans('Close'), 'default', $_SERVER["PHP_SELF"].'?action=close&amp;token='.newToken().'&amp;id='.$object->id, '');
+					print dolGetButtonAction('', $langs->trans('Close'), 'default', $_SERVER["PHP_SELF"].'?action=confirm_close&confirm=yes&token='.newToken().'&id='.$object->id, '');
 				} else {
 					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Close'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 				}

From dcb0befcd45dacfe0c5f427aa30881c263545f77 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 20 Jan 2025 12:51:00 +0100
Subject: [PATCH 233/243] Fix regression

---
 htdocs/adherents/class/api_subscriptions.class.php | 2 +-
 htdocs/expedition/class/api_shipments.class.php    | 2 +-
 htdocs/projet/class/api_tasks.class.php            | 2 +-
 htdocs/reception/class/api_receptions.class.php    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index 6d27ba72dea..a689a35a0a6 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -202,7 +202,7 @@ class Subscriptions extends DolibarrApi
 				}
 				continue;
 			}
-			$subscription->$field = $this->_checkValForAPI($field, $val, $subscription);
+			$subscription->$field = $this->_checkValForAPI($field, $value, $subscription);
 		}
 
 		if ($subscription->update(DolibarrApiAccess::$user) > 0) {
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index b5995eed7ac..1cdd859004f 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -463,7 +463,7 @@ class Shipments extends DolibarrApi
 				}
 				continue;
 			}
-			$this->shipment->$field = $this->_checkValForAPI($field, $val, $this->shipment);;
+			$this->shipment->$field = $this->_checkValForAPI($field, $value, $this->shipment);;
 		}
 
 		if ($this->shipment->update(DolibarrApiAccess::$user) > 0) {
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index 353615ba887..49382685edd 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -478,7 +478,7 @@ class Tasks extends DolibarrApi
 				}
 				continue;
 			}
-			$this->task->$field = $this->_checkValForAPI($field, $val, $this->task);
+			$this->task->$field = $this->_checkValForAPI($field, $value, $this->task);
 		}
 
 		if ($this->task->update(DolibarrApiAccess::$user) > 0) {
diff --git a/htdocs/reception/class/api_receptions.class.php b/htdocs/reception/class/api_receptions.class.php
index 5eeece76d81..c05e5ca477e 100644
--- a/htdocs/reception/class/api_receptions.class.php
+++ b/htdocs/reception/class/api_receptions.class.php
@@ -464,7 +464,7 @@ class Receptions extends DolibarrApi
 				}
 				continue;
 			}
-			$this->reception->$field = $this->_checkValForAPI($field, $val, $this->reception);
+			$this->reception->$field = $this->_checkValForAPI($field, $value, $this->reception);
 		}
 
 		if ($this->reception->update(DolibarrApiAccess::$user) > 0) {

From f7838a9459b8847e037578bed7cbcf96f47b19df Mon Sep 17 00:00:00 2001
From: Dolibot <dolibarr-bot@users.noreply.github.com>
Date: Mon, 20 Jan 2025 12:06:56 +0000
Subject: [PATCH 234/243] PHPStan > Update baseline

---
 dev/build/phpstan/phpstan-baseline.neon | 38 +------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 4e98d2d655e..3d3697f4d16 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -6576,12 +6576,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/compta/sociales/card.php
 
-		-
-			message: '#^Variable \$resteapayer might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../../htdocs/compta/sociales/card.php
-
 		-
 			message: '#^Negated boolean expression is always true\.$#'
 			identifier: booleanNot.alwaysTrue
@@ -19593,13 +19587,7 @@ parameters:
 		-
 			message: '#^Variable \$begin might not be defined\.$#'
 			identifier: variable.undefined
-			count: 5
-			path: ../../../htdocs/fourn/contact.php
-
-		-
-			message: '#^Variable \$contactname might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
+			count: 3
 			path: ../../../htdocs/fourn/contact.php
 
 		-
@@ -19608,12 +19596,6 @@ parameters:
 			count: 4
 			path: ../../../htdocs/fourn/contact.php
 
-		-
-			message: '#^Variable \$stcomm might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/fourn/contact.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
@@ -22290,12 +22272,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/loan/class/loanschedule.class.php
 
-		-
-			message: '#^Negated boolean expression is always true\.$#'
-			identifier: booleanNot.alwaysTrue
-			count: 1
-			path: ../../../htdocs/loan/class/paymentloan.class.php
-
 		-
 			message: '#^Property PaymentLoan\:\:\$amount_capital \(float\|int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -32628,21 +32604,9 @@ parameters:
 			count: 4
 			path: ../../../htdocs/website/index.php
 
-		-
-			message: '#^Comparison operation "\>\=" between 1 and 0 is always true\.$#'
-			identifier: greaterOrEqual.alwaysTrue
-			count: 1
-			path: ../../../htdocs/website/samples/wrapper.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
-			count: 3
-			path: ../../../htdocs/website/samples/wrapper.php
-
-		-
-			message: '#^If condition is always true\.$#'
-			identifier: if.alwaysTrue
 			count: 1
 			path: ../../../htdocs/website/samples/wrapper.php
 

From 36b48a81ec231d882c962dd6a56ee227a835981d Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 20 Jan 2025 14:59:13 +0100
Subject: [PATCH 235/243] Fix double ;

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

diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 1cdd859004f..df30b70a141 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -463,7 +463,7 @@ class Shipments extends DolibarrApi
 				}
 				continue;
 			}
-			$this->shipment->$field = $this->_checkValForAPI($field, $value, $this->shipment);;
+			$this->shipment->$field = $this->_checkValForAPI($field, $value, $this->shipment);
 		}
 
 		if ($this->shipment->update(DolibarrApiAccess::$user) > 0) {

From 42c870ca629ff6419cc9ef4fd64ed9f64d57e19b Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 20 Jan 2025 15:41:20 +0100
Subject: [PATCH 236/243] FIX The email for admin must be in language of admin
 not of visitor

---
 htdocs/public/payment/paymentko.php | 10 +++++++++-
 htdocs/public/payment/paymentok.php | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 4e3cc764659..db16c74ab21 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -194,8 +194,16 @@ if (!empty($_SESSION['ipaddress'])) {      // To avoid to make action twice
 
 	// Send warning of error to administrator
 	if ($sendemail) {
+		// Get default language to use for the company for supervision emails
+		$myCompanyDefaultLang = $mysoc->default_lang;
+		if (empty($myCompanyDefaultLang) || $myCompanyDefaultLang === 'auto') {
+			// We must guess the language from the company country. We must not use the language of the visitor. This is a technical email for supervision
+			// so it must always be into the same language.
+			$myCompanyDefaultLang = getLanguageCodeFromCountryCode($mysoc->country_code);
+		}
+
 		$companylangs = new Translate('', $conf);
-		$companylangs->setDefaultLang($mysoc->default_lang);
+		$companylangs->setDefaultLang($myCompanyDefaultLang);
 		$companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox', 'stripe'));
 
 		$from = getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index cbfaae76079..aa46e7ccf0b 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -1957,8 +1957,16 @@ if ($ispaymentok) {
 
 	// Send an email to the admins
 	if ($sendemail) {
+		// Get default language to use for the company for supervision emails
+		$myCompanyDefaultLang = $mysoc->default_lang;
+		if (empty($myCompanyDefaultLang) || $myCompanyDefaultLang === 'auto') {
+			// We must guess the language from the company country. We must not use the language of the visitor. This is a technical email for supervision
+			// so it must always be into the same language.
+			$myCompanyDefaultLang = getLanguageCodeFromCountryCode($mysoc->country_code);
+		}
+
 		$companylangs = new Translate('', $conf);
-		$companylangs->setDefaultLang($mysoc->default_lang);
+		$companylangs->setDefaultLang($myCompanyDefaultLang);
 		$companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox', 'stripe'));
 
 		$sendto = $sendemail;

From ca9a1923e1c62b5c81546d299757543bed9b1acf Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 20 Jan 2025 16:13:40 +0100
Subject: [PATCH 237/243] Fix missing field in the select of country

---
 htdocs/core/class/ccountry.class.php | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index 1d798698e84..22a1d2d84d2 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -52,6 +52,21 @@ class Ccountry extends CommonDict
 		'label' => array('type' => 'varchar(250)', 'label' => 'Label', 'enabled' => 1, 'visible' => 1, 'position' => 15, 'notnull' => -1, 'showoncombobox' => 1)
 	);
 
+	/**
+	 * @var int
+	 */
+	public $favorite;
+
+	/**
+	 * @var int
+	 */
+	public $eec;
+
+	/**
+	 * @var string
+	 */
+	public $numeric_code;
+
 
 	/**
 	 *  Constructor
@@ -150,7 +165,10 @@ class Ccountry extends CommonDict
 		$sql .= " t.code,";
 		$sql .= " t.code_iso,";
 		$sql .= " t.label,";
-		$sql .= " t.active";
+		$sql .= " t.eec,";
+		$sql .= " t.active,";
+		$sql .= " t.favorite,";
+		$sql .= " t.numeric_code";
 		$sql .= " FROM ".$this->db->prefix()."c_country as t";
 		if ($id) {
 			$sql .= " WHERE t.rowid = ".((int) $id);
@@ -161,6 +179,7 @@ class Ccountry extends CommonDict
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($this->db->num_rows($resql)) {
@@ -172,6 +191,9 @@ class Ccountry extends CommonDict
 					$this->code_iso = $obj->code_iso;
 					$this->label = $obj->label;
 					$this->active = $obj->active;
+					$this->favorite = $obj->favorite;
+					$this->eec = $obj->eec;
+					$this->numeric_code = $obj->numeric_code;
 				}
 
 				$this->db->free($resql);

From a6baef68d26a794fcd738eced7a6ec5031b71e2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charl=C3=A8ne=20Benke?=
 <1179011+defrance@users.noreply.github.com>
Date: Mon, 20 Jan 2025 16:18:33 +0100
Subject: [PATCH 238/243] Add ecc field on fetch for expose on api

---
 htdocs/core/class/ccountry.class.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index 1d798698e84..4dca978ab64 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2025		Charlene Benke	    <charlene@patas-monkey.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
@@ -45,6 +46,12 @@ class Ccountry extends CommonDict
 	 */
 	public $code_iso;
 
+	/**
+	 * @var string
+	 */
+	public $ecc;
+
+	
 	/**
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>
 	 */
@@ -149,6 +156,7 @@ class Ccountry extends CommonDict
 		$sql .= " t.rowid,";
 		$sql .= " t.code,";
 		$sql .= " t.code_iso,";
+		$sql .= " t.ecc,";
 		$sql .= " t.label,";
 		$sql .= " t.active";
 		$sql .= " FROM ".$this->db->prefix()."c_country as t";
@@ -171,6 +179,7 @@ class Ccountry extends CommonDict
 					$this->code = $obj->code;
 					$this->code_iso = $obj->code_iso;
 					$this->label = $obj->label;
+					$this->ecc = $obj->ecc;
 					$this->active = $obj->active;
 				}
 

From 3418887436503711e375b9240a3704653c231166 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 20 Jan 2025 16:40:05 +0100
Subject: [PATCH 239/243] Clean code

---
 htdocs/core/class/ccountry.class.php | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index 5d75eea9fd1..81be08a78b8 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -51,30 +51,25 @@ class Ccountry extends CommonDict
 	 */
 	public $ecc;
 
-	
-	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>
-	 */
-	public $fields = array(
-		'label' => array('type' => 'varchar(250)', 'label' => 'Label', 'enabled' => 1, 'visible' => 1, 'position' => 15, 'notnull' => -1, 'showoncombobox' => 1)
-	);
-
 	/**
 	 * @var int
 	 */
 	public $favorite;
 
-	/**
-	 * @var int
-	 */
-	public $eec;
-
 	/**
 	 * @var string
 	 */
 	public $numeric_code;
 
 
+	/**
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>
+	 */
+	public $fields = array(
+		'label' => array('type' => 'varchar(250)', 'label' => 'Label', 'enabled' => 1, 'visible' => 1, 'position' => 15, 'notnull' => -1, 'showoncombobox' => 1)
+	);
+
+
 	/**
 	 *  Constructor
 	 *
@@ -171,7 +166,6 @@ class Ccountry extends CommonDict
 		$sql .= " t.rowid,";
 		$sql .= " t.code,";
 		$sql .= " t.code_iso,";
-		$sql .= " t.ecc,";
 		$sql .= " t.label,";
 		$sql .= " t.eec,";
 		$sql .= " t.active,";
@@ -201,7 +195,6 @@ class Ccountry extends CommonDict
 					$this->ecc = $obj->ecc;
 					$this->active = $obj->active;
 					$this->favorite = $obj->favorite;
-					$this->eec = $obj->eec;
 					$this->numeric_code = $obj->numeric_code;
 				}
 

From adb1c58d059f991a204c42718493c2ca9f25ae8a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 20 Jan 2025 15:55:19 +0100
Subject: [PATCH 240/243] Qual: Fix ci for new api_memberstypes.class

# Qual: Fix ci for new api_memberstypes.class

This fixes the notifications for the new api_memberstypes.class
---
 htdocs/adherents/class/api_members.class.php  | 10 ++++----
 .../class/api_memberstypes.class.php          | 23 +++++++++++++------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 6a65bc99ced..db18500629c 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2017	    Regis Houssin	        <regis.houssin@inodbox.com>
  * Copyright (C) 2020	    Thibault FOUCART        <support@ptibogxiv.net>
  * Copyright (C) 2020-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 class Members extends DolibarrApi
 {
 	/**
-	 * @var string[]   $FIELDS     Mandatory fields, checked when create and update object
+	 * @var string[]       Mandatory fields, checked when create and update object
 	 */
 	public static $FIELDS = array(
 		'morphy',
@@ -159,7 +159,7 @@ class Members extends DolibarrApi
 				throw new RestException(404, 'member not found');
 			}
 		} else {
-				throw new RestException(404, 'This account have many thirdparties attached or does not exist.');
+			throw new RestException(404, 'This account have many thirdparties attached or does not exist.');
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
@@ -355,7 +355,9 @@ class Members extends DolibarrApi
 	/**
 	 * Create member object
 	 *
-	 * @param array<string,string> $request_data   Request data
+	 * @param array	 $request_data   Request data
+	 * @phan-param ?array<string,string>	$request_data
+	 * @phpstan-param ?array<string,string>	$request_data
 	 * @return int  ID of member
 	 *
 	 * @throws	RestException	403		Access denied
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 32e9e105fa2..c96967f79ff 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017	Regis Houssin	<regis.houssin@inodbox.com>
+ * Copyright (C) 2025		MDW				<mdeweerd@users.noreply.github.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
@@ -28,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 class MembersTypes extends DolibarrApi
 {
 	/**
-	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 * @var string[]	Mandatory fields, checked when create and update object
 	 */
 	public static $FIELDS = array(
 		'label',
@@ -84,6 +85,8 @@ class MembersTypes extends DolibarrApi
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.libelle:like:'SO-%') and (t.subscription:=:'1')"
 	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return array                Array of member type objects
+	 * @phan-return AdherentType[]
+	 * @phpstan-return AdherentType[]
 	 *
 	 * @throws RestException
 	 */
@@ -143,7 +146,9 @@ class MembersTypes extends DolibarrApi
 	/**
 	 * Create member type object
 	 *
-	 * @param array $request_data   Request data
+	 * @param array	$request_data   Request data
+	 * @phan-param ?array<string,string>    $request_data
+	 * @phpstan-param ?array<string,string> $request_data
 	 * @return int  ID of member type
 	 */
 	public function post($request_data = null)
@@ -175,7 +180,9 @@ class MembersTypes extends DolibarrApi
 	 *
 	 * @param int   $id             ID of member type to update
 	 * @param array $request_data   Datas
-	 * @return int
+	 * @phan-param ?array<string,string>    $request_data
+	 * @phpstan-param ?array<string,string> $request_data
+	 * @return Object
 	 */
 	public function put($id, $request_data = null)
 	{
@@ -227,6 +234,8 @@ class MembersTypes extends DolibarrApi
 	 *
 	 * @param int $id   member type ID
 	 * @return array
+	 * @phan-return array<string,array{code:int,message:string}>
+	 * @phpstan-return array<string,array{code:int,message:string}>
 	 */
 	public function delete($id)
 	{
@@ -261,8 +270,8 @@ class MembersTypes extends DolibarrApi
 	/**
 	 * Validate fields before creating an object
 	 *
-	 * @param array|null    $data   Data to validate
-	 * @return array
+	 * @param ?array<null|int|float|string> $data   Data to validate
+	 * @return array<string,null|int|float|string>
 	 *
 	 * @throws RestException
 	 */
@@ -282,8 +291,8 @@ class MembersTypes extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   Object  $object    Object to clean
-	 * @return    Object    Object with cleaned properties
+	 * @param	Object  $object		Object to clean
+	 * @return	Object				Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{

From c720370a9cc528225e76b968151ef563639b3615 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 20 Jan 2025 16:20:56 +0100
Subject: [PATCH 241/243] Qual: Fix phpstan notice about undefined copy

---
 .../triggers/interface_50_modTicket_TicketEmail.class.php     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 40cd8f49827..d518d284c8e 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2014-2016  Jean-François Ferry	<hello@librethic.io>
  * 				 2016       Christophe Battarel <christophe@altairis.fr>
  * Copyright (C) 2023		Benjamin Falière	<benjamin.faliere@altairis.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -178,6 +178,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						if (!getDolGlobalString('TICKET_DISABLE_ALL_MAILS')) {
 							// Send email to assigned user
 							$sendto = $userstat->email;
+							$old_MAIN_MAIL_AUTOCOPY_TO = null;
 							if (!getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO')) {
 								$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 								$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
@@ -206,6 +207,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						if (!getDolGlobalString('TICKET_DISABLE_ALL_MAILS')) {
 							// Send email to assigned user
 							$sendto = $userstat->email;
+							$old_MAIN_MAIL_AUTOCOPY_TO = null;
 							if (!getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO')) {
 								$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 								$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';

From 133c67510cdb8cd740061584e6c237bfcfd9b607 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 20 Jan 2025 16:23:29 +0100
Subject: [PATCH 242/243] Qual: Fix phpstan, remove useless test that
 price_var_percent is array

---
 htdocs/variants/class/ProductCombination.class.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index db82c86747a..6b6524028fb 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2016		Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2018		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2022   	Open-Dsi				<support@open-dsi.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -884,11 +884,7 @@ class ProductCombination
 				$productCombinationLevel->fk_price_level = $i;
 				$productCombinationLevel->variation_price = $price_impact[$i];
 
-				if (is_array($price_var_percent)) {
-					$productCombinationLevel->variation_price_percentage = (bool) $price_var_percent[$i] ;
-				} else {
-					$productCombinationLevel->variation_price_percentage = $price_var_percent;
-				}
+				$productCombinationLevel->variation_price_percentage = (bool) $price_var_percent[$i] ;
 
 				$newcomb->combination_price_levels[$i] = $productCombinationLevel;
 			}

From 297e9316a84294a29d49b5c0cfdf0bf94a15ced2 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 20 Jan 2025 19:30:24 +0100
Subject: [PATCH 243/243] Clean code

---
 htdocs/adherents/class/api_memberstypes.class.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 32e9e105fa2..a110c4992ac 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -39,7 +39,7 @@ class MembersTypes extends DolibarrApi
 	 */
 	public function __construct()
 	{
-		global $db, $conf;
+		global $db;
 		$this->db = $db;
 	}
 
@@ -89,8 +89,6 @@ class MembersTypes extends DolibarrApi
 	 */
 	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '', $properties = '')
 	{
-		global $db, $conf;
-
 		$obj_ret = array();
 
 		if (!DolibarrApiAccess::$user->hasRight('adherent', 'lire')) {
@@ -151,8 +149,8 @@ class MembersTypes extends DolibarrApi
 		if (!DolibarrApiAccess::$user->hasRight('adherent', 'configurer')) {
 			throw new RestException(401);
 		}
-		// Check mandatory fields
-		$result = $this->_validate($request_data);
+		// Check mandatory fields. Throw exception on error.
+		$this->_validate($request_data);
 
 		$membertype = new AdherentType($this->db);
 		foreach ($request_data as $field => $value) {