From 2e14655fa0b5bc45778cc3e4b393a737480a7472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 4 Jul 2023 20:50:57 +0200
Subject: [PATCH 01/69] unify categories

---
 htdocs/filefunc.inc.php                       |  2 +-
 .../install/mysql/migration/18.0.0-19.0.0.sql | 67 +++++++++++++++++++
 .../mysql/tables/llx_c_category.key.sql       | 19 ++++++
 .../install/mysql/tables/llx_c_category.sql   | 25 +++++++
 ...e.key.sql => llx_element_category.key.sql} |  4 +-
 ...categorie.sql => llx_element_category.sql} |  4 +-
 htdocs/install/upgrade2.php                   | 37 ++++++++++
 htdocs/langs/en_US/install.lang               |  1 +
 8 files changed, 154 insertions(+), 5 deletions(-)
 create mode 100644 htdocs/install/mysql/migration/18.0.0-19.0.0.sql
 create mode 100644 htdocs/install/mysql/tables/llx_c_category.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_c_category.sql
 rename htdocs/install/mysql/tables/{llx_element_categorie.key.sql => llx_element_category.key.sql} (78%)
 rename htdocs/install/mysql/tables/{llx_element_categorie.sql => llx_element_category.sql} (93%)

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index f4f7e281cd3aa..8626ecbb6b791 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -34,7 +34,7 @@
 	define('DOL_APPLICATION_TITLE', 'Dolibarr');
 }
 if (!defined('DOL_VERSION')) {
-	define('DOL_VERSION', '18.0.0-beta'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '19.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {
diff --git a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
new file mode 100644
index 0000000000000..65ffef53ff239
--- /dev/null
+++ b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
@@ -0,0 +1,67 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 19.0.0 or higher.
+--
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table;
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex;
+-- To make pk to be auto increment (mysql):
+-- -- VMYSQL4.3 ALTER TABLE llx_table ADD PRIMARY KEY(rowid);
+-- -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres):
+-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
+-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
+-- -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN rowid SET DEFAULT nextval('llx_table_rowid_seq');
+-- -- VPGSQL8.2 SELECT setval('llx_table_rowid_seq', MAX(rowid)) FROM llx_table;
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+-- To rebuild sequence for postgresql after insert by forcing id autoincrement fields:
+-- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
+
+
+-- v19
+create table llx_c_category
+(
+  rowid       integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+  classname   varchar(32) NOT NULL,
+  module      varchar(32) NOT NULL
+)ENGINE=innodb;
+
+ALTER TABLE llx_c_category ADD UNIQUE INDEX uk_c_module(module);
+
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (0, 'product', 'Product');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (1, 'supplier', 'Fournisseur');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (2, 'customer', 'Societe');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (3, 'member', 'Adherent');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (4, 'contact', 'Contact');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (5, 'bank_account', 'Account');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (6, 'project', 'Project');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (7, 'user', 'User');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (8, 'bank_line', 'AccountLine');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (9, 'warehouse', 'Entrepot');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (10, 'actioncomm', 'Actioncomm');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (11, 'website_page', 'WebsitePage');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (12, 'ticket', 'Ticket');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (13, 'knowledgemanagement', 'KnowledgeRecord');
+
+-- VMYSQL4.1 DROP INDEX idx_element_categorie_idx  on llx_element_categorie;
+-- VPGSQL8.2 DROP INDEX idx_element_categorie_idx;
+ALTER TABLE llx_element_categorie DROP FOREIGN KEY fk_element_categorie_fk_categorie;
+ALTER TABLE llx_element_categorie CHANGE COLUMN fk_categorie fk_category integer NOT NULL;
+ALTER TABLE llx_element_categorie RENAME TO llx_element_category;
+
+ALTER TABLE llx_element_category ADD UNIQUE INDEX idx_element_category_idx (fk_element, fk_category);
+ALTER TABLE llx_element_category ADD CONSTRAINT fk_element_category_fk_category FOREIGN KEY (fk_category) REFERENCES llx_categorie(rowid);
diff --git a/htdocs/install/mysql/tables/llx_c_category.key.sql b/htdocs/install/mysql/tables/llx_c_category.key.sql
new file mode 100644
index 0000000000000..9cfd48b25363f
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_category.key.sql
@@ -0,0 +1,19 @@
+-- ========================================================================
+-- Copyright (C) 2023 Frédéric France      <frederic.france@netlogic.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
+-- 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/>.
+--
+-- ========================================================================
+
+ALTER TABLE llx_c_category ADD UNIQUE INDEX uk_c_module(module);
diff --git a/htdocs/install/mysql/tables/llx_c_category.sql b/htdocs/install/mysql/tables/llx_c_category.sql
new file mode 100644
index 0000000000000..ecb1977ca6736
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_category.sql
@@ -0,0 +1,25 @@
+-- ========================================================================
+-- Copyright (C) 2023 Frédéric France      <frederic.france@netlogic.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
+-- 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/>.
+--
+-- ========================================================================
+
+create table llx_c_category
+(
+  rowid         integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+  classname     varchar(32) NOT NULL,
+  module        varchar(32) NULL
+)ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_element_categorie.key.sql b/htdocs/install/mysql/tables/llx_element_category.key.sql
similarity index 78%
rename from htdocs/install/mysql/tables/llx_element_categorie.key.sql
rename to htdocs/install/mysql/tables/llx_element_category.key.sql
index 9bc70cf0863a2..263be886b44e6 100644
--- a/htdocs/install/mysql/tables/llx_element_categorie.key.sql
+++ b/htdocs/install/mysql/tables/llx_element_category.key.sql
@@ -17,6 +17,6 @@
 -- ============================================================================
 
 
-ALTER TABLE llx_element_categorie ADD UNIQUE INDEX idx_element_categorie_idx (fk_element, fk_categorie);
+ALTER TABLE llx_element_category ADD UNIQUE INDEX idx_element_category_idx (fk_element, fk_category);
 
-ALTER TABLE llx_element_categorie ADD CONSTRAINT fk_element_categorie_fk_categorie FOREIGN KEY (fk_categorie) REFERENCES llx_categorie(rowid);
+ALTER TABLE llx_element_category ADD CONSTRAINT fk_element_category_fk_category FOREIGN KEY (fk_categorie) REFERENCES llx_categorie(rowid);
diff --git a/htdocs/install/mysql/tables/llx_element_categorie.sql b/htdocs/install/mysql/tables/llx_element_category.sql
similarity index 93%
rename from htdocs/install/mysql/tables/llx_element_categorie.sql
rename to htdocs/install/mysql/tables/llx_element_category.sql
index a1c7fddb0eb7a..20df8a4d643f5 100644
--- a/htdocs/install/mysql/tables/llx_element_categorie.sql
+++ b/htdocs/install/mysql/tables/llx_element_category.sql
@@ -16,10 +16,10 @@
 --
 -- ============================================================================
 
-create table llx_element_categorie
+create table llx_element_category
 (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  fk_categorie  integer NOT NULL,
+  fk_category  integer NOT NULL,
   fk_element  integer NOT NULL,
   import_key    varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 1dc5c7337d407..785e228be84ac 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -499,6 +499,13 @@
 			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
 				migrate_contractdet_rank();
 			}
+			// Scripts for 19.0
+			$afterversionarray = explode('.', '18.0.9');
+			$beforeversionarray = explode('.', '19.0.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				// migrate categories
+				migrate_element_category($db, $langs, $conf);
+			}
 		}
 
 
@@ -3312,6 +3319,36 @@ function migrate_actioncomm_element($db, $langs, $conf)
 	print '</td></tr>';
 }
 
+/**
+ * Migrate categories in one table
+ *
+ * @param	DoliDB		$db		Database handler
+ * @param	Translate	$langs	Object langs
+ * @param	Conf		$conf	Object conf
+ * @return	void
+ */
+function migrate_element_category($db, $langs, $conf)
+{
+	dolibarr_install_syslog("upgrade2::migrate_element_time");
+
+	print '<tr><td colspan="4">';
+
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationCategories')."</b><br>\n";
+
+	$error = 0;
+
+	$db->begin();
+
+	if ($error == 0) {
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
+
+	print '</td></tr>';
+}
+
 /**
  * Migrate link stored into fk_mode_reglement
  *
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 58e57018ac397..155b0d5c57164 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -190,6 +190,7 @@ MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
+MigrationCategories=Update data on categories
 MigrationPaymentMode=Data migration for payment type
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignment table

From f1cdfef7bf6814cff80cd4d5221dda011c92d253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 4 Jul 2023 20:56:30 +0200
Subject: [PATCH 02/69] unify categories

unify categories

unify categories
---
 htdocs/install/mysql/data/llx_c_category.sql  | 33 +++++++++++++++++++
 .../install/mysql/migration/18.0.0-19.0.0.sql |  2 +-
 .../install/mysql/tables/llx_c_category.sql   |  2 +-
 .../mysql/tables/llx_element_category.sql     |  2 +-
 4 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 htdocs/install/mysql/data/llx_c_category.sql

diff --git a/htdocs/install/mysql/data/llx_c_category.sql b/htdocs/install/mysql/data/llx_c_category.sql
new file mode 100644
index 0000000000000..8bbac804938b5
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_category.sql
@@ -0,0 +1,33 @@
+-- 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/>.
+--
+--
+
+-- WARNING
+-- Do not place a comment at the end of the line, this file is parsed during
+-- installation and all '--' symbols are removed.
+--
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (0, 'product', 'Product');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (1, 'supplier', 'Fournisseur');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (2, 'customer', 'Societe');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (3, 'member', 'Adherent');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (4, 'contact', 'Contact');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (5, 'bank_account', 'Account');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (6, 'project', 'Project');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (7, 'user', 'User');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (8, 'bank_line', 'AccountLine');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (9, 'warehouse', 'Entrepot');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (10, 'actioncomm', 'Actioncomm');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (11, 'website_page', 'WebsitePage');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (12, 'ticket', 'Ticket');
+INSERT INTO llx_c_category (rowid,module,classname) VALUES (13, 'knowledgemanagement', 'KnowledgeRecord');
diff --git a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
index 65ffef53ff239..07da35f94ecb5 100644
--- a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
+++ b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
@@ -33,7 +33,7 @@
 
 
 -- v19
-create table llx_c_category
+CREATE TABLE llx_c_category
 (
   rowid       integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
   classname   varchar(32) NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_c_category.sql b/htdocs/install/mysql/tables/llx_c_category.sql
index ecb1977ca6736..dc35cf9dd90e7 100644
--- a/htdocs/install/mysql/tables/llx_c_category.sql
+++ b/htdocs/install/mysql/tables/llx_c_category.sql
@@ -16,7 +16,7 @@
 --
 -- ========================================================================
 
-create table llx_c_category
+CREATE TABLE llx_c_category
 (
   rowid         integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
   classname     varchar(32) NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_element_category.sql b/htdocs/install/mysql/tables/llx_element_category.sql
index 20df8a4d643f5..96ee906de448a 100644
--- a/htdocs/install/mysql/tables/llx_element_category.sql
+++ b/htdocs/install/mysql/tables/llx_element_category.sql
@@ -16,7 +16,7 @@
 --
 -- ============================================================================
 
-create table llx_element_category
+CREATE TABLE llx_element_category
 (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
   fk_category  integer NOT NULL,

From 81777588e02dd2076511f1deec762cd4d94d2c9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 4 Jul 2023 21:59:24 +0200
Subject: [PATCH 03/69] unify categories

---
 htdocs/install/upgrade2.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 785e228be84ac..8b43858b39263 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3329,7 +3329,7 @@ function migrate_actioncomm_element($db, $langs, $conf)
  */
 function migrate_element_category($db, $langs, $conf)
 {
-	dolibarr_install_syslog("upgrade2::migrate_element_time");
+	dolibarr_install_syslog("upgrade2::migrate_element_category");
 
 	print '<tr><td colspan="4">';
 
@@ -3340,6 +3340,17 @@ function migrate_element_category($db, $langs, $conf)
 
 	$db->begin();
 
+	// product
+	$sql = 'SELECT fk_categorie, fk_product, import_key FROM '.MAIN_DB_PREFIX."categorie_product";
+	$result = $db->query($sql);
+	if ($result) {
+		while ($obj = $db->fetch_object($result)) {
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_product.')');
+		}
+	} else {
+		$error++;
+	}
+
 	if ($error == 0) {
 		$db->commit();
 	} else {

From d65ac6952f4641de63da4d5971c595ddb47faf85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 4 Jul 2023 22:14:18 +0200
Subject: [PATCH 04/69] unify categories

---
 htdocs/install/upgrade2.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 8b43858b39263..4bd1ede9e93bf 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3345,7 +3345,18 @@ function migrate_element_category($db, $langs, $conf)
 	$result = $db->query($sql);
 	if ($result) {
 		while ($obj = $db->fetch_object($result)) {
-			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_product.')');
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_product.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+		}
+	} else {
+		$error++;
+	}
+
+	// supplier
+	$sql = 'SELECT fk_categorie, fk_soc, import_key FROM '.MAIN_DB_PREFIX."categorie_fournisseur";
+	$result = $db->query($sql);
+	if ($result) {
+		while ($obj = $db->fetch_object($result)) {
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_soc.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
 		}
 	} else {
 		$error++;

From f5b3fee94a4dd65f755bc26b905d9e8abd0086e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 4 Jul 2023 22:16:58 +0200
Subject: [PATCH 05/69] unify categories

---
 htdocs/install/upgrade2.php     | 55 ++++++++++++++++++++++++++++-----
 htdocs/langs/en_US/install.lang |  2 +-
 2 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 4bd1ede9e93bf..aec925a93d494 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3331,44 +3331,85 @@ function migrate_element_category($db, $langs, $conf)
 {
 	dolibarr_install_syslog("upgrade2::migrate_element_category");
 
-	print '<tr><td colspan="4">';
-
-	print '<br>';
-	print '<b>'.$langs->trans('MigrationCategories')."</b><br>\n";
-
 	$error = 0;
 
 	$db->begin();
 
 	// product
+	print '<tr><td colspan="4">';
 	$sql = 'SELECT fk_categorie, fk_product, import_key FROM '.MAIN_DB_PREFIX."categorie_product";
 	$result = $db->query($sql);
 	if ($result) {
 		while ($obj = $db->fetch_object($result)) {
 			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_product.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
 		}
+		print '<b>'.$langs->trans('MigrationCategories', 'Products')."</b><br>\n";
 	} else {
 		$error++;
 	}
+	print '</td></tr>';
 
 	// supplier
+	print '<tr><td colspan="4">';
 	$sql = 'SELECT fk_categorie, fk_soc, import_key FROM '.MAIN_DB_PREFIX."categorie_fournisseur";
 	$result = $db->query($sql);
 	if ($result) {
 		while ($obj = $db->fetch_object($result)) {
 			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_soc.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
 		}
+		print '<b>'.$langs->trans('MigrationCategories', 'Suppliers')."</b><br>\n";
 	} else {
 		$error++;
 	}
+	print '</td></tr>';
+
+	// customer
+	print '<tr><td colspan="4">';
+	$sql = 'SELECT fk_categorie, fk_soc, import_key FROM '.MAIN_DB_PREFIX."categorie_societe";
+	$result = $db->query($sql);
+	if ($result) {
+		while ($obj = $db->fetch_object($result)) {
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_soc.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+		}
+		print '<b>'.$langs->trans('MigrationCategories', 'Customers')."</b><br>\n";
+	} else {
+		$error++;
+	}
+	print '</td></tr>';
+
+	// member
+	print '<tr><td colspan="4">';
+	$sql = 'SELECT fk_categorie, fk_member FROM '.MAIN_DB_PREFIX."categorie_member";
+	$result = $db->query($sql);
+	if ($result) {
+		while ($obj = $db->fetch_object($result)) {
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_member.')');
+		}
+		print '<b>'.$langs->trans('MigrationCategories', 'Members')."</b><br>\n";
+	} else {
+		$error++;
+	}
+	print '</td></tr>';
+
+	// contact
+	print '<tr><td colspan="4">';
+	$sql = 'SELECT fk_categorie, fk_socpeople, import_key FROM '.MAIN_DB_PREFIX."categorie_contact";
+	$result = $db->query($sql);
+	if ($result) {
+		while ($obj = $db->fetch_object($result)) {
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_socpeople.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+		}
+		print '<b>'.$langs->trans('MigrationCategories', 'Contacts')."</b><br>\n";
+	} else {
+		$error++;
+	}
+	print '</td></tr>';
 
 	if ($error == 0) {
 		$db->commit();
 	} else {
 		$db->rollback();
 	}
-
-	print '</td></tr>';
 }
 
 /**
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 155b0d5c57164..9618c1b58f2a3 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -190,7 +190,7 @@ MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
-MigrationCategories=Update data on categories
+MigrationCategories=Update data on %s categories
 MigrationPaymentMode=Data migration for payment type
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignment table

From be7b6b24f06adc68f9b9e39499fc936efb53ef71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 4 Jul 2023 23:00:17 +0200
Subject: [PATCH 06/69] unify categories

---
 htdocs/install/upgrade2.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index aec925a93d494..0f6e95c7b435a 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3405,6 +3405,20 @@ function migrate_element_category($db, $langs, $conf)
 	}
 	print '</td></tr>';
 
+	// bank_account
+	print '<tr><td colspan="4">';
+	$sql = 'SELECT fk_categorie, fk_account, import_key FROM '.MAIN_DB_PREFIX."categorie_account";
+	$result = $db->query($sql);
+	if ($result) {
+		while ($obj = $db->fetch_object($result)) {
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_account.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+		}
+		print '<b>'.$langs->trans('MigrationCategories', 'Accounts')."</b><br>\n";
+	} else {
+		$error++;
+	}
+	print '</td></tr>';
+
 	if ($error == 0) {
 		$db->commit();
 	} else {

From d4cf3a4da1e23cc728dc6ccb695b02b6d894f1bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 5 Jul 2023 12:25:12 +0200
Subject: [PATCH 07/69] unify categories

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

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 8626ecbb6b791..e9d2069154f89 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -34,7 +34,7 @@
 	define('DOL_APPLICATION_TITLE', 'Dolibarr');
 }
 if (!defined('DOL_VERSION')) {
-	define('DOL_VERSION', '19.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '19.0.0-dev'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {

From b46a48d0d91be78bdf4092d9cf45231065007856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 5 Jul 2023 21:44:17 +0200
Subject: [PATCH 08/69] unify categories

---
 htdocs/install/upgrade2.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 0f6e95c7b435a..eac9f234aa147 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3419,6 +3419,34 @@ function migrate_element_category($db, $langs, $conf)
 	}
 	print '</td></tr>';
 
+	// project
+	print '<tr><td colspan="4">';
+	$sql = 'SELECT fk_categorie, fk_project, import_key FROM '.MAIN_DB_PREFIX."categorie_project";
+	$result = $db->query($sql);
+	if ($result) {
+		while ($obj = $db->fetch_object($result)) {
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_project.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+		}
+		print '<b>'.$langs->trans('MigrationCategories', 'Projects')."</b><br>\n";
+	} else {
+		$error++;
+	}
+	print '</td></tr>';
+
+	// user
+	print '<tr><td colspan="4">';
+	$sql = 'SELECT fk_categorie, fk_user, import_key FROM '.MAIN_DB_PREFIX."categorie_user";
+	$result = $db->query($sql);
+	if ($result) {
+		while ($obj = $db->fetch_object($result)) {
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_user.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+		}
+		print '<b>'.$langs->trans('MigrationCategories', 'Users')."</b><br>\n";
+	} else {
+		$error++;
+	}
+	print '</td></tr>';
+
 	if ($error == 0) {
 		$db->commit();
 	} else {

From b48eb4df2d5bf476582670fcc06fc2cc20c69cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 5 Jul 2023 22:24:50 +0200
Subject: [PATCH 09/69] unify categories

---
 htdocs/install/upgrade2.php | 51 +++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index eac9f234aa147..cb879f80a21f1 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3447,6 +3447,57 @@ function migrate_element_category($db, $langs, $conf)
 	}
 	print '</td></tr>';
 
+	// warehouse
+	print '<tr><td colspan="4">';
+	$sql = 'SELECT fk_categorie, fk_warehouse, import_key FROM '.MAIN_DB_PREFIX."categorie_warehouse";
+	$result = $db->query($sql);
+	if ($result) {
+		while ($obj = $db->fetch_object($result)) {
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_warehouse.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+		}
+		print '<b>'.$langs->trans('MigrationCategories', 'Warehouses')."</b><br>\n";
+	} else {
+		$error++;
+	}
+	print '</td></tr>';
+
+	// actioncomm
+	print '<tr><td colspan="4">';
+	$sql = 'SELECT fk_categorie, fk_actioncomm, import_key FROM '.MAIN_DB_PREFIX."categorie_actioncomm";
+	$result = $db->query($sql);
+	if ($result) {
+		while ($obj = $db->fetch_object($result)) {
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_actioncomm.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+		}
+		print '<b>'.$langs->trans('MigrationCategories', 'Actioncomms')."</b><br>\n";
+	} else {
+		$error++;
+	}
+	print '</td></tr>';
+
+	// website_page
+	print '<tr><td colspan="4">';
+	// if module website never enabled, table may not exist
+	if ($db->DDLDescTable(MAIN_DB_PREFIX."categorie_website_page")) {
+		$sql = 'SELECT fk_categorie, fk_website_page, import_key FROM '.MAIN_DB_PREFIX."categorie_website_page";
+		$result = $db->query($sql);
+		if ($result) {
+			while ($obj = $db->fetch_object($result)) {
+				$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_website_page.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+			}
+			print '<b>'.$langs->trans('MigrationCategories', 'WebsitePages')."</b><br>\n";
+		} else {
+			$error++;
+		}
+	} else {
+		print '<b>'.$langs->trans('MigrationCategories', 'WebsitePages')." Table not found</b><br>\n";
+	}
+	print '</td></tr>';
+
+	// ticket
+
+	// knowledgemanagement
+
 	if ($error == 0) {
 		$db->commit();
 	} else {

From 4e2c53f9bf83b2b11a2a38294cde92bcfd080f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 5 Jul 2023 23:14:16 +0200
Subject: [PATCH 10/69] unify categories

---
 htdocs/install/upgrade2.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index cb879f80a21f1..cd2ed26d83d61 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3495,6 +3495,23 @@ function migrate_element_category($db, $langs, $conf)
 	print '</td></tr>';
 
 	// ticket
+	print '<tr><td colspan="4">';
+	// if module ticket never enabled, table may not exist
+	if ($db->DDLDescTable(MAIN_DB_PREFIX."categorie_ticket")) {
+		$sql = 'SELECT fk_categorie, fk_ticket, import_key FROM '.MAIN_DB_PREFIX."categorie_ticket";
+		$result = $db->query($sql);
+		if ($result) {
+			while ($obj = $db->fetch_object($result)) {
+				$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_ticket.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+			}
+			print '<b>'.$langs->trans('MigrationCategories', 'Tickets')."</b><br>\n";
+		} else {
+			$error++;
+		}
+	} else {
+		print '<b>'.$langs->trans('MigrationCategories', 'Tickets')." Table not found</b><br>\n";
+	}
+	print '</td></tr>';
 
 	// knowledgemanagement
 

From d39dd4b85123092a5394485de03a6909afca0055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 6 Jul 2023 01:07:50 +0200
Subject: [PATCH 11/69] unify categories

---
 htdocs/install/upgrade2.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index cd2ed26d83d61..864c225679f16 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3514,6 +3514,23 @@ function migrate_element_category($db, $langs, $conf)
 	print '</td></tr>';
 
 	// knowledgemanagement
+	print '<tr><td colspan="4">';
+	// if module knowledgemanagement never enabled, table may not exist
+	if ($db->DDLDescTable(MAIN_DB_PREFIX."categorie_knowledgemanagement")) {
+		$sql = 'SELECT fk_categorie, fk_knowledgemanagement, import_key FROM '.MAIN_DB_PREFIX."categorie_knowledgemanagement";
+		$result = $db->query($sql);
+		if ($result) {
+			while ($obj = $db->fetch_object($result)) {
+				$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_knowledgemanagement.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+			}
+			print '<b>'.$langs->trans('MigrationCategories', 'Knowledgemanagement')."</b><br>\n";
+		} else {
+			$error++;
+		}
+	} else {
+		print '<b>'.$langs->trans('MigrationCategories', 'Knowledgemanagement')." Table not found</b><br>\n";
+	}
+	print '</td></tr>';
 
 	if ($error == 0) {
 		$db->commit();

From a6e00a1de17f65d649c533c871b7d48516b39a22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 7 Jul 2023 16:27:21 +0200
Subject: [PATCH 12/69] wip

---
 htdocs/categories/class/categorie.class.php   | 104 +++++++++++-------
 htdocs/install/mysql/data/llx_c_category.sql  |  28 ++---
 .../install/mysql/migration/18.0.0-19.0.0.sql |  30 ++---
 .../install/mysql/tables/llx_c_category.sql   |   2 +-
 4 files changed, 93 insertions(+), 71 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 3f9524d3f6e2e..2552667670053 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -72,42 +72,43 @@ class Categorie extends CommonObject
 	 * @var array Table of mapping between type string and ID used for field 'type' in table llx_categories
 	 */
 	protected $MAP_ID = array(
-		'product'      => 0,
-		'supplier'     => 1,
-		'customer'     => 2,
-		'member'       => 3,
-		'contact'      => 4,
-		'bank_account' => 5,
-		'project'      => 6,
-		'user'         => 7,
-		'bank_line'    => 8,
-		'warehouse'    => 9,
-		'actioncomm'   => 10,
-		'website_page' => 11,
-		'ticket'       => 12,
-		'knowledgemanagement' => 13
+		// 'product'      => 0,
+		// 'supplier'     => 1,
+		// 'customer'     => 2,
+		// 'member'       => 3,
+		// 'contact'      => 4,
+		// 'bank_account' => 5,
+		// 'project'      => 6,
+		// 'user'         => 7,
+		// 'bank_line'    => 8,
+		// 'warehouse'    => 9,
+		// 'actioncomm'   => 10,
+		// 'website_page' => 11,
+		// 'ticket'       => 12,
+		// 'knowledgemanagement' => 13
 	);
 
 	/**
 	 * @var array Code mapping from ID
 	 *
 	 * @note This array should be removed in future, once previous constants are moved to the string value. Deprecated
+	 * @deprecated
 	 */
 	public static $MAP_ID_TO_CODE = array(
-		0 => 'product',
-		1 => 'supplier',
-		2 => 'customer',
-		3 => 'member',
-		4 => 'contact',
-		5 => 'bank_account',
-		6 => 'project',
-		7 => 'user',
-		8 => 'bank_line',
-		9 => 'warehouse',
-		10 => 'actioncomm',
-		11 => 'website_page',
-		12 => 'ticket',
-		13 => 'knowledgemanagement'
+		// 0 => 'product',
+		// 1 => 'supplier',
+		// 2 => 'customer',
+		// 3 => 'member',
+		// 4 => 'contact',
+		// 5 => 'bank_account',
+		// 6 => 'project',
+		// 7 => 'user',
+		// 8 => 'bank_line',
+		// 9 => 'warehouse',
+		// 10 => 'actioncomm',
+		// 11 => 'website_page',
+		// 12 => 'ticket',
+		// 13 => 'knowledgemanagement'
 	);
 
 	/**
@@ -139,20 +140,20 @@ class Categorie extends CommonObject
 	 * @note Move to const array when PHP 5.6 will be our minimum target
 	 */
 	public $MAP_OBJ_CLASS = array(
-		'product'  => 'Product',
-		'customer' => 'Societe',
-		'supplier' => 'Fournisseur',
-		'member'   => 'Adherent',
-		'contact'  => 'Contact',
-		'user'     => 'User',
-		'account'  => 'Account', // old for bank account
-		'bank_account'  => 'Account',
-		'project'  => 'Project',
-		'warehouse'=> 'Entrepot',
-		'actioncomm' => 'ActionComm',
-		'website_page' => 'WebsitePage',
-		'ticket' => 'Ticket',
-		'knowledgemanagement' => 'KnowledgeRecord'
+		// 'product'  => 'Product',
+		// 'customer' => 'Societe',
+		// 'supplier' => 'Fournisseur',
+		// 'member'   => 'Adherent',
+		// 'contact'  => 'Contact',
+		// 'user'     => 'User',
+		// 'account'  => 'Account', // old for bank account
+		// 'bank_account'  => 'Account',
+		// 'project'  => 'Project',
+		// 'warehouse'=> 'Entrepot',
+		// 'actioncomm' => 'ActionComm',
+		// 'website_page' => 'WebsitePage',
+		// 'ticket' => 'Ticket',
+		// 'knowledgemanagement' => 'KnowledgeRecord'
 	);
 
 	/**
@@ -276,6 +277,8 @@ public function __construct($db)
 
 		$this->db = $db;
 
+		$this->getMapId();
+
 		if (is_object($hookmanager)) {
 			$hookmanager->initHooks(array('category'));
 			$parameters = array();
@@ -295,6 +298,23 @@ public function __construct($db)
 		}
 	}
 
+	/**
+	 * getMapId from table llx_c_category
+	 * @return void
+	 */
+	private function getMapId()
+	{
+		$resql = $this->db->query('SELECT id, module, classname FROM '.$this->db->prefix().'c_category');
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$this->MAP_ID[$obj->module] = $obj->id;
+				$this->MAP_ID_TO_CODE[$obj->id] = $obj->module;
+				$this->MAP_OBJ_CLASS[$obj->module] = $obj->classname;
+			}
+		}
+
+	}
+
 	/**
 	 * Get map list
 	 *
diff --git a/htdocs/install/mysql/data/llx_c_category.sql b/htdocs/install/mysql/data/llx_c_category.sql
index 8bbac804938b5..359e9f2f29192 100644
--- a/htdocs/install/mysql/data/llx_c_category.sql
+++ b/htdocs/install/mysql/data/llx_c_category.sql
@@ -17,17 +17,17 @@
 -- Do not place a comment at the end of the line, this file is parsed during
 -- installation and all '--' symbols are removed.
 --
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (0, 'product', 'Product');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (1, 'supplier', 'Fournisseur');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (2, 'customer', 'Societe');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (3, 'member', 'Adherent');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (4, 'contact', 'Contact');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (5, 'bank_account', 'Account');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (6, 'project', 'Project');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (7, 'user', 'User');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (8, 'bank_line', 'AccountLine');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (9, 'warehouse', 'Entrepot');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (10, 'actioncomm', 'Actioncomm');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (11, 'website_page', 'WebsitePage');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (12, 'ticket', 'Ticket');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (13, 'knowledgemanagement', 'KnowledgeRecord');
+INSERT INTO llx_c_category (id,module,classname) VALUES (0, 'product', 'Product');
+INSERT INTO llx_c_category (id,module,classname) VALUES (1, 'supplier', 'Fournisseur');
+INSERT INTO llx_c_category (id,module,classname) VALUES (2, 'customer', 'Societe');
+INSERT INTO llx_c_category (id,module,classname) VALUES (3, 'member', 'Adherent');
+INSERT INTO llx_c_category (id,module,classname) VALUES (4, 'contact', 'Contact');
+INSERT INTO llx_c_category (id,module,classname) VALUES (5, 'bank_account', 'Account');
+INSERT INTO llx_c_category (id,module,classname) VALUES (6, 'project', 'Project');
+INSERT INTO llx_c_category (id,module,classname) VALUES (7, 'user', 'User');
+INSERT INTO llx_c_category (id,module,classname) VALUES (8, 'bank_line', 'AccountLine');
+INSERT INTO llx_c_category (id,module,classname) VALUES (9, 'warehouse', 'Entrepot');
+INSERT INTO llx_c_category (id,module,classname) VALUES (10, 'actioncomm', 'Actioncomm');
+INSERT INTO llx_c_category (id,module,classname) VALUES (11, 'website_page', 'WebsitePage');
+INSERT INTO llx_c_category (id,module,classname) VALUES (12, 'ticket', 'Ticket');
+INSERT INTO llx_c_category (id,module,classname) VALUES (13, 'knowledgemanagement', 'KnowledgeRecord');
diff --git a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
index 07da35f94ecb5..d8f7454ccd3dd 100644
--- a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
+++ b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
@@ -36,26 +36,28 @@
 CREATE TABLE llx_c_category
 (
   rowid       integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+  id          integer NOT NULL,
   classname   varchar(32) NOT NULL,
   module      varchar(32) NOT NULL
 )ENGINE=innodb;
 
 ALTER TABLE llx_c_category ADD UNIQUE INDEX uk_c_module(module);
+ALTER TABLE llx_c_category ADD UNIQUE INDEX idx_id_idx (id);
 
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (0, 'product', 'Product');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (1, 'supplier', 'Fournisseur');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (2, 'customer', 'Societe');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (3, 'member', 'Adherent');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (4, 'contact', 'Contact');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (5, 'bank_account', 'Account');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (6, 'project', 'Project');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (7, 'user', 'User');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (8, 'bank_line', 'AccountLine');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (9, 'warehouse', 'Entrepot');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (10, 'actioncomm', 'Actioncomm');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (11, 'website_page', 'WebsitePage');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (12, 'ticket', 'Ticket');
-INSERT INTO llx_c_category (rowid,module,classname) VALUES (13, 'knowledgemanagement', 'KnowledgeRecord');
+INSERT INTO llx_c_category (id,module,classname) VALUES (0, 'product', 'Product');
+INSERT INTO llx_c_category (id,module,classname) VALUES (1, 'supplier', 'Fournisseur');
+INSERT INTO llx_c_category (id,module,classname) VALUES (2, 'customer', 'Societe');
+INSERT INTO llx_c_category (id,module,classname) VALUES (3, 'member', 'Adherent');
+INSERT INTO llx_c_category (id,module,classname) VALUES (4, 'contact', 'Contact');
+INSERT INTO llx_c_category (id,module,classname) VALUES (5, 'bank_account', 'Account');
+INSERT INTO llx_c_category (id,module,classname) VALUES (6, 'project', 'Project');
+INSERT INTO llx_c_category (id,module,classname) VALUES (7, 'user', 'User');
+INSERT INTO llx_c_category (id,module,classname) VALUES (8, 'bank_line', 'AccountLine');
+INSERT INTO llx_c_category (id,module,classname) VALUES (9, 'warehouse', 'Entrepot');
+INSERT INTO llx_c_category (id,module,classname) VALUES (10, 'actioncomm', 'Actioncomm');
+INSERT INTO llx_c_category (id,module,classname) VALUES (11, 'website_page', 'WebsitePage');
+INSERT INTO llx_c_category (id,module,classname) VALUES (12, 'ticket', 'Ticket');
+INSERT INTO llx_c_category (id,module,classname) VALUES (13, 'knowledgemanagement', 'KnowledgeRecord');
 
 -- VMYSQL4.1 DROP INDEX idx_element_categorie_idx  on llx_element_categorie;
 -- VPGSQL8.2 DROP INDEX idx_element_categorie_idx;
diff --git a/htdocs/install/mysql/tables/llx_c_category.sql b/htdocs/install/mysql/tables/llx_c_category.sql
index dc35cf9dd90e7..3175a1784a837 100644
--- a/htdocs/install/mysql/tables/llx_c_category.sql
+++ b/htdocs/install/mysql/tables/llx_c_category.sql
@@ -19,7 +19,7 @@
 CREATE TABLE llx_c_category
 (
   rowid         integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+  id            integer NOT NULL,
   classname     varchar(32) NOT NULL,
   module        varchar(32) NULL
 )ENGINE=innodb;
-

From bf7b40fed7502abb62f73d463711985b790b4b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 7 Jul 2023 16:58:25 +0200
Subject: [PATCH 13/69] wip unify categories

---
 htdocs/categories/class/categorie.class.php |  2 +-
 htdocs/categories/edit.php                  |  2 +-
 htdocs/categories/index.php                 |  2 +-
 htdocs/categories/info.php                  |  2 +-
 htdocs/categories/photos.php                |  2 +-
 htdocs/categories/traduction.php            |  2 +-
 htdocs/categories/viewcat.php               |  2 +-
 htdocs/core/class/extrafields.class.php     |  6 +++--
 htdocs/core/modules/modCategorie.class.php  | 29 +++++++++++----------
 htdocs/takepos/admin/orderprinters.php      |  3 ++-
 10 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 2552667670053..05b2c1ddafbc2 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1519,7 +1519,7 @@ public function containing($id, $type, $mode = 'object')
 		$cats = array();
 
 		if (is_numeric($type)) {
-			$type = Categorie::$MAP_ID_TO_CODE[$type];
+			$type = $this->MAP_ID_TO_CODE[$type];
 		}
 
 		if ($type === Categorie::TYPE_BANK_LINE) {   // TODO Remove this with standard category code after migration of llx_bank_categ into llx_categorie
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index b21d0a1c27cac..025c47b3f2a17 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -64,7 +64,7 @@
 
 $type = $object->type;
 if (is_numeric($type)) {
-	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+	$type = $object->MAP_ID_TO_CODE[$type]; // For backward compatibility
 }
 
 $extrafields = new ExtraFields($db);
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index 69747248906d5..0a6c8a13530b8 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -43,7 +43,7 @@
 
 $categstatic = new Categorie($db);
 if (is_numeric($type)) {
-	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+	$type = $categstatic->MAP_ID_TO_CODE[$type]; // For backward compatibility
 }
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array
diff --git a/htdocs/categories/info.php b/htdocs/categories/info.php
index f5f63091f9cbc..e353da64a962f 100644
--- a/htdocs/categories/info.php
+++ b/htdocs/categories/info.php
@@ -54,7 +54,7 @@
 
 $type = $object->type;
 if (is_numeric($type)) {
-	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+	$type = $object->MAP_ID_TO_CODE[$type]; // For backward compatibility
 }
 
 /*
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index bd98afb87f7cb..dfeec0f5c99bd 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -58,7 +58,7 @@
 
 $type = $object->type;
 if (is_numeric($type)) {
-	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+	$type = $object->MAP_ID_TO_CODE[$type]; // For backward compatibility
 }
 
 $upload_dir = $conf->categorie->multidir_output[$object->entity];
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index b63431780e75b..e0487db7806a0 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -57,7 +57,7 @@
 
 $type = $object->type;
 if (is_numeric($type)) {
-	$type = Categorie::$MAP_ID_TO_CODE[$type];   // For backward compatibility
+	$type = $object->MAP_ID_TO_CODE[$type];   // For backward compatibility
 }
 
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 2ce3706d2164f..99a6b1839196b 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -81,7 +81,7 @@
 
 $type = $object->type;
 if (is_numeric($type)) {
-	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+	$type = $object->MAP_ID_TO_CODE[$type]; // For backward compatibility
 }
 
 $extrafields = new ExtraFields($db);
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 8e74a7c13eb58..4f0b0a1c64f98 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1318,7 +1318,8 @@ public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $
 					}
 				} else {
 					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-					$data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
+					$categorystatic = new Categorie($this->db);
+					$data = $form->select_all_categories($categorystatic->MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
 					$out .= '<option value="0">&nbsp;</option>';
 					if (is_array($data)) {
 						foreach ($data as $data_key => $data_value) {
@@ -1547,7 +1548,8 @@ public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $
 					}
 				} else {
 					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-					$data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
+					$categorystatic = new Categorie($this->db);
+					$data = $form->select_all_categories($categorystatic->MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
 					$out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
 				}
 			}
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index ed84a7e9c4bc9..44e992bcf6096 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -177,7 +177,8 @@ public function __construct($db)
 
 		// 0 Products
 		$r++;
-		$this->export_code[$r] = $this->rights_class.'_0_'.Categorie::$MAP_ID_TO_CODE[0];
+		$categorystatic = new Categorie($this->db);
+		$this->export_code[$r] = $this->rights_class.'_0_'.$categorystatic->MAP_ID_TO_CODE[0];
 		$this->export_label[$r] = 'CatProdList';
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = 'isModEnabled("product") || isModEnabled("service")';
@@ -202,7 +203,7 @@ public function __construct($db)
 
 		// 1 Suppliers
 		$r++;
-		$this->export_code[$r] = $this->rights_class.'_1_'.Categorie::$MAP_ID_TO_CODE[1];
+		$this->export_code[$r] = $this->rights_class.'_1_'.$categorystatic->MAP_ID_TO_CODE[1];
 		$this->export_label[$r] = 'CatSupList';
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = 'isModEnabled("supplier_order") || isModEnabled("supplier_invoice")';
@@ -249,7 +250,7 @@ public function __construct($db)
 
 		// 2 Customers/Prospects
 		$r++;
-		$this->export_code[$r] = $this->rights_class.'_2_'.Categorie::$MAP_ID_TO_CODE[2];
+		$this->export_code[$r] = $this->rights_class.'_2_'.$categorystatic->MAP_ID_TO_CODE[2];
 		$this->export_label[$r] = 'CatCusList';
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = 'isModEnabled("societe")';
@@ -298,7 +299,7 @@ public function __construct($db)
 
 		// 3 Members
 		$r++;
-		$this->export_code[$r] = $this->rights_class.'_3_'.Categorie::$MAP_ID_TO_CODE[3];
+		$this->export_code[$r] = $this->rights_class.'_3_'.$categorystatic->MAP_ID_TO_CODE[3];
 		$this->export_label[$r] = 'CatMemberList';
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = 'isModEnabled("adherent")';
@@ -323,7 +324,7 @@ public function __construct($db)
 
 		// 4 Contacts
 		$r++;
-		$this->export_code[$r] = $this->rights_class.'_4_'.Categorie::$MAP_ID_TO_CODE[4];
+		$this->export_code[$r] = $this->rights_class.'_4_'.$categorystatic->MAP_ID_TO_CODE[4];
 		$this->export_label[$r] = 'CatContactList';
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = 'isModEnabled("societe")';
@@ -382,7 +383,7 @@ public function __construct($db)
 
 		// 6 Projects
 		$r++;
-		$this->export_code[$r] = $this->rights_class.'_6_'.Categorie::$MAP_ID_TO_CODE[6];
+		$this->export_code[$r] = $this->rights_class.'_6_'.$categorystatic->MAP_ID_TO_CODE[6];
 		$this->export_label[$r] = 'CatProjectsList';
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = "isModEnabled('project')";
@@ -408,7 +409,7 @@ public function __construct($db)
 
 		// 7 Users
 		$r++;
-		$this->export_code[$r] = $this->rights_class.'_7_'.Categorie::$MAP_ID_TO_CODE[7];
+		$this->export_code[$r] = $this->rights_class.'_7_'.$categorystatic->MAP_ID_TO_CODE[7];
 		$this->export_label[$r] = 'CatUsersList';
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = 'isModEnabled("user")';
@@ -476,7 +477,7 @@ public function __construct($db)
 		// 0 Products
 		if (isModEnabled("product")) {
 			$r++;
-			$this->import_code[$r] = $this->rights_class.'_0_'.Categorie::$MAP_ID_TO_CODE[0];
+			$this->import_code[$r] = $this->rights_class.'_0_'.$categorystatic->MAP_ID_TO_CODE[0];
 			$this->import_label[$r] = "CatProdLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
@@ -495,7 +496,7 @@ public function __construct($db)
 		// 1 Suppliers
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
 			$r++;
-			$this->import_code[$r] = $this->rights_class.'_1_'.Categorie::$MAP_ID_TO_CODE[1];
+			$this->import_code[$r] = $this->rights_class.'_1_'.$categorystatic->MAP_ID_TO_CODE[1];
 			$this->import_label[$r] = "CatSupLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
@@ -516,7 +517,7 @@ public function __construct($db)
 		// 2 Customers
 		if (isModEnabled("societe")) {
 			$r++;
-			$this->import_code[$r] = $this->rights_class.'_2_'.Categorie::$MAP_ID_TO_CODE[2];
+			$this->import_code[$r] = $this->rights_class.'_2_'.$categorystatic->MAP_ID_TO_CODE[2];
 			$this->import_label[$r] = "CatCusLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
@@ -537,7 +538,7 @@ public function __construct($db)
 		// 3 Members
 		if (isModEnabled('adherent')) {
 			$r++;
-			$this->import_code[$r] = $this->rights_class.'_3_'.Categorie::$MAP_ID_TO_CODE[3];
+			$this->import_code[$r] = $this->rights_class.'_3_'.$categorystatic->MAP_ID_TO_CODE[3];
 			$this->import_label[$r] = "CatMembersLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
@@ -555,7 +556,7 @@ public function __construct($db)
 		// 4 Contacts/Addresses
 		if (isModEnabled("societe")) {
 			$r++;
-			$this->import_code[$r] = $this->rights_class.'_4_'.Categorie::$MAP_ID_TO_CODE[4];
+			$this->import_code[$r] = $this->rights_class.'_4_'.$categorystatic->MAP_ID_TO_CODE[4];
 			$this->import_label[$r] = "CatContactsLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
@@ -578,7 +579,7 @@ public function __construct($db)
 		// 6 Projects
 		if (isModEnabled('project')) {
 			$r++;
-			$this->import_code[$r] = $this->rights_class.'_6_'.Categorie::$MAP_ID_TO_CODE[6];
+			$this->import_code[$r] = $this->rights_class.'_6_'.$categorystatic->MAP_ID_TO_CODE[6];
 			$this->import_label[$r] = "CatProjectsLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
@@ -596,7 +597,7 @@ public function __construct($db)
 		// 7 Users
 		if (isModEnabled('user')) {
 			$r++;
-			$this->import_code[$r] = $this->rights_class.'_7_'.Categorie::$MAP_ID_TO_CODE[7];
+			$this->import_code[$r] = $this->rights_class.'_7_'.$categorystatic->MAP_ID_TO_CODE[7];
 			$this->import_label[$r] = "CatUsersLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index e851573cba46f..4ee5a3ae58df5 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -44,7 +44,8 @@
 $printer3 = GETPOST('printer3', 'alpha');
 
 if (is_numeric($type)) {
-	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+	$categorystatic = new Categorie($db);
+	$type = $categorystatic->MAP_ID_TO_CODE[$type]; // For backward compatibility
 }
 
 if (!$user->hasRight('categorie', 'lire')) {

From b564b682859f93e9058d997af9ac50c9b8d7853e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 7 Jul 2023 18:02:38 +0200
Subject: [PATCH 14/69] unify categories

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c9d8f89703a76..f6c08ebcbe2f4 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7146,7 +7146,8 @@ public function showInputField($val, $key, $value, $moreparam = '', $keysuffix =
 					}
 				} else {
 					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-					$data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
+					$categorystatic = new Categorie($this->db);
+					$data = $form->select_all_categories($categorystatic->MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
 					$out .= '<option value="0">&nbsp;</option>';
 					foreach ($data as $data_key => $data_value) {
 						$out .= '<option value="' . $data_key . '"';
@@ -7320,7 +7321,8 @@ public function showInputField($val, $key, $value, $moreparam = '', $keysuffix =
 					}
 				} else {
 					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-					$data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
+					$categorystatic = new Categorie($this->db);
+					$data = $form->select_all_categories($categorystatic->MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
 					$out = $form->multiselectarray($keyprefix . $key . $keysuffix, $data, $value_arr, '', 0, $morecss, 0, '100%');
 				}
 			}

From 184b03365ff7f13fb16e04098a35e59e671114ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 7 Jul 2023 18:10:12 +0200
Subject: [PATCH 15/69] unify categories

---
 htdocs/core/modules/modCategorie.class.php | 29 +++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 44e992bcf6096..cd060611b0119 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -177,8 +177,7 @@ public function __construct($db)
 
 		// 0 Products
 		$r++;
-		$categorystatic = new Categorie($this->db);
-		$this->export_code[$r] = $this->rights_class.'_0_'.$categorystatic->MAP_ID_TO_CODE[0];
+		$this->export_code[$r] = $this->rights_class.'_0_product';
 		$this->export_label[$r] = 'CatProdList';
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = 'isModEnabled("product") || isModEnabled("service")';
@@ -203,7 +202,7 @@ public function __construct($db)
 
 		// 1 Suppliers
 		$r++;
-		$this->export_code[$r] = $this->rights_class.'_1_'.$categorystatic->MAP_ID_TO_CODE[1];
+		$this->export_code[$r] = $this->rights_class.'_1_supplier';
 		$this->export_label[$r] = 'CatSupList';
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = 'isModEnabled("supplier_order") || isModEnabled("supplier_invoice")';
@@ -250,7 +249,7 @@ public function __construct($db)
 
 		// 2 Customers/Prospects
 		$r++;
-		$this->export_code[$r] = $this->rights_class.'_2_'.$categorystatic->MAP_ID_TO_CODE[2];
+		$this->export_code[$r] = $this->rights_class.'_2_customer';
 		$this->export_label[$r] = 'CatCusList';
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = 'isModEnabled("societe")';
@@ -299,7 +298,7 @@ public function __construct($db)
 
 		// 3 Members
 		$r++;
-		$this->export_code[$r] = $this->rights_class.'_3_'.$categorystatic->MAP_ID_TO_CODE[3];
+		$this->export_code[$r] = $this->rights_class.'_3_member';
 		$this->export_label[$r] = 'CatMemberList';
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = 'isModEnabled("adherent")';
@@ -324,7 +323,7 @@ public function __construct($db)
 
 		// 4 Contacts
 		$r++;
-		$this->export_code[$r] = $this->rights_class.'_4_'.$categorystatic->MAP_ID_TO_CODE[4];
+		$this->export_code[$r] = $this->rights_class.'_4_contact';
 		$this->export_label[$r] = 'CatContactList';
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = 'isModEnabled("societe")';
@@ -383,7 +382,7 @@ public function __construct($db)
 
 		// 6 Projects
 		$r++;
-		$this->export_code[$r] = $this->rights_class.'_6_'.$categorystatic->MAP_ID_TO_CODE[6];
+		$this->export_code[$r] = $this->rights_class.'_6_project';
 		$this->export_label[$r] = 'CatProjectsList';
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = "isModEnabled('project')";
@@ -409,7 +408,7 @@ public function __construct($db)
 
 		// 7 Users
 		$r++;
-		$this->export_code[$r] = $this->rights_class.'_7_'.$categorystatic->MAP_ID_TO_CODE[7];
+		$this->export_code[$r] = $this->rights_class.'_7_user';
 		$this->export_label[$r] = 'CatUsersList';
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = 'isModEnabled("user")';
@@ -477,7 +476,7 @@ public function __construct($db)
 		// 0 Products
 		if (isModEnabled("product")) {
 			$r++;
-			$this->import_code[$r] = $this->rights_class.'_0_'.$categorystatic->MAP_ID_TO_CODE[0];
+			$this->import_code[$r] = $this->rights_class.'_0_product';
 			$this->import_label[$r] = "CatProdLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
@@ -496,7 +495,7 @@ public function __construct($db)
 		// 1 Suppliers
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
 			$r++;
-			$this->import_code[$r] = $this->rights_class.'_1_'.$categorystatic->MAP_ID_TO_CODE[1];
+			$this->import_code[$r] = $this->rights_class.'_1_supplier';
 			$this->import_label[$r] = "CatSupLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
@@ -517,7 +516,7 @@ public function __construct($db)
 		// 2 Customers
 		if (isModEnabled("societe")) {
 			$r++;
-			$this->import_code[$r] = $this->rights_class.'_2_'.$categorystatic->MAP_ID_TO_CODE[2];
+			$this->import_code[$r] = $this->rights_class.'_2_customer';
 			$this->import_label[$r] = "CatCusLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
@@ -538,7 +537,7 @@ public function __construct($db)
 		// 3 Members
 		if (isModEnabled('adherent')) {
 			$r++;
-			$this->import_code[$r] = $this->rights_class.'_3_'.$categorystatic->MAP_ID_TO_CODE[3];
+			$this->import_code[$r] = $this->rights_class.'_3_member';
 			$this->import_label[$r] = "CatMembersLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
@@ -556,7 +555,7 @@ public function __construct($db)
 		// 4 Contacts/Addresses
 		if (isModEnabled("societe")) {
 			$r++;
-			$this->import_code[$r] = $this->rights_class.'_4_'.$categorystatic->MAP_ID_TO_CODE[4];
+			$this->import_code[$r] = $this->rights_class.'_4_contact';
 			$this->import_label[$r] = "CatContactsLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
@@ -579,7 +578,7 @@ public function __construct($db)
 		// 6 Projects
 		if (isModEnabled('project')) {
 			$r++;
-			$this->import_code[$r] = $this->rights_class.'_6_'.$categorystatic->MAP_ID_TO_CODE[6];
+			$this->import_code[$r] = $this->rights_class.'_6_project';
 			$this->import_label[$r] = "CatProjectsLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
@@ -597,7 +596,7 @@ public function __construct($db)
 		// 7 Users
 		if (isModEnabled('user')) {
 			$r++;
-			$this->import_code[$r] = $this->rights_class.'_7_'.$categorystatic->MAP_ID_TO_CODE[7];
+			$this->import_code[$r] = $this->rights_class.'_7_user';
 			$this->import_label[$r] = "CatUsersLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon

From 6a446bd53ae777afa95e713488732661cf1fc510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Fri, 7 Jul 2023 21:02:07 +0200
Subject: [PATCH 16/69] fetch data from llx_element_category

---
 htdocs/categories/class/categorie.class.php | 83 +++++++--------------
 1 file changed, 29 insertions(+), 54 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 05b2c1ddafbc2..1ed8227be3ac4 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -92,9 +92,8 @@ class Categorie extends CommonObject
 	 * @var array Code mapping from ID
 	 *
 	 * @note This array should be removed in future, once previous constants are moved to the string value. Deprecated
-	 * @deprecated
 	 */
-	public static $MAP_ID_TO_CODE = array(
+	public $MAP_ID_TO_CODE = array(
 		// 0 => 'product',
 		// 1 => 'supplier',
 		// 2 => 'customer',
@@ -312,7 +311,6 @@ private function getMapId()
 				$this->MAP_OBJ_CLASS[$obj->module] = $obj->classname;
 			}
 		}
-
 	}
 
 	/**
@@ -382,11 +380,11 @@ public function fetch($id, $label = '', $type = null, $ref_ext = '')
 
 				$this->id = $res['rowid'];
 				//$this->ref = $res['rowid'];
-				$this->fk_parent	= (int) $res['fk_parent'];
-				$this->label		= $res['label'];
+				$this->fk_parent = (int) $res['fk_parent'];
+				$this->label = $res['label'];
 				$this->description = $res['description'];
-				$this->color    	= $res['color'];
-				$this->socid		= (int) $res['fk_soc'];
+				$this->color = $res['color'];
+				$this->socid = (int) $res['fk_soc'];
 				$this->visible = (int) $res['visible'];
 				$this->type = (int) $res['type'];
 				$this->ref_ext = $res['ref_ext'];
@@ -728,16 +726,12 @@ public function add_type($obj, $type = '')
 			return -2;
 		}
 
-		if (empty($type)) {
-			$type = $obj->element;
-		}
-
 		dol_syslog(get_class($this).'::add_type', LOG_DEBUG);
 
 		$this->db->begin();
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
-		$sql .= " (fk_categorie, fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]).")";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_category";
+		$sql .= " (fk_category, fk_element)";
 		$sql .= " VALUES (".((int) $this->id).", ".((int) $obj->id).")";
 
 		if ($this->db->query($sql)) {
@@ -817,20 +811,11 @@ public function del_type($obj, $type)
 
 		$error = 0;
 
-		// For backward compatibility
-		if ($type == 'societe') {
-			$type = 'customer';
-			dol_syslog(get_class($this)."::del_type(): type 'societe' is deprecated, please use 'customer' instead", LOG_WARNING);
-		} elseif ($type == 'fournisseur') {
-			$type = 'supplier';
-			dol_syslog(get_class($this)."::del_type(): type 'fournisseur' is deprecated, please use 'supplier' instead", LOG_WARNING);
-		}
-
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
-		$sql .= " WHERE fk_categorie = ".((int) $this->id);
-		$sql .= " AND fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".((int) $obj->id);
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_category";
+		$sql .= " WHERE fk_category = ".((int) $this->id);
+		$sql .= " AND fk_element = ".((int) $obj->id);
 
 		dol_syslog(get_class($this).'::del_type', LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -879,16 +864,16 @@ public function getObjectsInCateg($type, $onlyids = 0, $limit = 0, $offset = 0,
 		$classnameforobj = $this->MAP_OBJ_CLASS[$type];
 		$obj = new $classnameforobj($this->db);
 
-		$sql = "SELECT c.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]);
-		$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type])." as c";
+		$sql = "SELECT c.fk_element";
+		$sql .= " FROM ".MAIN_DB_PREFIX."element_category as c";
 		$sql .= ", ".MAIN_DB_PREFIX.(empty($this->MAP_OBJ_TABLE[$type]) ? $type : $this->MAP_OBJ_TABLE[$type])." as o";
 		$sql .= " WHERE o.entity IN (".getEntity($obj->element).")";
-		$sql .= " AND c.fk_categorie = ".((int) $this->id);
+		$sql .= " AND c.fk_category = ".((int) $this->id);
 		// Compatibility with actioncomm table which has id instead of rowid
 		if ((array_key_exists($type, $this->MAP_OBJ_TABLE) && $this->MAP_OBJ_TABLE[$type] == "actioncomm") || $type == "actioncomm") {
-			$sql .= " AND c.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = o.id";
+			$sql .= " AND c.fk_element = o.id";
 		} else {
-			$sql .= " AND c.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = o.rowid";
+			$sql .= " AND c.fk_element = o.rowid";
 		}
 		// Protection for external users
 		if (($type == 'customer' || $type == 'supplier') && $user->socid > 0) {
@@ -919,12 +904,12 @@ public function getObjectsInCateg($type, $onlyids = 0, $limit = 0, $offset = 0,
 		if ($resql) {
 			while ($rec = $this->db->fetch_array($resql)) {
 				if ($onlyids) {
-					$objs[] = $rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])];
+					$objs[] = $rec['fk_element'];
 				} else {
 					$classnameforobj = $this->MAP_OBJ_CLASS[$type];
 
 					$obj = new $classnameforobj($this->db);
-					$obj->fetch($rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])]);
+					$obj->fetch($rec['fk_element']);
 
 					$objs[] = $obj;
 				}
@@ -946,8 +931,8 @@ public function getObjectsInCateg($type, $onlyids = 0, $limit = 0, $offset = 0,
 	 */
 	public function containsObject($type, $object_id)
 	{
-		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
-		$sql .= " WHERE fk_categorie = ".((int) $this->id)." AND fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".((int) $object_id);
+		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."element_category";
+		$sql .= " WHERE fk_category = ".((int) $this->id)." AND fk_element = ".((int) $object_id);
 		dol_syslog(get_class($this)."::containsObject", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -1032,11 +1017,11 @@ public function getListForItem($id, $type = 'customer', $sortfield = "s.rowid",
 				$category_static = new Categorie($this->db);
 				if ($category_static->fetch($obj->rowid)) {
 					$categories[$i]['id'] = $category_static->id;
-					$categories[$i]['fk_parent']		= $category_static->fk_parent;
-					$categories[$i]['label']			= $category_static->label;
+					$categories[$i]['fk_parent'] = $category_static->fk_parent;
+					$categories[$i]['label'] = $category_static->label;
 					$categories[$i]['description'] = $category_static->description;
-					$categories[$i]['color']    		= $category_static->color;
-					$categories[$i]['socid']			= $category_static->socid;
+					$categories[$i]['color'] = $category_static->color;
+					$categories[$i]['socid'] = $category_static->socid;
 					$categories[$i]['ref_ext'] = $category_static->ref_ext;
 					$categories[$i]['visible'] = $category_static->visible;
 					$categories[$i]['type'] = $category_static->type;
@@ -1549,9 +1534,9 @@ public function containing($id, $type, $mode = 'object')
 				return -1;
 			}
 		} else {
-			$sql = "SELECT ct.fk_categorie, c.label, c.rowid";
-			$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type])." as ct, ".MAIN_DB_PREFIX."categorie as c";
-			$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".(int) $id;
+			$sql = "SELECT ct.fk_category, c.label, c.rowid";
+			$sql .= " FROM ".MAIN_DB_PREFIX."element_category as ct, ".MAIN_DB_PREFIX."categorie as c";
+			$sql .= " WHERE ct.fk_category = c.rowid AND ct.fk_element = ".(int) $id;
 			// This seems useless because the table already contains id of category of 1 unique type. So commented.
 			// So now it works also with external added categories.
 			//$sql .= " AND c.type = ".((int) $this->MAP_ID[$type]);
@@ -1566,7 +1551,7 @@ public function containing($id, $type, $mode = 'object')
 						$cats[] = $obj->label;
 					} else {
 						$cat = new Categorie($this->db);
-						$cat->fetch($obj->fk_categorie);
+						$cat->fetch($obj->fk_category);
 						$cats[] = $cat;
 					}
 				}
@@ -2058,16 +2043,6 @@ public static function getFilterJoinQuery($type, $rowIdName)
 	 */
 	public static function getFilterSelectQuery($type, $rowIdName, $searchList)
 	{
-		if ($type == 'bank_account') {
-			$type = 'account';
-		}
-		if ($type == 'customer') {
-			$type = 'societe';
-		}
-		if ($type == 'supplier') {
-			$type = 'fournisseur';
-		}
-
 		if (empty($searchList) && !is_array($searchList)) {
 			return "";
 		}
@@ -2075,9 +2050,9 @@ public static function getFilterSelectQuery($type, $rowIdName, $searchList)
 		$searchCategorySqlList = array();
 		foreach ($searchList as $searchCategory) {
 			if (intval($searchCategory) == -2) {
-				$searchCategorySqlList[] = " cp.fk_categorie IS NULL";
+				$searchCategorySqlList[] = " cp.fk_category IS NULL";
 			} elseif (intval($searchCategory) > 0) {
-				$searchCategorySqlList[] = " ".$rowIdName." IN (SELECT fk_".$type." FROM ".MAIN_DB_PREFIX."categorie_".$type." WHERE fk_categorie = ".((int) $searchCategory).")";
+				$searchCategorySqlList[] = " ".$rowIdName." IN (SELECT fk_element FROM ".MAIN_DB_PREFIX."element_category WHERE fk_category = ".((int) $searchCategory).")";
 			}
 		}
 

From 3e331eafd6eaf1363cdd06bfbfbe600ab1cf452e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Fri, 7 Jul 2023 21:31:11 +0200
Subject: [PATCH 17/69] fetch data from llx_element_category

---
 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 1ed8227be3ac4..578f7f05a5cae 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -2029,7 +2029,7 @@ public static function getFilterJoinQuery($type, $rowIdName)
 			$type = 'account';
 		}
 
-		return " LEFT JOIN ".MAIN_DB_PREFIX."categorie_".$type." as cp ON ".$rowIdName." = cp.fk_".$type;
+		return " LEFT JOIN ".MAIN_DB_PREFIX."element_category as cp ON ".$rowIdName." = cp.fk_element";
 	}
 
 	/**

From cf56f0a9c8e88942c91ec7d308739eed495f3860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 13 Jul 2023 21:26:14 +0200
Subject: [PATCH 18/69] sql changes

---
 htdocs/comm/propal/list.php              | 14 +++++++-------
 htdocs/core/class/commonobject.class.php |  5 +++--
 htdocs/core/class/html.form.class.php    |  6 +++---
 htdocs/product/index.php                 |  4 ++--
 htdocs/product/list.php                  |  6 +++---
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 7337e4a07da37..f76fb2e4cf8ad 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -578,7 +578,7 @@
 	$sql .= ", sc.fk_soc, sc.fk_user";
 }
 if (!empty($search_categ_cus) && $search_categ_cus != '-1') {
-	$sql .= ", cc.fk_categorie, cc.fk_soc";
+	$sql .= ", cc.fk_category, cc.fk_soc";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -599,7 +599,7 @@
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 if (!empty($search_categ_cus) && $search_categ_cus != '-1') {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."element_category as cc ON s.rowid = cc.fk_element"; // We'll need this table joined to the select in order to filter by categ
 }
 $sql .= ', '.MAIN_DB_PREFIX.'propal as p';
 if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
@@ -708,10 +708,10 @@
 }
 
 if ($search_categ_cus > 0) {
-	$sql .= " AND cc.fk_categorie = ".((int) $search_categ_cus);
+	$sql .= " AND cc.fk_category = ".((int) $search_categ_cus);
 }
 if ($search_categ_cus == -2) {
-	$sql .= " AND cc.fk_categorie IS NULL";
+	$sql .= " AND cc.fk_category IS NULL";
 }
 
 if ($search_fk_cond_reglement > 0) {
@@ -772,17 +772,17 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryProductList as $searchCategoryProduct) {
 		if (intval($searchCategoryProduct) == -2) {
-			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."propaldet as pd WHERE pd.fk_propal = p.rowid AND pd.fk_product = ck.fk_product)";
+			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."propaldet as pd WHERE pd.fk_propal = p.rowid AND pd.fk_product = ck.fk_element)";
 		} elseif (intval($searchCategoryProduct) > 0) {
 			if ($searchCategoryProductOperator == 0) {
-				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."propaldet as pd WHERE pd.fk_propal = p.rowid AND pd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
+				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."propaldet as pd WHERE pd.fk_propal = p.rowid AND pd.fk_product = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProduct).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."propaldet as pd WHERE pd.fk_propal = p.rowid AND pd.fk_product = ck.fk_product AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."propaldet as pd WHERE pd.fk_propal = p.rowid AND pd.fk_product = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryProductOperator == 1) {
 		if (!empty($searchCategoryProductSqlList)) {
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index b1df7395bb829..d2d08f8173d4c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -9142,12 +9142,13 @@ public function setVarsFromFetchObj(&$obj)
 	 * Sets all object fields to null. Useful for example in lists, when printing multiple lines and a different object os fetched for each line.
 	 * @return void
 	 */
-	public function emtpyObjectVars() {
+	public function emtpyObjectVars()
+	{
 		foreach ($this->fields as $field => $arr) {
 			$this->$field = null;
 		}
 	}
-	
+
 	/**
 	 * Function to concat keys of fields
 	 *
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 821700059b4db..c64ff2e3ec679 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2659,9 +2659,9 @@ public function select_produits_list($selected = '', $htmlname = 'productid', $f
 
 		if (!empty($conf->global->PRODUCT_SORT_BY_CATEGORY)) {
 			//Product category
-			$sql .= ", (SELECT " . $this->db->prefix() . "categorie_product.fk_categorie
-						FROM " . $this->db->prefix() . "categorie_product
-						WHERE " . $this->db->prefix() . "categorie_product.fk_product=p.rowid
+			$sql .= ", (SELECT " . $this->db->prefix() . "element_category.fk_category
+						FROM " . $this->db->prefix() . "element_category
+						WHERE " . $this->db->prefix() . "element_category.fk_category=p.rowid
 						LIMIT 1
 				) AS categorie_product_id ";
 		}
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 46f993f63730e..ed636e5a282d8 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -223,8 +223,8 @@
 	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Categories").'</th></tr>';
 	print '<tr><td class="center" colspan="2">';
 	$sql = "SELECT c.label, count(*) as nb";
-	$sql .= " FROM ".MAIN_DB_PREFIX."categorie_product as cs";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
+	$sql .= " FROM ".MAIN_DB_PREFIX."element_category as cs";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_category = c.rowid";
 	$sql .= " WHERE c.type = 0";
 	$sql .= " AND c.entity IN (".getEntity('category').")";
 	$sql .= " GROUP BY c.label";
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index cd879043a2bc6..a356a05251e45 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -547,17 +547,17 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryProductList as $searchCategoryProduct) {
 		if (intval($searchCategoryProduct) == -2) {
-			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck WHERE p.rowid = ck.fk_product)";
+			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element)";
 		} elseif (intval($searchCategoryProduct) > 0) {
 			if ($searchCategoryProductOperator == 0) {
-				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck WHERE p.rowid = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
+				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProduct).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck WHERE p.rowid = ck.fk_product AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryProductOperator == 1) {
 		if (!empty($searchCategoryProductSqlList)) {

From eb229aee71a4958f878cceb537dc8230d5774d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 13 Jul 2023 21:36:09 +0200
Subject: [PATCH 19/69] sql changes

---
 htdocs/accountancy/admin/productaccount.php | 10 ++--
 htdocs/categories/class/categorie.class.php | 55 ++-------------------
 htdocs/commande/list_det.php                | 12 ++---
 htdocs/user/list.php                        |  6 +--
 4 files changed, 17 insertions(+), 66 deletions(-)

diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index a524f29b8409e..57624e5d7431f 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -326,7 +326,7 @@
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = p." . $accountancy_field_name . " AND aa.fk_pcg_version = '" . $db->escape($pcgvercode) . "'";
 }
 if (!empty($searchCategoryProductList)) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product"; // We'll need this table joined to the select in order to filter by categ
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."element_category as cp ON p.rowid = cp.fk_element"; // We'll need this table joined to the select in order to filter by categ
 }
 $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
 if (strlen(trim($search_current_account))) {
@@ -342,9 +342,9 @@
 if ($searchCategoryProductOperator == 1) {
 	foreach ($searchCategoryProductList as $searchCategoryProduct) {
 		if (intval($searchCategoryProduct) == -2) {
-			$searchCategoryProductSqlList[] = "cp.fk_categorie IS NULL";
+			$searchCategoryProductSqlList[] = "cp.fk_category IS NULL";
 		} elseif (intval($searchCategoryProduct) > 0) {
-			$searchCategoryProductSqlList[] = "cp.fk_categorie = ".$db->escape($searchCategoryProduct);
+			$searchCategoryProductSqlList[] = "cp.fk_category = ".$db->escape($searchCategoryProduct);
 		}
 	}
 	if (!empty($searchCategoryProductSqlList)) {
@@ -353,9 +353,9 @@
 } else {
 	foreach ($searchCategoryProductList as $searchCategoryProduct) {
 		if (intval($searchCategoryProduct) == -2) {
-			$searchCategoryProductSqlList[] = "cp.fk_categorie IS NULL";
+			$searchCategoryProductSqlList[] = "cp.fk_category IS NULL";
 		} elseif (intval($searchCategoryProduct) > 0) {
-			$searchCategoryProductSqlList[] = "p.rowid IN (SELECT fk_product FROM ".MAIN_DB_PREFIX."categorie_product WHERE fk_categorie = ".((int) $searchCategoryProduct).")";
+			$searchCategoryProductSqlList[] = "p.rowid IN (SELECT fk_element FROM ".MAIN_DB_PREFIX."element_category WHERE fk_category = ".((int) $searchCategoryProduct).")";
 		}
 	}
 	if (!empty($searchCategoryProductSqlList)) {
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 578f7f05a5cae..605983feb23fa 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -71,44 +71,14 @@ class Categorie extends CommonObject
 	/**
 	 * @var array Table of mapping between type string and ID used for field 'type' in table llx_categories
 	 */
-	protected $MAP_ID = array(
-		// 'product'      => 0,
-		// 'supplier'     => 1,
-		// 'customer'     => 2,
-		// 'member'       => 3,
-		// 'contact'      => 4,
-		// 'bank_account' => 5,
-		// 'project'      => 6,
-		// 'user'         => 7,
-		// 'bank_line'    => 8,
-		// 'warehouse'    => 9,
-		// 'actioncomm'   => 10,
-		// 'website_page' => 11,
-		// 'ticket'       => 12,
-		// 'knowledgemanagement' => 13
-	);
+	protected $MAP_ID = array();
 
 	/**
 	 * @var array Code mapping from ID
 	 *
 	 * @note This array should be removed in future, once previous constants are moved to the string value. Deprecated
 	 */
-	public $MAP_ID_TO_CODE = array(
-		// 0 => 'product',
-		// 1 => 'supplier',
-		// 2 => 'customer',
-		// 3 => 'member',
-		// 4 => 'contact',
-		// 5 => 'bank_account',
-		// 6 => 'project',
-		// 7 => 'user',
-		// 8 => 'bank_line',
-		// 9 => 'warehouse',
-		// 10 => 'actioncomm',
-		// 11 => 'website_page',
-		// 12 => 'ticket',
-		// 13 => 'knowledgemanagement'
-	);
+	public $MAP_ID_TO_CODE = array();
 
 	/**
 	 * @var array Foreign keys mapping from type string when value does not match
@@ -124,8 +94,6 @@ class Categorie extends CommonObject
 
 	/**
 	 * @var array Category tables mapping from type string (llx_categorie_...) when value does not match
-	 *
-	 * @note Move to const array when PHP 5.6 will be our minimum target
 	 */
 	public $MAP_CAT_TABLE = array(
 		'customer' => 'societe',
@@ -135,25 +103,8 @@ class Categorie extends CommonObject
 
 	/**
 	 * @var array Object class mapping from type string
-	 *
-	 * @note Move to const array when PHP 5.6 will be our minimum target
 	 */
-	public $MAP_OBJ_CLASS = array(
-		// 'product'  => 'Product',
-		// 'customer' => 'Societe',
-		// 'supplier' => 'Fournisseur',
-		// 'member'   => 'Adherent',
-		// 'contact'  => 'Contact',
-		// 'user'     => 'User',
-		// 'account'  => 'Account', // old for bank account
-		// 'bank_account'  => 'Account',
-		// 'project'  => 'Project',
-		// 'warehouse'=> 'Entrepot',
-		// 'actioncomm' => 'ActionComm',
-		// 'website_page' => 'WebsitePage',
-		// 'ticket' => 'Ticket',
-		// 'knowledgemanagement' => 'KnowledgeRecord'
-	);
+	public $MAP_OBJ_CLASS = array();
 
 	/**
 	 * @var array Title Area mapping from type string
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 9aa5aad7176b7..2cda08452bdb4 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -372,7 +372,7 @@
 $sql .= ' pr.rowid as product_rowid, pr.ref as product_ref, pr.label as product_label, pr.barcode as product_barcode, pr.tobatch as product_batch, pr.tosell as product_status, pr.tobuy as product_status_buy';
 
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
-	$sql .= ", cc.fk_categorie, cc.fk_soc";
+	$sql .= ", cc.fk_category";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -389,7 +389,7 @@
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."element_category as cc ON s.rowid = cc.fk_element"; // We'll need this table joined to the select in order to filter by categ
 }
 
 // Détail commande
@@ -404,7 +404,7 @@
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet as pd ON c.rowid=pd.fk_commande';
 }
 if ($search_product_category > 0) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_category as cp ON cp.fk_element=pd.fk_product';
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = c.fk_projet";
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON c.fk_user_author = u.rowid';
@@ -437,7 +437,7 @@
 	$sql .= " AND cdet.fk_product IS NOT NULL";
 }
 if ($search_product_category > 0) {
-	$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
+	$sql .= " AND cp.fk_category = ".((int) $search_product_category);
 }
 if ($socid > 0) {
 	$sql .= ' AND s.rowid = '.((int) $socid);
@@ -568,10 +568,10 @@
 	$sql .= natural_search("p.title", $search_project);
 }
 if ($search_categ_cus > 0) {
-	$sql .= " AND cc.fk_categorie = ".((int) $search_categ_cus);
+	$sql .= " AND cc.fk_category = ".((int) $search_categ_cus);
 }
 if ($search_categ_cus == -2) {
-	$sql .= " AND cc.fk_categorie IS NULL";
+	$sql .= " AND cc.fk_category IS NULL";
 }
 if ($search_fk_cond_reglement > 0) {
 	$sql .= " AND c.fk_cond_reglement = ".((int) $search_fk_cond_reglement);
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 103df7b67177a..93e34791debdd 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -458,17 +458,17 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryUserList as $searchCategoryUser) {
 		if (intval($searchCategoryUser) == -2) {
-			$searchCategoryUserSqlList[] = "NOT EXISTS (SELECT ck.fk_user FROM ".MAIN_DB_PREFIX."categorie_user as ck WHERE u.rowid = ck.fk_user)";
+			$searchCategoryUserSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE u.rowid = ck.fk_element)";
 		} elseif (intval($searchCategoryUser) > 0) {
 			if ($searchCategoryUserOperator == 0) {
-				$searchCategoryUserSqlList[] = " EXISTS (SELECT ck.fk_user FROM ".MAIN_DB_PREFIX."categorie_user as ck WHERE u.rowid = ck.fk_user AND ck.fk_categorie = ".((int) $searchCategoryUser).")";
+				$searchCategoryUserSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE u.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryUser).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryUser);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryUserSqlList[] = " EXISTS (SELECT ck.fk_user FROM ".MAIN_DB_PREFIX."categorie_user as ck WHERE u.rowid = ck.fk_user AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryUserSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE u.rowid = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryUserOperator == 1) {
 		if (!empty($searchCategoryUserSqlList)) {

From 265f2b8c3daf783d2781f014bb9f465a60b174cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 13 Jul 2023 21:43:46 +0200
Subject: [PATCH 20/69] sql changes

---
 htdocs/commande/list.php     | 14 +++++++-------
 htdocs/commande/list_det.php |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 99a1de8416285..4266cde89094b 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -820,7 +820,7 @@
 $sql .= ' c.fk_cond_reglement,c.deposit_percent,c.fk_mode_reglement,c.fk_shipping_method,';
 $sql .= ' c.fk_input_reason, c.import_key';
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
-	$sql .= ", cc.fk_categorie, cc.fk_soc";
+	$sql .= ", cc.fk_category, cc.fk_element";
 }
 
 // Add fields from extrafields
@@ -843,7 +843,7 @@
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."element_category as cc ON s.rowid = cc.fk_element"; // We'll need this table joined to the select in order to filter by categ
 }
 $sql .= ', '.MAIN_DB_PREFIX.'commande as c';
 if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
@@ -1000,10 +1000,10 @@
 	$sql .= natural_search("p.title", $search_project);
 }
 if ($search_categ_cus > 0) {
-	$sql .= " AND cc.fk_categorie = ".((int) $search_categ_cus);
+	$sql .= " AND cc.fk_category = ".((int) $search_categ_cus);
 }
 if ($search_categ_cus == -2) {
-	$sql .= " AND cc.fk_categorie IS NULL";
+	$sql .= " AND cc.fk_category IS NULL";
 }
 if ($search_fk_cond_reglement > 0) {
 	$sql .= " AND c.fk_cond_reglement = ".((int) $search_fk_cond_reglement);
@@ -1025,17 +1025,17 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryProductList as $searchCategoryProduct) {
 		if (intval($searchCategoryProduct) == -2) {
-			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."commandedet as cd WHERE cd.fk_commande = c.rowid AND cd.fk_product = ck.fk_product)";
+			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."commandedet as cd WHERE cd.fk_commande = c.rowid AND cd.fk_product = ck.fk_element)";
 		} elseif (intval($searchCategoryProduct) > 0) {
 			if ($searchCategoryProductOperator == 0) {
-				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."commandedet as cd WHERE cd.fk_commande = c.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
+				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."commandedet as cd WHERE cd.fk_commande = c.rowid AND cd.fk_product = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProduct).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."commandedet as cd WHERE cd.fk_commande = c.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."commandedet as cd WHERE cd.fk_commande = c.rowid AND cd.fk_product = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryProductOperator == 1) {
 		if (!empty($searchCategoryProductSqlList)) {
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 2cda08452bdb4..7c6c9f77b2b21 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -372,7 +372,7 @@
 $sql .= ' pr.rowid as product_rowid, pr.ref as product_ref, pr.label as product_label, pr.barcode as product_barcode, pr.tobatch as product_batch, pr.tosell as product_status, pr.tobuy as product_status_buy';
 
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
-	$sql .= ", cc.fk_category";
+	$sql .= ", cc.fk_category, cc.fk_element";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {

From 2f7f28eef952182ec6847ceb80c3cdf1bd4c5bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 13 Jul 2023 21:50:56 +0200
Subject: [PATCH 21/69] sql changes

---
 htdocs/adherents/class/adherent.class.php      |  2 +-
 htdocs/adherents/class/adherentstats.class.php |  2 +-
 htdocs/adherents/list.php                      |  6 +++---
 htdocs/categories/class/categorie.class.php    | 15 +++++++++------
 htdocs/compta/bank/list.php                    |  6 +++---
 htdocs/core/class/commonobject.class.php       |  9 +++------
 htdocs/expedition/list.php                     | 14 +++++++-------
 htdocs/projet/list.php                         |  6 +++---
 htdocs/ticket/class/ticket.class.php           |  4 ++--
 9 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 019bea5d0d3b0..4eea076ba0857 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1126,7 +1126,7 @@ public function delete($rowid, $user, $notrigger = 0)
 		}
 
 		// Remove category
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_member WHERE fk_member = ".((int) $rowid);
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_category WHERE fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=3) AND fk_element = ".((int) $rowid);
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index 59cc3238d694b..0e62cf52dff64 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -269,7 +269,7 @@ public function countMembersByTagAndStatus($numberYears = 0)
 		$sql .= ", COUNT(".$this->db->ifsql("d.statut = ".Adherent::STATUS_EXCLUDED, "'members_excluded'", 'NULL').") as members_excluded";
 		$sql .= ", COUNT(".$this->db->ifsql("d.statut = ".Adherent::STATUS_RESILIATED, "'members_resiliated'", 'NULL').") as members_resiliated";
 		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as c";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_member as ct ON c.rowid = ct.fk_categorie";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_category as ct ON c.rowid = ct.fk_category";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as d ON d.rowid = ct.fk_member";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_type as t ON t.rowid = d.fk_adherent_type";
 		$sql .= " WHERE c.entity IN (".getEntity('member_type').")";
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 52ef9109f9c29..e65ea882ed04f 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -391,17 +391,17 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryContactList as $searchCategoryContact) {
 		if (intval($searchCategoryContact) == -2) {
-			$searchCategoryContactSqlList[] = "NOT EXISTS (SELECT ck.fk_categorie FROM ".MAIN_DB_PREFIX."categorie_member as ck WHERE d.rowid = ck.fk_member)";
+			$searchCategoryContactSqlList[] = "NOT EXISTS (SELECT ck.fk_category FROM ".MAIN_DB_PREFIX."element_category as ck WHERE d.rowid = ck.fk_element)";
 		} elseif (intval($searchCategoryContact) > 0) {
 			if ($searchCategoryContactOperator == 0) {
-				$searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_categorie FROM ".MAIN_DB_PREFIX."categorie_member as ck WHERE d.rowid = ck.fk_member AND ck.fk_categorie = ".((int) $searchCategoryContact).")";
+				$searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_category FROM ".MAIN_DB_PREFIX."element_category as ck WHERE d.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryContact).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryContact);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_categorie FROM ".MAIN_DB_PREFIX."categorie_member as ck WHERE d.rowid = ck.fk_member AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_category FROM ".MAIN_DB_PREFIX."element_category as ck WHERE d.rowid = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryContactOperator == 1) {
 		if (!empty($searchCategoryContactSqlList)) {
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 605983feb23fa..dba9a29e1f4b6 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -630,8 +630,13 @@ public function delete($user, $notrigger = 0)
 				}
 				$value = $value['field'];
 			}
-			$sql  = "DELETE FROM ".MAIN_DB_PREFIX.$key;
-			$sql .= " WHERE ".$value." = ".((int) $this->id);
+			if ($key == 'categorie') {
+				$sql  = "DELETE FROM ".MAIN_DB_PREFIX."categorie";
+				$sql .= " WHERE rowid = ".((int) $this->id);
+			} else {
+				$sql  = "DELETE FROM ".MAIN_DB_PREFIX."element_category";
+				$sql .= " WHERE fk_category = ".((int) $this->id);
+			}
 			if (!$this->db->query($sql)) {
 				$this->errors[] = $this->db->lasterror();
 				dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
@@ -1488,9 +1493,7 @@ public function containing($id, $type, $mode = 'object')
 			$sql = "SELECT ct.fk_category, c.label, c.rowid";
 			$sql .= " FROM ".MAIN_DB_PREFIX."element_category as ct, ".MAIN_DB_PREFIX."categorie as c";
 			$sql .= " WHERE ct.fk_category = c.rowid AND ct.fk_element = ".(int) $id;
-			// This seems useless because the table already contains id of category of 1 unique type. So commented.
-			// So now it works also with external added categories.
-			//$sql .= " AND c.type = ".((int) $this->MAP_ID[$type]);
+			$sql .= " AND c.type = ".((int) $this->MAP_ID[$type]);
 			$sql .= " AND c.entity IN (".getEntity('category').")";
 
 			$res = $this->db->query($sql);
@@ -1960,7 +1963,7 @@ public function initAsSpecimen()
 	public static function replaceThirdparty(DoliDB $dbs, $origin_id, $dest_id)
 	{
 		$tables = array(
-			'categorie_societe'
+			'element_category'
 		);
 
 		return CommonObject::commonReplaceThirdparty($dbs, $origin_id, $dest_id, $tables, 1);
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index d50d9fea98eb2..b9fd28952ea71 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -227,17 +227,17 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryBankList as $searchCategoryBank) {
 		if (intval($searchCategoryBank) == -2) {
-			$searchCategoryBankSqlList[] = "NOT EXISTS (SELECT ck.fk_account FROM ".MAIN_DB_PREFIX."categorie_account as ck WHERE b.rowid = ck.fk_account)";
+			$searchCategoryBankSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE b.rowid = ck.fk_element)";
 		} elseif (intval($searchCategoryBank) > 0) {
 			if ($searchCategoryBankOperator == 0) {
-				$searchCategoryBankSqlList[] = " EXISTS (SELECT ck.fk_account FROM ".MAIN_DB_PREFIX."categorie_account as ck WHERE b.rowid = ck.fk_account AND ck.fk_categorie = ".((int) $searchCategoryBank).")";
+				$searchCategoryBankSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE b.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryBank).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryBank);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryBankSqlList[] = " EXISTS (SELECT ck.fk_account FROM ".MAIN_DB_PREFIX."categorie_account as ck WHERE b.rowid = ck.fk_account AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryBankSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE b.rowid = ck.fk_account AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryBankOperator == 1) {
 		if (!empty($searchCategoryBankSqlList)) {
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d2d08f8173d4c..38fc73e5beea9 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -10118,12 +10118,9 @@ public function cloneCategories($fromId, $toId, $type = '')
 			$type = $this->table_element;
 		}
 
-		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$categorystatic = new Categorie($this->db);
-
-		$sql = "INSERT INTO ".$this->db->prefix()."categorie_".(empty($categorystatic->MAP_CAT_TABLE[$type]) ? $type : $categorystatic->MAP_CAT_TABLE[$type])." (fk_categorie, fk_product)";
-		$sql .= " SELECT fk_categorie, $toId FROM ".$this->db->prefix()."categorie_".(empty($categorystatic->MAP_CAT_TABLE[$type]) ? $type : $categorystatic->MAP_CAT_TABLE[$type]);
-		$sql .= " WHERE fk_product = ".((int) $fromId);
+		$sql = "INSERT INTO ".$this->db->prefix()."element_category (fk_category, fk_element)";
+		$sql .= " SELECT fk_category, $toId FROM ".$this->db->prefix()."element_category";
+		$sql .= " WHERE fk_element = ".((int) $fromId);
 
 		if (!$this->db->query($sql)) {
 			$this->error = $this->db->lasterror();
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 40c8191043a59..073f6d544ef85 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -273,7 +273,7 @@
 $sql .= " e.date_creation as date_creation, e.tms as date_update,";
 $sql .= " u.login";
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
-	$sql .= ", cc.fk_categorie, cc.fk_soc";
+	$sql .= ", cc.fk_category, cc.fk_element";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -298,7 +298,7 @@
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."element_category as cc ON s.rowid = cc.fk_element"; // We'll need this table joined to the select in order to filter by categ
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
@@ -402,10 +402,10 @@
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
 if ($search_categ_cus > 0) {
-	$sql .= " AND cc.fk_categorie = ".((int) $search_categ_cus);
+	$sql .= " AND cc.fk_category = ".((int) $search_categ_cus);
 }
 if ($search_categ_cus == -2) {
-	$sql .= " AND cc.fk_categorie IS NULL";
+	$sql .= " AND cc.fk_category IS NULL";
 }
 // Search for tag/category ($searchCategoryProductList is an array of ID)
 $searchCategoryProductOperator = -1;
@@ -415,17 +415,17 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryProductList as $searchCategoryProduct) {
 		if (intval($searchCategoryProduct) == -2) {
-			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd WHERE ed.fk_expedition = e.rowid AND ed.fk_origin_line = cd.rowid AND cd.fk_product = ck.fk_product)";
+			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd WHERE ed.fk_expedition = e.rowid AND ed.fk_origin_line = cd.rowid AND cd.fk_product = ck.fk_element)";
 		} elseif (intval($searchCategoryProduct) > 0) {
 			if ($searchCategoryProductOperator == 0) {
-				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd WHERE ed.fk_expedition = e.rowid AND ed.fk_origin_line = cd.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
+				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd WHERE ed.fk_expedition = e.rowid AND ed.fk_origin_line = cd.rowid AND cd.fk_product = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProduct).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd WHERE ed.fk_expedition = e.rowid AND ed.fk_origin_line = cd.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd WHERE ed.fk_expedition = e.rowid AND ed.fk_origin_line = cd.rowid AND cd.fk_product = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryProductOperator == 1) {
 		if (!empty($searchCategoryProductSqlList)) {
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 643c020cc50b1..36adf50237baf 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -618,17 +618,17 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryProjectList as $searchCategoryProject) {
 		if (intval($searchCategoryProject) == -2) {
-			$searchCategoryProjectSqlList[] = "NOT EXISTS (SELECT ck.fk_project FROM ".MAIN_DB_PREFIX."categorie_project as ck WHERE p.rowid = ck.fk_project)";
+			$searchCategoryProjectSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element)";
 		} elseif (intval($searchCategoryProject) > 0) {
 			if ($searchCategoryProjectOperator == 0) {
-				$searchCategoryProjectSqlList[] = " EXISTS (SELECT ck.fk_project FROM ".MAIN_DB_PREFIX."categorie_project as ck WHERE p.rowid = ck.fk_project AND ck.fk_categorie = ".((int) $searchCategoryProject).")";
+				$searchCategoryProjectSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProject).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProject);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryProjectSqlList[] = " EXISTS (SELECT ck.fk_project FROM ".MAIN_DB_PREFIX."categorie_project as ck WHERE p.rowid = ck.fk_project AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryProjectSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryProjectOperator == 1) {
 		if (!empty($searchCategoryProjectSqlList)) {
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index bbc823ecce51c..eba34450638c5 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1098,8 +1098,8 @@ public function delete($user, $notrigger = 0)
 		// Delete all child tables
 
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_ticket";
-			$sql .= " WHERE fk_ticket = ".(int) $this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_category";
+			$sql .= " WHERE fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=12) AND fk_element = ".(int) $this->id;
 
 			$result = $this->db->query($sql);
 			if (!$result) {

From ca46bf08a599767aaff29bc13f5056431046b660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 16 Jul 2023 09:49:21 +0200
Subject: [PATCH 22/69] wip

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

diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 36adf50237baf..c651649cd9110 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -618,7 +618,7 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryProjectList as $searchCategoryProject) {
 		if (intval($searchCategoryProject) == -2) {
-			$searchCategoryProjectSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element)";
+			$searchCategoryProjectSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE ck.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=6) AND p.rowid = ck.fk_element)";
 		} elseif (intval($searchCategoryProject) > 0) {
 			if ($searchCategoryProjectOperator == 0) {
 				$searchCategoryProjectSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProject).")";

From b30204c19a12a29c5a968e2e9248aa586e732acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 16 Jul 2023 09:58:53 +0200
Subject: [PATCH 23/69] wip

---
 htdocs/adherents/class/api_members.class.php  |  6 ++---
 .../comm/propal/class/propalestats.class.php  |  2 +-
 htdocs/product/list.php                       |  2 +-
 htdocs/societe/class/api_contacts.class.php   |  6 ++---
 .../societe/class/api_thirdparties.class.php  | 10 ++++-----
 htdocs/societe/index.php                      |  4 ++--
 htdocs/user/class/api_users.class.php         |  6 ++---
 .../webservices/server_productorservice.php   | 22 +++++++++----------
 8 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 8a26cd5d070d5..0b72c98ec5d12 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -224,7 +224,7 @@ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100,
 		$sql = "SELECT t.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."adherent AS t LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields AS ef ON (ef.fk_object = t.rowid)"; // Modification VMR Global Solutions to include extrafields as search parameters in the API GET call
 		if ($category > 0) {
-			$sql .= ", ".MAIN_DB_PREFIX."categorie_member as c";
+			$sql .= ", ".MAIN_DB_PREFIX."element_category as c";
 		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('adherent').')';
 		if (!empty($typeid)) {
@@ -232,8 +232,8 @@ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100,
 		}
 		// Select members of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".((int) $category);
-			$sql .= " AND c.fk_member = t.rowid";
+			$sql .= " AND c.fk_category = ".((int) $category);
+			$sql .= " AND c.fk_element = t.rowid";
 		}
 		// Add sql filters
 		if ($sqlfilters) {
diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
index 028c6aacc189f..b72a8c53ba234 100644
--- a/htdocs/comm/propal/class/propalestats.class.php
+++ b/htdocs/comm/propal/class/propalestats.class.php
@@ -106,7 +106,7 @@ public function __construct($db, $socid = 0, $userid = 0, $mode = 'customer', $t
 		}
 
 		if ($categid) {
-			$this->where .= ' AND EXISTS (SELECT rowid FROM '.MAIN_DB_PREFIX.'categorie_societe as cats WHERE cats.fk_soc = p.fk_soc AND cats.fk_categorie = '.((int) $categid).')';
+			$this->where .= ' AND EXISTS (SELECT rowid FROM '.MAIN_DB_PREFIX.'element_category as cats WHERE cats.fk_element = p.fk_soc AND cats.fk_category = '.((int) $categid).')';
 		}
 	}
 
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index a356a05251e45..2558915145112 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -547,7 +547,7 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryProductList as $searchCategoryProduct) {
 		if (intval($searchCategoryProduct) == -2) {
-			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element)";
+			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE ck.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=0) AND p.rowid = ck.fk_element)";
 		} elseif (intval($searchCategoryProduct) > 0) {
 			if ($searchCategoryProductOperator == 0) {
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProduct).")";
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 9aff444a24237..0601eb74ccf23 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -192,7 +192,7 @@ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100,
 		$sql = "SELECT t.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
 		if ($category > 0) {
-			$sql .= ", ".MAIN_DB_PREFIX."categorie_contact as c";
+			$sql .= ", ".MAIN_DB_PREFIX."element_category as c";
 		}
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as te ON te.fk_object = t.rowid";
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
@@ -218,8 +218,8 @@ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100,
 
 		// Select contacts of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".((int) $category);
-			$sql .= " AND c.fk_socpeople = t.rowid ";
+			$sql .= " AND c.fk_category = ".((int) $category);
+			$sql .= " AND c.fk_element = t.rowid ";
 		}
 
 		// Add sql filters
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 418ecb4ab83fd..b86c8bc81e8e2 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -153,10 +153,10 @@ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100,
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields AS ef ON ef.fk_object = t.rowid";	// So we will be able to filter on extrafields
 		if ($category > 0) {
 			if ($mode != 4) {
-				$sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c";
+				$sql .= ", ".MAIN_DB_PREFIX."element_category as c";
 			}
 			if (!in_array($mode, array(1, 2, 3))) {
-				$sql .= ", ".MAIN_DB_PREFIX."categorie_fournisseur as cc";
+				$sql .= ", ".MAIN_DB_PREFIX."element_category as cc";
 			}
 		}
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
@@ -179,11 +179,11 @@ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100,
 		// Select thirdparties of given category
 		if ($category > 0) {
 			if (!empty($mode) && $mode != 4) {
-				$sql .= " AND c.fk_categorie = ".((int) $category)." AND c.fk_soc = t.rowid";
+				$sql .= " AND c.fk_category = ".((int) $category)." AND c.fk_element = t.rowid";
 			} elseif (!empty($mode) && $mode == 4) {
-				$sql .= " AND cc.fk_categorie = ".((int) $category)." AND cc.fk_soc = t.rowid";
+				$sql .= " AND cc.fk_category = ".((int) $category)." AND cc.fk_element = t.rowid";
 			} else {
-				$sql .= " AND ((c.fk_categorie = ".((int) $category)." AND c.fk_soc = t.rowid) OR (cc.fk_categorie = ".((int) $category)." AND cc.fk_soc = t.rowid))";
+				$sql .= " AND ((c.fk_category = ".((int) $category)." AND c.fk_element = t.rowid) OR (cc.fk_category = ".((int) $category)." AND cc.fk_element = t.rowid))";
 			}
 		}
 
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index c5049e11d5fa1..18db109ecae38 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -208,8 +208,8 @@
 	$thirdpartycateggraph .= '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Categories").'</th></tr>';
 	$thirdpartycateggraph .= '<tr><td class="center" colspan="2">';
 	$sql = "SELECT c.label, count(*) as nb";
-	$sql .= " FROM ".MAIN_DB_PREFIX."categorie_societe as cs";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
+	$sql .= " FROM ".MAIN_DB_PREFIX."element_category as cs";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_category = c.rowid";
 	$sql .= " WHERE c.type = 2";
 	if (!is_numeric($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) {
 		$sql .= " AND c.label like '".$db->escape($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)."'";
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 5090539814b2a..c12c7b960f48a 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -84,7 +84,7 @@ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100,
 		$sql = "SELECT t.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user AS t LEFT JOIN ".MAIN_DB_PREFIX."user_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
 		if ($category > 0) {
-			$sql .= ", ".$this->db->prefix()."categorie_user as c";
+			$sql .= ", ".$this->db->prefix()."element_category as c";
 		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('user').')';
 		if ($user_ids) {
@@ -93,8 +93,8 @@ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100,
 
 		// Select products of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".((int) $category);
-			$sql .= " AND c.fk_user = t.rowid";
+			$sql .= " AND c.fk_category = ".((int) $category);
+			$sql .= " AND c.fk_element = t.rowid";
 		}
 
 		// Add sql filters
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index 2720a8c7a431f..2ba034d8de0d4 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -1017,16 +1017,13 @@ function getProductsForCategory($authentication, $id, $lang = '')
 		$fuser->getrights();
 
 		$nbmax = 10;
-		if ($fuser->rights->produit->lire) {
+		if ($fuser->hasRight('produit', 'lire')) {
 			$categorie = new Categorie($db);
 			$result = $categorie->fetch($id);
 			if ($result > 0) {
-				$table = "product";
-				$field = "product";
-				$sql  = "SELECT fk_".$field." FROM ".MAIN_DB_PREFIX."categorie_".$table;
-				$sql .= " WHERE fk_categorie = ".((int) $id);
-				$sql .= " ORDER BY fk_".$field." ASC";
-
+				$sql  = "SELECT fk_element FROM ".MAIN_DB_PREFIX."element_category";
+				$sql .= " WHERE fk_category = ".((int) $id);
+				$sql .= " ORDER BY fk_element ASC";
 
 				dol_syslog("getProductsForCategory get id of product into category", LOG_DEBUG);
 				$res = $db->query($sql);
@@ -1035,7 +1032,7 @@ function getProductsForCategory($authentication, $id, $lang = '')
 					$tmpproduct = new Product($db);
 					$products = array();
 					while ($rec = $db->fetch_array($res)) {
-						$tmpproduct->fetch($rec['fk_'.$field]);
+						$tmpproduct->fetch($rec['fk_element']);
 						if ($tmpproduct->status > 0) {
 							$dir = (!empty($conf->product->dir_output) ? $conf->product->dir_output : $conf->service->dir_output);
 							$pdir = get_exdir($tmpproduct->id, 2, 0, 0, $tmpproduct, 'product').$tmpproduct->id."/photos/";
@@ -1075,7 +1072,7 @@ function getProductsForCategory($authentication, $id, $lang = '')
 
 							$elementtype = 'product';
 
-							//Retrieve all extrafield for thirdsparty
+							// Retrieve all extrafield for thirdsparty
 							// fetch optionals attributes and labels
 							$extrafields = new ExtraFields($db);
 							$extrafields->fetch_name_optionals_label($elementtype, true);
@@ -1094,11 +1091,12 @@ function getProductsForCategory($authentication, $id, $lang = '')
 
 					// Retour
 					$objectresp = array(
-					'result'=>array('result_code'=>'OK', 'result_label'=>''),
-					'products'=> $products
+						'result'=>array('result_code'=>'OK', 'result_label'=>''),
+						'products'=> $products
 					);
 				} else {
-					$errorcode = 'NORECORDS_FOR_ASSOCIATION'; $errorlabel = 'No products associated'.$sql;
+					$errorcode = 'NORECORDS_FOR_ASSOCIATION';
+					$errorlabel = 'No products associated'.$sql;
 					$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 					dol_syslog("getProductsForCategory:: ".$errorcode, LOG_DEBUG);
 				}

From cf9df40aebac300be6c9b4305c97ff7aae6eccd3 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 16 Jul 2023 14:40:00 +0200
Subject: [PATCH 24/69] Fix php 8 list.php (#25363)

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

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 36b3f33d8000a..524141588e2a9 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -430,7 +430,7 @@
 if ($search_fk_project > 0) {
 	$sql .= natural_search('fk_project', $search_fk_project, 2);
 }
-if ($search_fk_contracct > 0) {
+if ($search_fk_contract > 0) {
 	$sql .= natural_search('fk_contract', $search_fk_contract, 2);
 }
 if ($search_date_start) {

From 97a20bbbbbbbe2215cfef67a1f51cd37a6f0dd09 Mon Sep 17 00:00:00 2001
From: mc2contributor <rdueck@mcmillan-mcgee.com>
Date: Sun, 16 Jul 2023 06:46:07 -0600
Subject: [PATCH 25/69] Add missing Canadian territories (#25364)

---
 htdocs/install/mysql/data/llx_20_c_departements.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index ad647028c9a31..81f4b473f6031 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -301,6 +301,9 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1401, 'SK', '', 1, '', 'Saskatchewan');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1401, 'AB', '', 1, '', 'Alberta');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1401, 'NL', '', 1, '', 'Newfoundland and Labrador');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1401, 'YT', '', 1, '', 'Yukon');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1401, 'NT', '', 1, '', 'Northwest Territories');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1401, 'NU', '', 1, '', 'Nunavut');
 
 
 -- Chile Provinces (id country=67)

From 3b6964c8ab04d983ce672a882cb8112e1301ee8f Mon Sep 17 00:00:00 2001
From: mc2contributor <rdueck@mcmillan-mcgee.com>
Date: Sun, 16 Jul 2023 06:54:08 -0600
Subject: [PATCH 26/69] Add 'name' property for fetching user's name (#25359)

wip
---
 htdocs/comm/action/class/actioncomm.class.php |   4 +-
 htdocs/compta/bank/class/account.class.php    |   4 +-
 .../bank/class/api_bankaccounts.class.php     |   4 +-
 .../facture/class/facturestats.class.php      |   2 +-
 htdocs/contrat/class/contrat.class.php        |   2 +-
 htdocs/core/modules/modCategorie.class.php    | 116 +++++++++---------
 htdocs/core/modules/modProduct.class.php      |   8 +-
 htdocs/projet/class/project.class.php         |   4 +-
 htdocs/projet/list.php                        |  24 ++--
 htdocs/user/class/user.class.php              |   4 +-
 10 files changed, 89 insertions(+), 83 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 92299a543127e..3e5eceea02744 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1027,8 +1027,8 @@ public function delete($notrigger = 0)
 
 		// remove categorie association
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_actioncomm";
-			$sql .= " WHERE fk_actioncomm=".((int) $this->id);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_category";
+			$sql .= " WHERE fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=10) AND fk_element=".((int) $this->id);
 
 			$res = $this->db->query($sql);
 			if (!$res) {
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index fc9288f54cbe5..798c87f642ed6 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1122,8 +1122,8 @@ public function delete(User $user = null)
 
 		// Delete link between tag and bank account
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_account";
-			$sql .= " WHERE fk_account = ".((int) $this->id);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_category";
+			$sql .= " WHERE fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=5) AND fk_element = ".((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index e81981a7490e1..be63ed67fbbf2 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -72,12 +72,12 @@ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100,
 
 		$sql = "SELECT t.rowid FROM ".MAIN_DB_PREFIX."bank_account AS t LEFT JOIN ".MAIN_DB_PREFIX."bank_account_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
 		if ($category > 0) {
-			$sql .= ", ".MAIN_DB_PREFIX."categorie_account as c";
+			$sql .= ", ".MAIN_DB_PREFIX."element_category as c";
 		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('bank_account').')';
 		// Select accounts of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".((int) $category)." AND c.fk_account = t.rowid";
+			$sql .= " AND c.fk_category = ".((int) $category)." AND c.fk_element = t.rowid";
 		}
 		// Add sql filters
 		if ($sqlfilters) {
diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php
index 5637fd740a068..fd3a23f104ffa 100644
--- a/htdocs/compta/facture/class/facturestats.class.php
+++ b/htdocs/compta/facture/class/facturestats.class.php
@@ -118,7 +118,7 @@ public function __construct(DoliDB $db, $socid, $mode, $userid = 0, $typentid =
 		}
 
 		if ($categid) {
-			$this->where .= ' AND EXISTS (SELECT rowid FROM '.MAIN_DB_PREFIX.'categorie_societe as cats WHERE cats.fk_soc = f.fk_soc AND cats.fk_categorie = '.((int) $categid).')';
+			$this->where .= ' AND EXISTS (SELECT rowid FROM '.MAIN_DB_PREFIX.'element_category as cats WHERE cats.fk_element = f.fk_soc AND cats.fk_category = '.((int) $categid).')';
 		}
 	}
 
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index d207455ca58e2..beed2e0f1b19a 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2214,7 +2214,7 @@ public function getListOfContracts($option = 'all', $status = [], $product_categ
 		$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c";
 		if (!empty($product_categories)) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON cd.fk_contrat = c.rowid";
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = cd.fk_product AND cp.fk_categorie IN (".$this->db->sanitize(implode(', ', $product_categories)).")";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_category as cp ON cp.fk_element = cd.fk_product AND cp.fk_category IN (".$this->db->sanitize(implode(', ', $product_categories)).")";
 		}
 		$sql .= " WHERE c.fk_soc =".((int) $this->socid);
 		$sql .= ($option == 'others') ? " AND c.rowid <> ".((int) $this->id) : "";
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index cd060611b0119..ea71d505d10d0 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -194,8 +194,8 @@ public function __construct($db)
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
-		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_categorie = cat.rowid';
-		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'product as p ON p.rowid = cp.fk_product';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_category as cp ON cp.fk_category = cat.rowid';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'product as p ON p.rowid = cp.fk_element';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON extra.fk_object = p.rowid';
 		$this->export_sql_end[$r] .= ' WHERE cat.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .= ' AND cat.type = 0';
@@ -239,7 +239,7 @@ public function __construct($db)
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
-		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_fournisseur as cf ON cf.fk_categorie = cat.rowid';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_category as cf ON cf.fk_category = cat.rowid';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = cf.fk_soc';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
@@ -286,8 +286,8 @@ public function __construct($db)
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
-		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_societe as cs ON cs.fk_categorie = cat.rowid';
-		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = cs.fk_soc';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_category as cs ON cs.fk_category = cat.rowid';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = cs.fk_element';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id';
@@ -315,8 +315,8 @@ public function __construct($db)
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
-		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_member as cm ON cm.fk_categorie = cat.rowid';
-		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'adherent as p ON p.rowid = cm.fk_member';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_category as cm ON cm.fk_category = cat.rowid';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'adherent as p ON p.rowid = cm.fk_element';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'adherent_extrafields as extra ON cat.rowid = extra.fk_object ';
 		$this->export_sql_end[$r] .= ' WHERE cat.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .= ' AND cat.type = 3';
@@ -369,8 +369,8 @@ public function __construct($db)
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
-		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_contact as cc ON cc.fk_categorie = cat.rowid';
-		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'socpeople as p ON p.rowid = cc.fk_socpeople';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_category as cc ON cc.fk_category = cat.rowid';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'socpeople as p ON p.rowid = cc.fk_element';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = p.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_civility as civ ON civ.code = p.civility';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON c.rowid = p.fk_pays';
@@ -399,8 +399,8 @@ public function __construct($db)
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
-		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_project as cp ON cp.fk_categorie = cat.rowid';
-		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'projet as p ON p.rowid = cp.fk_project';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_category as cp ON cp.fk_category = cat.rowid';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'projet as p ON p.rowid = cp.fk_element';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet_extrafields as extra ON extra.fk_object = p.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
 		$this->export_sql_end[$r] .= ' WHERE cat.entity IN ('.getEntity('category').')';
@@ -425,7 +425,7 @@ public function __construct($db)
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
-		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_user as cu ON cu.fk_categorie = cat.rowid';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_category as cu ON cu.fk_category = cat.rowid';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'user as p ON p.rowid = cu.fk_user';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user_extrafields as extra ON extra.fk_object = p.rowid';
 		$this->export_sql_end[$r] .= ' WHERE cat.entity IN ('.getEntity('category').')';
@@ -480,16 +480,16 @@ public function __construct($db)
 			$this->import_label[$r] = "CatProdLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('cp'=>MAIN_DB_PREFIX.'categorie_product');
-			$this->import_fields_array[$r] = array('cp.fk_categorie'=>"Category*", 'cp.fk_product'=>"Product*");
-			$this->import_regex_array[$r] = array('cp.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=0');
+			$this->import_tables_array[$r] = array('cp'=>MAIN_DB_PREFIX.'element_category');
+			$this->import_fields_array[$r] = array('cp.fk_category'=>"Category*", 'cp.fk_element'=>"Product*");
+			$this->import_regex_array[$r] = array('cp.fk_category'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=0');
 
 			$this->import_convertvalue_array[$r] = array(
-					'cp.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-					'cp.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
+					'cp.fk_category'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
+					'cp.fk_element'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
 			);
-			$this->import_examplevalues_array[$r] = array('cp.fk_categorie'=>"rowid or label", 'cp.fk_product'=>"rowid or ref");
-			$this->import_updatekeys_array[$r] = array('cp.fk_categorie' => 'Category', 'cp.fk_product' => 'ProductRef');
+			$this->import_examplevalues_array[$r] = array('cp.fk_category'=>"rowid or label", 'cp.fk_element'=>"rowid or ref");
+			$this->import_updatekeys_array[$r] = array('cp.fk_category' => 'Category', 'cp.fk_element' => 'ProductRef');
 		}
 
 		// 1 Suppliers
@@ -499,18 +499,18 @@ public function __construct($db)
 			$this->import_label[$r] = "CatSupLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('cs'=>MAIN_DB_PREFIX.'categorie_fournisseur');
-			$this->import_fields_array[$r] = array('cs.fk_categorie'=>"Category*", 'cs.fk_soc'=>"Supplier*");
+			$this->import_tables_array[$r] = array('cs'=>MAIN_DB_PREFIX.'element_category');
+			$this->import_fields_array[$r] = array('cs.fk_category'=>"Category*", 'cs.fk_element'=>"Supplier*");
 			$this->import_regex_array[$r] = array(
-				'cs.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=1',
-				'cs.fk_soc'=>'rowid@'.MAIN_DB_PREFIX.'societe:fournisseur>0'
+				'cs.fk_category'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=1',
+				'cs.fk_element'=>'rowid@'.MAIN_DB_PREFIX.'societe:fournisseur>0'
 			);
 
 			$this->import_convertvalue_array[$r] = array(
-					'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-					'cs.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty')
+					'cs.fk_category'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
+					'cs.fk_element'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty')
 			);
-			$this->import_examplevalues_array[$r] = array('cs.fk_categorie'=>"rowid or label", 'cs.fk_soc'=>"rowid or name");
+			$this->import_examplevalues_array[$r] = array('cs.fk_category'=>"rowid or label", 'cs.fk_element'=>"rowid or name");
 		}
 
 		// 2 Customers
@@ -520,18 +520,18 @@ public function __construct($db)
 			$this->import_label[$r] = "CatCusLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('cs'=>MAIN_DB_PREFIX.'categorie_societe');
-			$this->import_fields_array[$r] = array('cs.fk_categorie'=>"Category*", 'cs.fk_soc'=>"Customer*");
+			$this->import_tables_array[$r] = array('cs'=>MAIN_DB_PREFIX.'element_category');
+			$this->import_fields_array[$r] = array('cs.fk_category'=>"Category*", 'cs.fk_element'=>"Customer*");
 			$this->import_regex_array[$r] = array(
-				'cs.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=2',
-				'cs.fk_soc'=>'rowid@'.MAIN_DB_PREFIX.'societe:client>0'
+				'cs.fk_category'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=2',
+				'cs.fk_element'=>'rowid@'.MAIN_DB_PREFIX.'societe:client>0'
 			);
 
 			$this->import_convertvalue_array[$r] = array(
-					'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-					'cs.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty')
+					'cs.fk_category'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
+					'cs.fk_element'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty')
 			);
-			$this->import_examplevalues_array[$r] = array('cs.fk_categorie'=>"rowid or label", 'cs.fk_soc'=>"rowid or name");
+			$this->import_examplevalues_array[$r] = array('cs.fk_category'=>"rowid or label", 'cs.fk_element'=>"rowid or name");
 		}
 
 		// 3 Members
@@ -541,15 +541,15 @@ public function __construct($db)
 			$this->import_label[$r] = "CatMembersLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('cm'=>MAIN_DB_PREFIX.'categorie_contact');
-			$this->import_fields_array[$r] = array('cm.fk_categorie'=>"Category*", 'cm.fk_member'=>"Member*");
-			$this->import_regex_array[$r] = array('cm.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=3');
+			$this->import_tables_array[$r] = array('cm'=>MAIN_DB_PREFIX.'element_category');
+			$this->import_fields_array[$r] = array('cm.fk_category'=>"Category*", 'cm.fk_element'=>"Member*");
+			$this->import_regex_array[$r] = array('cm.fk_category'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=3');
 
 			$this->import_convertvalue_array[$r] = array(
-				'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-				'cs.fk_member'=>array('rule'=>'fetchidfromref', 'classfile'=>'/adherents/class/adherent.class.php', 'class'=>'Adherent', 'method'=>'fetch', 'element'=>'Member')
+				'cm.fk_category'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
+				'cm.fk_element'=>array('rule'=>'fetchidfromref', 'classfile'=>'/adherents/class/adherent.class.php', 'class'=>'Adherent', 'method'=>'fetch', 'element'=>'Member')
 			);
-			$this->import_examplevalues_array[$r] = array('cs.fk_categorie'=>"rowid or label", 'cs.fk_member'=>"rowid or ref");
+			$this->import_examplevalues_array[$r] = array('cm.fk_category'=>"rowid or label", 'cm.fk_element'=>"rowid or ref");
 		}
 
 		// 4 Contacts/Addresses
@@ -559,18 +559,18 @@ public function __construct($db)
 			$this->import_label[$r] = "CatContactsLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('cc'=>MAIN_DB_PREFIX.'categorie_contact');
-			$this->import_fields_array[$r] = array('cc.fk_categorie'=>"Category*", 'cc.fk_socpeople'=>"IdContact*");
+			$this->import_tables_array[$r] = array('cc'=>MAIN_DB_PREFIX.'element_category');
+			$this->import_fields_array[$r] = array('cc.fk_category'=>"Category*", 'cc.fk_element'=>"IdContact*");
 			$this->import_regex_array[$r] = array(
-				'cc.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=4'
-				//'cc.fk_socpeople'=>'rowid@'.MAIN_DB_PREFIX.'socpeople'
+				'cc.fk_category'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=4'
+				//'cc.fk_element'=>'rowid@'.MAIN_DB_PREFIX.'socpeople'
 			);
 
 			$this->import_convertvalue_array[$r] = array(
-				'cc.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-				//'cc.fk_socpeople'=>array('rule'=>'fetchidfromref','classfile'=>'/contact/class/contact.class.php','class'=>'Contact','method'=>'fetch','element'=>'Contact')
+				'cc.fk_category'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
+				//'cc.fk_element'=>array('rule'=>'fetchidfromref','classfile'=>'/contact/class/contact.class.php','class'=>'Contact','method'=>'fetch','element'=>'Contact')
 			);
-			$this->import_examplevalues_array[$r] = array('cc.fk_categorie'=>"rowid or label", 'cc.fk_socpeople'=>"rowid");
+			$this->import_examplevalues_array[$r] = array('cc.fk_category'=>"rowid or label", 'cc.fk_element'=>"rowid");
 		}
 
 		// 5 Bank accounts, TODO ?
@@ -582,15 +582,15 @@ public function __construct($db)
 			$this->import_label[$r] = "CatProjectsLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('cp'=>MAIN_DB_PREFIX.'categorie_project');
-			$this->import_fields_array[$r] = array('cp.fk_categorie'=>"Category*", 'cp.fk_project'=>"Project*");
-			$this->import_regex_array[$r] = array('cp.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=6');
+			$this->import_tables_array[$r] = array('cp'=>MAIN_DB_PREFIX.'element_category');
+			$this->import_fields_array[$r] = array('cp.fk_category'=>"Category*", 'cp.fk_element'=>"Project*");
+			$this->import_regex_array[$r] = array('cp.fk_category'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=6');
 
 			$this->import_convertvalue_array[$r] = array(
-				'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-				'cs.fk_project'=>array('rule'=>'fetchidfromref', 'classfile'=>'/projet/class/project.class.php', 'class'=>'Project', 'method'=>'fetch', 'element'=>'Project')
+				'cp.fk_category'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
+				'cp.fk_project'=>array('rule'=>'fetchidfromref', 'classfile'=>'/projet/class/project.class.php', 'class'=>'Project', 'method'=>'fetch', 'element'=>'Project')
 			);
-			$this->import_examplevalues_array[$r] = array('cp.fk_categorie'=>"rowid or label", 'cp.fk_project'=>"rowid or ref");
+			$this->import_examplevalues_array[$r] = array('cp.fk_category'=>"rowid or label", 'cp.fk_element'=>"rowid or ref");
 		}
 
 		// 7 Users
@@ -600,15 +600,15 @@ public function __construct($db)
 			$this->import_label[$r] = "CatUsersLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('cu'=>MAIN_DB_PREFIX.'categorie_user');
-			$this->import_fields_array[$r] = array('cu.fk_categorie'=>"Category*", 'cu.fk_user'=>"User*");
-			$this->import_regex_array[$r] = array('cu.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=7');
+			$this->import_tables_array[$r] = array('cu'=>MAIN_DB_PREFIX.'element_category');
+			$this->import_fields_array[$r] = array('cu.fk_category'=>"Category*", 'cu.fk_user'=>"User*");
+			$this->import_regex_array[$r] = array('cu.fk_category'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=7');
 
 			$this->import_convertvalue_array[$r] = array(
-				'cu.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-				'cu.fk_user'=>array('rule'=>'fetchidfromref', 'classfile'=>'/user/class/user.class.php', 'class'=>'User', 'method'=>'fetch', 'element'=>'User')
+				'cu.fk_category'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
+				'cu.fk_element'=>array('rule'=>'fetchidfromref', 'classfile'=>'/user/class/user.class.php', 'class'=>'User', 'method'=>'fetch', 'element'=>'User')
 			);
-			$this->import_examplevalues_array[$r] = array('cu.fk_categorie'=>"rowid or label", 'cu.fk_user'=>"rowid or login");
+			$this->import_examplevalues_array[$r] = array('cu.fk_category'=>"rowid or label", 'cu.fk_element'=>"rowid or login");
 		}
 
 		// 8 Bank Lines, TODO ?
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index d8192a37df452..0bde75e9c4259 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -307,7 +307,7 @@ public function __construct($db)
 			$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 		}
 		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
-			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cp.fk_categorie = cat.rowid';
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_category as cp ON cp.fk_element = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cp.fk_category = cat.rowid';
 		}
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lang as l ON l.fk_product = p.rowid';
@@ -330,12 +330,14 @@ public function __construct($db)
 			$this->export_code[$r] = $this->rights_class.'_'.$r;
 			$this->export_label[$r] = "ProductsMultiPrice"; // Translation key (used only if key ExportDataset_xxx_z not found)
 			$this->export_permission[$r] = array(array("produit", "export"));
-			$this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref", 'p.label'=>"Label",
+			$this->export_fields_array[$r] = array(
+				'p.rowid'=>"Id", 'p.ref'=>"Ref", 'p.label'=>"Label",
 				'pr.price_base_type'=>"PriceBase", 'pr.price_level'=>"PriceLevel",
 				'pr.price'=>"PriceLevelUnitPriceHT", 'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
 				'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
 				'pr.tva_tx'=>'PriceLevelVATRate',
-				'pr.date_price'=>'DateCreation');
+				'pr.date_price'=>'DateCreation',
+			);
 			if (is_object($mysoc) && $usenpr) {
 				$this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
 			}
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 4466138e0066b..11dc16e45d14e 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -927,8 +927,8 @@ public function delete($user, $notrigger = 0)
 
 		// Remove linked categories.
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_project";
-			$sql .= " WHERE fk_project = ".((int) $this->id);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_category";
+			$sql .= " WHERE fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=6) AND fk_element = ".((int) $this->id);
 
 			$result = $this->db->query($sql);
 			if (!$result) {
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index c651649cd9110..a7be108671de9 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -646,9 +646,10 @@
 	foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
 		if (intval($searchCategoryCustomer) == -2) {
 			$sqlCategoryCustomerNotExists  = " NOT EXISTS (";
-			$sqlCategoryCustomerNotExists .= " SELECT cat_cus.fk_soc";
-			$sqlCategoryCustomerNotExists .= " FROM ".$db->prefix()."categorie_societe AS cat_cus";
-			$sqlCategoryCustomerNotExists .= " WHERE cat_cus.fk_soc = p.fk_soc";
+			$sqlCategoryCustomerNotExists .= " SELECT cat_cus.fk_element";
+			$sqlCategoryCustomerNotExists .= " FROM ".$db->prefix()."element_category AS cat_cus";
+			$sqlCategoryCustomerNotExists .= " WHERE cat_cus.fk_element = p.fk_soc";
+			$sqlCategoryCustomerNotExists .= " AND cat_cus.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=2)";
 			$sqlCategoryCustomerNotExists .= " )";
 			$searchCategoryCustomerSqlList[] = $sqlCategoryCustomerNotExists;
 		} elseif (intval($searchCategoryCustomer) > 0) {
@@ -657,10 +658,10 @@
 	}
 	if (!empty($existsCategoryCustomerList)) {
 		$sqlCategoryCustomerExists = " EXISTS (";
-		$sqlCategoryCustomerExists .= " SELECT cat_cus.fk_soc";
-		$sqlCategoryCustomerExists .= " FROM ".$db->prefix()."categorie_societe AS cat_cus";
-		$sqlCategoryCustomerExists .= " WHERE cat_cus.fk_soc = p.fk_soc";
-		$sqlCategoryCustomerExists .= " AND cat_cus.fk_categorie IN (".$db->sanitize(implode(',', $existsCategoryCustomerList)).")";
+		$sqlCategoryCustomerExists .= " SELECT cat_cus.fk_element";
+		$sqlCategoryCustomerExists .= " FROM ".$db->prefix()."element_category AS cat_cus";
+		$sqlCategoryCustomerExists .= " WHERE cat_cus.fk_element = p.fk_soc";
+		$sqlCategoryCustomerExists .= " AND cat_cus.fk_category IN (".$db->sanitize(implode(',', $existsCategoryCustomerList)).")";
 		$sqlCategoryCustomerExists .= " )";
 		$searchCategoryCustomerSqlList[] = $sqlCategoryCustomerExists;
 	}
@@ -671,13 +672,14 @@
 	foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
 		if (intval($searchCategoryCustomer) == -2) {
 			$sqlCategoryCustomerNotExists = " NOT EXISTS (";
-			$sqlCategoryCustomerNotExists .= " SELECT cat_cus.fk_soc";
-			$sqlCategoryCustomerNotExists .= " FROM ".$db->prefix()."categorie_societe AS cat_cus";
-			$sqlCategoryCustomerNotExists .= " WHERE cat_cus.fk_soc = p.fk_soc";
+			$sqlCategoryCustomerNotExists .= " SELECT cat_cus.fk_element";
+			$sqlCategoryCustomerNotExists .= " FROM ".$db->prefix()."element_category AS cat_cus";
+			$sqlCategoryCustomerNotExists .= " WHERE cat_cus.fk_element = p.fk_soc";
+			$sqlCategoryCustomerNotExists .= " AND cat_cus.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=2)";
 			$sqlCategoryCustomerNotExists .= " )";
 			$searchCategoryCustomerSqlList[] = $sqlCategoryCustomerNotExists;
 		} elseif (intval($searchCategoryCustomer) > 0) {
-			$searchCategoryCustomerSqlList[] = "p.fk_soc IN (SELECT fk_soc FROM ".$db->prefix()."categorie_societe WHERE fk_categorie = ".((int) $searchCategoryCustomer).")";
+			$searchCategoryCustomerSqlList[] = "p.fk_soc IN (SELECT fk_element FROM ".$db->prefix()."element_category WHERE fk_category = ".((int) $searchCategoryCustomer).")";
 		}
 	}
 	if (!empty($searchCategoryCustomerSqlList)) {
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index d64aaa910c435..06e7a481bfd69 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -3844,7 +3844,7 @@ public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hided
 	 *  Return property of user from its id
 	 *
 	 *  @param	int		$rowid      id of contact
-	 *  @param  string	$mode       'email' or 'mobile'
+	 *  @param  string	$mode       'email', 'mobile', or 'name'
 	 *  @return string  			Email of user with format: "Full name <email>"
 	 */
 	public function user_get_property($rowid, $mode)
@@ -3871,6 +3871,8 @@ public function user_get_property($rowid, $mode)
 					$user_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
 				} elseif ($mode == 'mobile') {
 					$user_property = $obj->user_mobile;
+				} elseif ($mode == 'name') {
+					$user_property = dolGetFirstLastname($obj->firstname, $obj->lastname);
 				}
 			}
 			return $user_property;

From d3661020b1db17e6ee89be5cd9ea478ccf6ca873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 17 Jul 2023 13:29:00 +0200
Subject: [PATCH 27/69] wip

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

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index f76fb2e4cf8ad..c93d6734ce510 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -578,7 +578,7 @@
 	$sql .= ", sc.fk_soc, sc.fk_user";
 }
 if (!empty($search_categ_cus) && $search_categ_cus != '-1') {
-	$sql .= ", cc.fk_category, cc.fk_soc";
+	$sql .= ", cc.fk_category, cc.fk_element";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {

From b1ff766bd5b3edfdbe6da290cb21d92713eeb66a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 17 Jul 2023 13:43:56 +0200
Subject: [PATCH 28/69] wip

---
 htdocs/user/class/userbankaccount.class.php |  4 ++--
 htdocs/website/class/websitepage.class.php  | 21 ++++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 85c8cbc7af7f1..e7e2d86ab3cc4 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -241,8 +241,8 @@ public function delete(User $user = null)
 		// Delete link between tag and bank account
 		/*
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_account";
-			$sql .= " WHERE fk_account = ".((int) $this->id);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_category";
+			$sql .= " WHERE fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=5) AND fk_element = ".((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index dbc66ff3ca43e..c2784bf4b91b0 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -58,7 +58,7 @@ class WebsitePage extends CommonObject
 	/**
 	 * @var array	List of child tables. To know object to delete on cascade.
 	 */
-	protected $childtablesoncascade = array('categorie_website_page');
+	protected $childtablesoncascade = array();
 
 
 	/**
@@ -128,6 +128,16 @@ class WebsitePage extends CommonObject
 	 */
 	public $fk_object;
 
+	/**
+	 * @var int id user create
+	 */
+	public $fk_user_creat;
+
+	/**
+	 * @var int id user modif
+	 */
+	public $fk_user_modif;
+
 	const STATUS_DRAFT = 0;			// offline
 	const STATUS_VALIDATED = 1;		// online
 
@@ -599,6 +609,15 @@ public function delete(User $user, $notrigger = false)
 
 		$error = 0;
 
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX.'element_category';
+		$sql .= " WHERE fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=11) AND fk_element = ".(int) $this->id;
+
+		$result = $this->db->query($sql);
+		if (!$result) {
+			$error++;
+			$this->errors[] = $this->db->lasterror();
+		}
+
 		// Delete all child tables
 		if (!$error) {
 			foreach ($this->childtablesoncascade as $table) {

From a02dc90f99111ed9861dd4f3dca1911100281c69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 17 Jul 2023 13:48:13 +0200
Subject: [PATCH 29/69] wip

---
 htdocs/categories/class/categorie.class.php |  6 +++---
 htdocs/projet/class/project.class.php       | 18 ------------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index dba9a29e1f4b6..34d0d75ec5be3 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -935,11 +935,11 @@ public function getListForItem($id, $type = 'customer', $sortfield = "s.rowid",
 		$idoftype = array_search($type, self::$MAP_ID_TO_CODE);
 
 		$sql = "SELECT s.rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as s, ".MAIN_DB_PREFIX."categorie_".$sub_type." as sub";
+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as s, ".MAIN_DB_PREFIX."element_category as sub";
 		$sql .= ' WHERE s.entity IN ('.getEntity('category').')';
 		$sql .= ' AND s.type='.((int) $idoftype);
-		$sql .= ' AND s.rowid = sub.fk_categorie';
-		$sql .= " AND sub.".$subcol_name." = ".((int) $id);
+		$sql .= ' AND s.rowid = sub.fk_category';
+		$sql .= " AND sub.fk_element = ".((int) $id);
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 11dc16e45d14e..060054145b4af 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -946,24 +946,6 @@ public function delete($user, $notrigger = 0)
 			$error++;
 		}
 
-
-		// Delete all child tables
-		if (!$error) {
-			$elements = array('categorie_project'); // elements to delete. TODO Make goodway to delete
-			foreach ($elements as $table) {
-				if (!$error) {
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
-					$sql .= " WHERE fk_project = ".((int) $this->id);
-
-					$result = $this->db->query($sql);
-					if (!$result) {
-						$error++;
-						$this->errors[] = $this->db->lasterror();
-					}
-				}
-			}
-		}
-
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_extrafields";
 			$sql .= " WHERE fk_object = ".((int) $this->id);

From 7c00e344b286d26b633826e4643e0c3d75dfbd60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 18 Jul 2023 09:22:42 +0200
Subject: [PATCH 30/69] wip

---
 htdocs/compta/stats/cabyprodserv.php            | 6 +++---
 htdocs/core/modules/mailings/fraise.modules.php | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 27b5a5b2723b4..d210337c9dba6 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -338,11 +338,11 @@
 		}
 
 		$sql .= " AND (p.rowid IN ";
-		$sql .= " (SELECT fk_product FROM ".MAIN_DB_PREFIX."categorie_product cp WHERE ";
+		$sql .= " (SELECT fk_element FROM ".MAIN_DB_PREFIX."element_category as cp WHERE ";
 		if ($subcat) {
-			$sql .= "cp.fk_categorie IN (".$db->sanitize($listofcatsql).")";
+			$sql .= "cp.fk_category IN (".$db->sanitize($listofcatsql).")";
 		} else {
-			$sql .= "cp.fk_categorie = ".((int) $selected_cat);
+			$sql .= "cp.fk_category = ".((int) $selected_cat);
 		}
 		$sql .= "))";
 	}
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 65bb106ceb45f..f10c1a75d9771 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -98,6 +98,7 @@ public function getSqlArrayForStats()
 	 */
 	public function getNbOfRecipients($sql = '')
 	{
+		global $conf;
 		$sql  = "SELECT count(distinct(a.email)) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
 		$sql .= " WHERE (a.email IS NOT NULL AND a.email != '') AND a.entity IN (".getEntity('member').")";
@@ -236,7 +237,7 @@ public function url($id)
 	public function add_to_target($mailing_id)
 	{
 		// phpcs:enable
-		global $langs, $_POST;
+		global $conf, $langs, $_POST;
 
 		// Load translation files required by the page
 		$langs->loadLangs(array("members", "companies"));
@@ -253,8 +254,8 @@ public function add_to_target($mailing_id)
 		$sql .= " a.datefin, a.civility as civility_id, a.login, a.societe"; // Other fields
 		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
 		if (GETPOST('filter_category', 'int') > 0) {
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = a.rowid";
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie AND c.rowid = ".((int) GETPOST('filter_category', 'int'));
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_category as cm ON cm.fk_element = a.rowid";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_category AND c.rowid = ".((int) GETPOST('filter_category', 'int'));
 		}
 		$sql .= " , ".MAIN_DB_PREFIX."adherent_type as ta";
 		$sql .= " WHERE a.entity IN (".getEntity('member').") AND a.email <> ''"; // Note that null != '' is false

From 1539510707d6681131c407cf1003b41c3229ebd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 18 Jul 2023 11:36:06 +0200
Subject: [PATCH 31/69] wip

---
 htdocs/compta/facture/stats/index.php    | 8 ++++----
 htdocs/compta/stats/cabyprodserv.php     | 4 ++--
 htdocs/product/stats/card.php            | 2 +-
 htdocs/webservices/server_thirdparty.php | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 8e81de43d1fbc..a166e6c59ce90 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -103,8 +103,8 @@
 		$stats->where .= ' AND f.fk_statut IN ('.$db->sanitize($object_status).')';
 	}
 	if (is_array($custcats) && !empty($custcats)) {
-		$stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cat ON (f.fk_soc = cat.fk_soc)';
-		$stats->where .= ' AND cat.fk_categorie IN ('.$db->sanitize(implode(',', $custcats)).')';
+		$stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_category as cat ON (f.fk_soc = cat.fk_element)';
+		$stats->where .= ' AND cat.fk_category IN ('.$db->sanitize(implode(',', $custcats)).')';
 	}
 }
 if ($mode == 'supplier') {
@@ -112,8 +112,8 @@
 		$stats->where .= ' AND f.fk_statut IN ('.$db->sanitize($object_status).')';
 	}
 	if (is_array($custcats) && !empty($custcats)) {
-		$stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_fournisseur as cat ON (f.fk_soc = cat.fk_soc)';
-		$stats->where .= ' AND cat.fk_categorie IN ('.$db->sanitize(implode(',', $custcats)).')';
+		$stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_category as cat ON (f.fk_soc = cat.fk_element)';
+		$stats->where .= ' AND cat.fk_category IN ('.$db->sanitize(implode(',', $custcats)).')';
 	}
 }
 
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index d210337c9dba6..75ff429b15553 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -301,7 +301,7 @@
 	$sql .= ",".MAIN_DB_PREFIX."facturedet as l";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid";
 	if ($selected_cat === -2) {	// Without any category
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_category as cp ON p.rowid = cp.fk_element";
 	}
 
 	$parameters = array();
@@ -323,7 +323,7 @@
 		$sql .= " AND l.product_type = ".((int) $selected_type);
 	}
 	if ($selected_cat === -2) {	// Without any category
-		$sql .= " AND cp.fk_product is null";
+		$sql .= " AND cp.fk_element is null AND cp.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=0)";
 	} elseif ($selected_cat > 0) {	// Into a specific category
 		if ($subcat) {
 			$TListOfCats = $categorie->get_full_arbo('product', $selected_cat, 1);
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index a91927e77d4d1..1896d29368517 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -396,7 +396,7 @@
 						$morefilters = ' AND d.fk_product IN ('.$db->sanitize((is_array($listofprodids) && count($listofprodids)) ? join(',', $listofprodids) : '0').')';
 					}
 					if ($search_categ == -2) {
-						$morefilters = ' AND NOT EXISTS (SELECT cp.fk_product FROM '.MAIN_DB_PREFIX.'categorie_product as cp WHERE d.fk_product = cp.fk_product)';
+						$morefilters = ' AND NOT EXISTS (SELECT cp.fk_element FROM '.MAIN_DB_PREFIX.'element_category as cp WHERE d.fk_product = cp.fk_element AND cp.fk_category IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'categorie WHERE type=0))';
 					}
 
 					if ($key == 'propal') {
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index b9d63ad4b24a1..b1b8d68a8c0b3 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -731,7 +731,7 @@ function getListOfThirdParties($authentication, $filterthirdparty)
 				$sql .= " AND s.fournisseur = ".((int) $val);
 			}
 			if ($key == 'category' && (int) $val > 0) {
-				$sql .= " AND s.rowid IN (SELECT fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie = ".((int) $val).") ";
+				$sql .= " AND s.rowid IN (SELECT fk_element FROM ".MAIN_DB_PREFIX."element_category WHERE fk_category = ".((int) $val).") ";
 			}
 		}
 		dol_syslog("Function: getListOfThirdParties", LOG_DEBUG);

From a8d84296f5bdf38521c78115f77379193d61d073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 18 Jul 2023 11:39:36 +0200
Subject: [PATCH 32/69] wip

---
 htdocs/product/stock/class/api_warehouses.class.php | 6 +++---
 htdocs/projet/class/api_projects.class.php          | 4 ++--
 htdocs/takepos/ajax/ajax.php                        | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index 28ae1f252471a..aec4d40138ccc 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -106,13 +106,13 @@ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100,
 		$sql = "SELECT t.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot AS t LEFT JOIN ".MAIN_DB_PREFIX."entrepot_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
 		if ($category > 0) {
-			$sql .= ", ".$this->db->prefix()."categorie_societe as c";
+			$sql .= ", ".$this->db->prefix()."element_category as c";
 		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('stock').')';
 		// Select warehouses of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".((int) $category);
-			$sql .= " AND c.fk_warehouse = t.rowid ";
+			$sql .= " AND c.fk_category = ".((int) $category);
+			$sql .= " AND c.fk_element = t.rowid ";
 		}
 		// Add sql filters
 		if ($sqlfilters) {
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index c26264aaccf70..5d132bad77994 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -124,7 +124,7 @@ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100,
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as t";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_extrafields AS ef ON ef.fk_object = t.rowid";	// So we will be able to filter on extrafields
 		if ($category > 0) {
-			$sql .= ", ".MAIN_DB_PREFIX."categorie_project as c";
+			$sql .= ", ".MAIN_DB_PREFIX."element_category as c";
 		}
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
@@ -146,7 +146,7 @@ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100,
 		}
 		// Select projects of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".((int) $category)." AND c.fk_project = t.rowid ";
+			$sql .= " AND c.fk_category = ".((int) $category)." AND c.fk_element = t.rowid ";
 		}
 		// Add sql filters
 		if ($sqlfilters) {
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 56796b121d4d1..a48840ee029ab 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -179,7 +179,7 @@
 				$sql .= " WHERE entity IN (" . getEntity('product') . ")";
 				$sql .= " AND ref = '" . $db->escape($barcode_value_list['ref']) . "'";
 				if ($filteroncategids) {
-					$sql .= " AND EXISTS (SELECT cp.fk_product FROM " . $db->prefix() . "categorie_product as cp WHERE cp.fk_product = p.rowid AND cp.fk_categorie IN (".$db->sanitize($filteroncategids)."))";
+					$sql .= " AND EXISTS (SELECT cp.fk_element FROM " . $db->prefix() . "element_categoriy as cp WHERE cp.fk_element = p.rowid AND cp.fk_category IN (".$db->sanitize($filteroncategids)."))";
 				}
 				$sql .= " AND tosell = 1";
 				$sql .= " AND (barcode IS NULL OR barcode <> '" . $db->escape($term) . "')";
@@ -269,7 +269,7 @@
 
 	$sql .= ' WHERE entity IN ('.getEntity('product').')';
 	if ($filteroncategids) {
-		$sql .= ' AND EXISTS (SELECT cp.fk_product FROM '.MAIN_DB_PREFIX.'categorie_product as cp WHERE cp.fk_product = p.rowid AND cp.fk_categorie IN ('.$db->sanitize($filteroncategids).'))';
+		$sql .= ' AND EXISTS (SELECT cp.fk_element FROM '.MAIN_DB_PREFIX.'element_category as cp WHERE cp.fk_element = p.rowid AND cp.fk_category IN ('.$db->sanitize($filteroncategids).'))';
 	}
 	$sql .= ' AND p.tosell = 1';
 	if (getDolGlobalInt('TAKEPOS_PRODUCT_IN_STOCK') == 1) {

From f277bcb2c2bcf79b0db0a9a61c1366b054063611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 18 Jul 2023 17:40:16 +0200
Subject: [PATCH 33/69] wip

---
 htdocs/commande/class/commandestats.class.php | 8 +++++---
 htdocs/societe/class/societe.class.php        | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index 1f708ae85c101..c624f7cfbe9c4 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -47,6 +47,10 @@ class CommandeStats extends Stats
 	public $from_line;
 	public $field;
 	public $field_line;
+
+	/**
+	 * @deprecated use always element_category
+	 */
 	public $categ_link;
 	public $where;
 	public $join;
@@ -80,7 +84,6 @@ public function __construct($db, $socid, $mode, $userid = 0, $typentid = 0, $cat
 			$this->field = 'total_ht';
 			$this->field_line = 'total_ht';
 			//$this->where .= " c.fk_statut > 0"; // Not draft and not cancelled
-			$this->categ_link = MAIN_DB_PREFIX.'categorie_societe';
 		} elseif ($mode == 'supplier') {
 			$object = new CommandeFournisseur($this->db);
 			$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
@@ -88,7 +91,6 @@ public function __construct($db, $socid, $mode, $userid = 0, $typentid = 0, $cat
 			$this->field = 'total_ht';
 			$this->field_line = 'total_ht';
 			//$this->where .= " c.fk_statut > 2"; // Only approved & ordered
-			$this->categ_link = MAIN_DB_PREFIX.'categorie_fournisseur';
 		}
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
 		$this->where .= ($this->where ? ' AND ' : '').'c.entity IN ('.getEntity('commande').')';
@@ -106,7 +108,7 @@ public function __construct($db, $socid, $mode, $userid = 0, $typentid = 0, $cat
 		}
 
 		if ($categid) {
-			$this->where .= ' AND EXISTS (SELECT rowid FROM '.$this->categ_link.' as cats WHERE cats.fk_soc = c.fk_soc AND cats.fk_categorie = '.((int) $categid).')';
+			$this->where .= ' AND EXISTS (SELECT rowid FROM '.MAIN_DB_PREFIX.'element_category as cats WHERE cats.fk_element = c.fk_soc AND cats.fk_category = '.((int) $categid).')';
 		}
 	}
 
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index c3ec26d3f373e..aba5724715e8c 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4141,10 +4141,10 @@ public function AddFournisseurInCategory($categorie_id)
 	{
 		// phpcs:enable
 		if ($categorie_id > 0 && $this->id > 0) {
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_category (fk_category, fk_element) ";
 			$sql .= " VALUES (".((int) $categorie_id).", ".((int) $this->id).")";
 
-			if ($resql = $this->db->query($sql)) {
+			if ($this->db->query($sql)) {
 				return 0;
 			}
 		} else {

From 067b9dfcf4db80ba8334fb3f78a687e53a07bf09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 19 Jul 2023 10:05:41 +0200
Subject: [PATCH 34/69] wip

---
 htdocs/categories/class/categorie.class.php | 51 ++++++---------------
 htdocs/contact/class/contact.class.php      |  2 +-
 2 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 34d0d75ec5be3..3cd7e44cf68f7 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -605,43 +605,20 @@ public function delete($user, $notrigger = 0)
 			}
 		}
 
-		$arraydelete = array(
-			'categorie_account' => 'fk_categorie',
-			'categorie_actioncomm' => 'fk_categorie',
-			'categorie_contact' => 'fk_categorie',
-			'categorie_fournisseur' => 'fk_categorie',
-			'categorie_knowledgemanagement' => array('field' => 'fk_categorie', 'enabled' => isModEnabled('knowledgemanagement')),
-			'categorie_member' => 'fk_categorie',
-			'categorie_user' => 'fk_categorie',
-			'categorie_product' => 'fk_categorie',
-			'categorie_project' => 'fk_categorie',
-			'categorie_societe' => 'fk_categorie',
-			'categorie_ticket' => array('field' => 'fk_categorie', 'enabled' => isModEnabled('ticket')),
-			'categorie_warehouse' => 'fk_categorie',
-			'categorie_website_page' => array('field' => 'fk_categorie', 'enabled' => isModEnabled('website')),
-			'bank_class' => 'fk_categ',
-			'categorie_lang' => 'fk_category',
-			'categorie' => 'rowid',
-		);
-		foreach ($arraydelete as $key => $value) {
-			if (is_array($value)) {
-				if (empty($value['enabled'])) {
-					continue;
-				}
-				$value = $value['field'];
-			}
-			if ($key == 'categorie') {
-				$sql  = "DELETE FROM ".MAIN_DB_PREFIX."categorie";
-				$sql .= " WHERE rowid = ".((int) $this->id);
-			} else {
-				$sql  = "DELETE FROM ".MAIN_DB_PREFIX."element_category";
-				$sql .= " WHERE fk_category = ".((int) $this->id);
-			}
-			if (!$this->db->query($sql)) {
-				$this->errors[] = $this->db->lasterror();
-				dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
-				$error++;
-			}
+		$sql  = "DELETE FROM ".MAIN_DB_PREFIX."element_category";
+		$sql .= " WHERE fk_category = ".((int) $this->id);
+		if (!$this->db->query($sql)) {
+			$this->errors[] = $this->db->lasterror();
+			dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
+			$error++;
+		}
+
+		$sql  = "DELETE FROM ".MAIN_DB_PREFIX."categorie";
+		$sql .= " WHERE rowid = ".((int) $this->id);
+		if (!$this->db->query($sql)) {
+			$this->errors[] = $this->db->lasterror();
+			dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
+			$error++;
 		}
 
 		// Removed extrafields
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 3a4128f01cfce..b34f65ad969b4 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -1317,7 +1317,7 @@ public function delete($notrigger = 0)
 
 		if (!$error) {
 			// Remove category
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_contact WHERE fk_socpeople = ".((int) $this->id);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_category WHERE fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=4) AND fk_element = ".((int) $this->id);
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {

From 971eebead8dc1dda50798a87bf4f8a17634f8d35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 19 Jul 2023 10:27:08 +0200
Subject: [PATCH 35/69] fix merge

---
 htdocs/product/card.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 15a04ce400354..f80d131b1ecf8 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -2054,11 +2054,7 @@
 				print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
 				print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'class="pictofixedwidth"');
 				print $formproduct->selectWarehouses((GETPOSTISSET('fk_default_warehouse') ? GETPOST('fk_default_warehouse') : $object->fk_default_warehouse), 'fk_default_warehouse', 'warehouseopen', 1);
-<<<<<<< HEAD
-				print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?action=edit&id='.((int) $object->id).'">';
-=======
 				print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken().'&type='.GETPOST('type', 'int')).'">';
->>>>>>> branch '15.0' of git@github.com:Dolibarr/dolibarr.git
 				print '<span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span></a>';
 				print '</td></tr>';
 				/*

From d878ce06c688cd1ab1c40977a40de3c97d67bcec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 19 Jul 2023 18:35:45 +0200
Subject: [PATCH 36/69] wip

---
 htdocs/comm/mailing/class/advtargetemailing.class.php |  4 ++--
 htdocs/compta/facture/list.php                        |  8 ++++----
 htdocs/compta/facture/prelevement.php                 |  3 ++-
 htdocs/contrat/services_list.php                      |  4 ++--
 htdocs/projet/tasks/list.php                          | 10 +++++-----
 htdocs/societe/list.php                               |  8 ++++----
 htdocs/supplier_proposal/list.php                     |  4 ++--
 7 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index 271f0d49ad32f..e22fa89e6fce7 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -575,7 +575,7 @@ public function query_thirdparty($arrayquery)
 			if (!empty($arrayquery['cust_typecust']) && count($arrayquery['cust_typecust']) > 0) {
 				$sqlwhere[] = " (t.client IN (".$this->db->sanitize(implode(',', $arrayquery['cust_typecust']))."))";
 			}
-			if (!empty($arrayquery['cust_comm_status']) && count($arrayquery['cust_comm_status'] > 0)) {
+			if (!empty($arrayquery['cust_comm_status']) && count($arrayquery['cust_comm_status']) > 0) {
 				$sqlwhere[] = " (t.fk_stcomm IN (".$this->db->sanitize(implode(',', $arrayquery['cust_comm_status']))."))";
 			}
 			if (!empty($arrayquery['cust_prospect_status']) && count($arrayquery['cust_prospect_status']) > 0) {
@@ -816,7 +816,7 @@ public function query_contact($arrayquery, $withThirdpartyFilter = 0)
 					if (!empty($arrayquery['cust_typecust']) && count($arrayquery['cust_typecust']) > 0) {
 						$sqlwhere[] = " (ts.client IN (".$this->db->sanitize(implode(',', $arrayquery['cust_typecust']))."))";
 					}
-					if (!empty($arrayquery['cust_comm_status']) && count($arrayquery['cust_comm_status'] > 0)) {
+					if (!empty($arrayquery['cust_comm_status']) && count($arrayquery['cust_comm_status']) > 0) {
 						$sqlwhere[] = " (ts.fk_stcomm IN (".$this->db->sanitize(implode(',', $arrayquery['cust_comm_status']))."))";
 					}
 					if (!empty($arrayquery['cust_prospect_status']) && count($arrayquery['cust_prospect_status']) > 0) {
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 7211b7098a6ea..78228f62c5237 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -838,14 +838,14 @@
 			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."facturedet as fd WHERE fd.fk_facture = f.rowid AND fd.fk_product = ck.fk_product)";
 		} elseif (intval($searchCategoryProduct) > 0) {
 			if ($searchCategoryProductOperator == 0) {
-				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."facturedet as fd WHERE fd.fk_facture = f.rowid AND fd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
+				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."facturedet as fd WHERE fd.fk_facture = f.rowid AND fd.fk_product = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProduct).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."facturedet as fd WHERE fd.fk_facture = f.rowid AND fd.fk_product = ck.fk_product AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."facturedet as fd WHERE fd.fk_facture = f.rowid AND fd.fk_product = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryProductOperator == 1) {
 		if (!empty($searchCategoryProductSqlList)) {
@@ -868,14 +868,14 @@
 			$searchCategoryCustomerSqlList[] = "NOT EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as ck WHERE s.rowid = ck.fk_soc)";
 		} elseif (intval($searchCategoryCustomer) > 0) {
 			if ($searchCategoryCustomerOperator == 0) {
-				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie = ".((int) $searchCategoryCustomer).")";
+				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryCustomer).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryCustomerOperator == 1) {
 		if (!empty($searchCategoryCustomerSqlList)) {
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 4962448f18cb2..0c40c22fe0c53 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -550,9 +550,10 @@
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($object->type != $object::TYPE_CREDIT_NOTE) {
-		$duedate = $object->date_lim_reglement;
 		if ($type == 'bank-transfer') {
 			$duedate = $object->date_echeance;
+		} else {
+			$duedate = $object->date_lim_reglement;
 		}
 
 		if ($action == 'editpaymentterm') {
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 859bf4b62b048..ab84d4cc4d268 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -254,12 +254,12 @@
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
 if ($search_product_category > 0) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=cd.fk_product';
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_category as cp ON cp.fk_element=cd.fk_product';
 }
 $sql .= " WHERE c.entity IN (".getEntity($object->element).")";
 $sql .= " AND c.rowid = cd.fk_contrat";
 if ($search_product_category > 0) {
-	$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
+	$sql .= " AND cp.fk_category = ".((int) $search_product_category);
 }
 $sql .= " AND c.fk_soc = s.rowid";
 if (empty($user->rights->societe->client->voir) && !$socid) {
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 992bae1896f0e..7b7a9f85656e6 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -501,10 +501,10 @@
 	}
 	if (!empty($existsCategoryCustomerList)) {
 		$sqlCategoryCustomerExists = " EXISTS (";
-		$sqlCategoryCustomerExists .= " SELECT cat_cus.fk_soc";
-		$sqlCategoryCustomerExists .= " FROM ".$db->prefix()."categorie_societe AS cat_cus";
-		$sqlCategoryCustomerExists .= " WHERE cat_cus.fk_soc = p.fk_soc";
-		$sqlCategoryCustomerExists .= " AND cat_cus.fk_categorie IN (".$db->sanitize(implode(',', $existsCategoryCustomerList)).")";
+		$sqlCategoryCustomerExists .= " SELECT cat_cus.fk_element";
+		$sqlCategoryCustomerExists .= " FROM ".$db->prefix()."element_category AS cat_cus";
+		$sqlCategoryCustomerExists .= " WHERE cat_cus.fk_element = p.fk_soc";
+		$sqlCategoryCustomerExists .= " AND cat_cus.fk_category IN (".$db->sanitize(implode(',', $existsCategoryCustomerList)).")";
 		$sqlCategoryCustomerExists .= " )";
 		$searchCategoryCustomerSqlList[] = $sqlCategoryCustomerExists;
 	}
@@ -521,7 +521,7 @@
 			$sqlCategoryCustomerNotExists .= " )";
 			$searchCategoryCustomerSqlList[] = $sqlCategoryCustomerNotExists;
 		} elseif (intval($searchCategoryCustomer) > 0) {
-			$searchCategoryCustomerSqlList[] = "p.fk_soc IN (SELECT fk_soc FROM ".$db->prefix()."categorie_societe WHERE fk_categorie = ".((int) $searchCategoryCustomer).")";
+			$searchCategoryCustomerSqlList[] = "p.fk_soc IN (SELECT fk_element FROM ".$db->prefix()."element_category WHERE fk_category = ".((int) $searchCategoryCustomer).")";
 		}
 	}
 	if (!empty($searchCategoryCustomerSqlList)) {
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 240baf7075c28..89e4f7f9b1c26 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -549,14 +549,14 @@
 			$searchCategoryCustomerSqlList[] = "NOT EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as ck WHERE s.rowid = ck.fk_soc)";
 		} elseif (intval($searchCategoryCustomer) > 0) {
 			if ($searchCategoryCustomerOperator == 0) {
-				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie = ".((int) $searchCategoryCustomer).")";
+				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryCustomer).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryCustomerOperator == 1) {
 		if (!empty($searchCategoryCustomerSqlList)) {
@@ -579,14 +579,14 @@
 			$searchCategorySupplierSqlList[] = "NOT EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc)";
 		} elseif (intval($searchCategorySupplier) > 0) {
 			if ($searchCategorySupplierOperator == 0) {
-				$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie = ".((int) $searchCategorySupplier).")";
+				$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategorySupplier).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategorySupplier);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategorySupplierOperator == 1) {
 		if (!empty($searchCategorySupplierSqlList)) {
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index e3db6909c82a9..be94de8da45f5 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -443,14 +443,14 @@
 			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."supplier_proposaldet as sd WHERE sd.fk_supplier_proposal = sp.rowid AND sd.fk_product = ck.fk_product)";
 		} elseif (intval($searchCategoryProduct) > 0) {
 			if ($searchCategoryProductOperator == 0) {
-				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."supplier_proposaldet as sd WHERE sd.fk_supplier_proposal = sp.rowid AND sd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
+				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."supplier_proposaldet as sd WHERE sd.fk_supplier_proposal = sp.rowid AND sd.fk_product = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProduct).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."supplier_proposaldet as sd WHERE sd.fk_supplier_proposal = sp.rowid AND sd.fk_product = ck.fk_product AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."supplier_proposaldet as sd WHERE sd.fk_supplier_proposal = sp.rowid AND sd.fk_product = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryProductOperator == 1) {
 		if (!empty($searchCategoryProductSqlList)) {

From 54c3a9d74024636ceb00b0918c4a6b942f4634b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 26 Jul 2023 17:57:21 +0200
Subject: [PATCH 37/69] wip

---
 htdocs/contact/list.php       | 12 ++++++------
 htdocs/contrat/list.php       |  4 ++--
 htdocs/product/stock/list.php |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 40ea623911ede..b763ffc1909ee 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -484,14 +484,14 @@
 			$searchCategoryContactSqlList[] = "NOT EXISTS (SELECT ck.fk_socpeople FROM ".MAIN_DB_PREFIX."categorie_contact as ck WHERE p.rowid = ck.fk_socpeople)";
 		} elseif (intval($searchCategoryContact) > 0) {
 			if ($searchCategoryContactOperator == 0) {
-				$searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_socpeople FROM ".MAIN_DB_PREFIX."categorie_contact as ck WHERE p.rowid = ck.fk_socpeople AND ck.fk_categorie = ".((int) $searchCategoryContact).")";
+				$searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryContact).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryContact);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_socpeople FROM ".MAIN_DB_PREFIX."categorie_contact as ck WHERE p.rowid = ck.fk_socpeople AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryContactOperator == 1) {
 		if (!empty($searchCategoryContactSqlList)) {
@@ -516,14 +516,14 @@
 			$searchCategoryCustomerSqlList[] = "NOT EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as ck WHERE s.rowid = ck.fk_soc)";
 		} elseif (intval($searchCategoryCustomer) > 0) {
 			if ($searchCategoryCustomerOperator == 0) {
-				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie = ".((int) $searchCategoryCustomer).")";
+				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryCustomer).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryCustomerOperator == 1) {
 		if (!empty($searchCategoryCustomerSqlList)) {
@@ -548,14 +548,14 @@
 			$searchCategorySupplierSqlList[] = "NOT EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc)";
 		} elseif (intval($searchCategorySupplier) > 0) {
 			if ($searchCategorySupplierOperator == 0) {
-				$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie = ".((int) $searchCategorySupplier).")";
+				$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategorySupplier).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategorySupplier);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategorySupplierOperator == 1) {
 		if (!empty($searchCategorySupplierSqlList)) {
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index e4de94fc92105..ee5a776138e19 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -361,14 +361,14 @@
 			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."contratdet as cd WHERE cd.fk_contrat = c.rowid AND cd.fk_product = ck.fk_product)";
 		} elseif (intval($searchCategoryProduct) > 0) {
 			if ($searchCategoryProductOperator == 0) {
-				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."contratdet as cd WHERE cd.fk_contrat = c.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
+				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."contratdet as cd WHERE cd.fk_contrat = c.rowid AND cd.fk_product = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProduct).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."contratdet as cd WHERE cd.fk_contrat = c.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."contratdet as cd WHERE cd.fk_contrat = c.rowid AND cd.fk_product = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryProductOperator == 1) {
 		if (!empty($searchCategoryProductSqlList)) {
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 8d2a5c115d410..15812fece9baa 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -292,14 +292,14 @@
 			$searchCategoryWarehouseSqlList[] = " NOT EXISTS (SELECT ck.fk_warehouse FROM ".MAIN_DB_PREFIX."categorie_warehouse as ck WHERE t.rowid = ck.fk_warehouse)";
 		} elseif (intval($searchCategoryWarehouse) > 0) {
 			if ($searchCategoryWarehouseOperator == 0) {
-				$searchCategoryWarehouseSqlList[] = " EXISTS (SELECT ck.fk_warehouse FROM ".MAIN_DB_PREFIX."categorie_warehouse as ck WHERE t.rowid = ck.fk_warehouse AND ck.fk_categorie = ".((int) $searchCategoryWarehouse).")";
+				$searchCategoryWarehouseSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE t.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryWarehouse).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryWarehouse);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryWarehouseSqlList[] = " EXISTS (SELECT ck.fk_warehouse FROM ".MAIN_DB_PREFIX."categorie_warehouse as ck WHERE t.rowid = ck.fk_warehouse AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryWarehouseSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE t.rowid = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryWarehouseOperator == 1) {
 		if (!empty($searchCategoryWarehouseSqlList)) {

From 903da7b305733c1cda02efe55daa7cdf0542180b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 26 Jul 2023 18:09:46 +0200
Subject: [PATCH 38/69] wip

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

diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index ea71d505d10d0..2f98911eff5f4 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -240,7 +240,7 @@ public function __construct($db)
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_category as cf ON cf.fk_category = cat.rowid';
-		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = cf.fk_soc';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = cf.fk_element';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id';

From dd8c5f5f343c965abf96a1bb4e56550d98c9cb24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 26 Jul 2023 18:16:32 +0200
Subject: [PATCH 39/69] wip

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

diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 2f98911eff5f4..890add8fc8ff2 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -426,7 +426,7 @@ public function __construct($db)
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_category as cu ON cu.fk_category = cat.rowid';
-		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'user as p ON p.rowid = cu.fk_user';
+		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'user as p ON p.rowid = cu.fk_element';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user_extrafields as extra ON extra.fk_object = p.rowid';
 		$this->export_sql_end[$r] .= ' WHERE cat.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .= ' AND cat.type = 7';
@@ -601,7 +601,7 @@ public function __construct($db)
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
 			$this->import_tables_array[$r] = array('cu'=>MAIN_DB_PREFIX.'element_category');
-			$this->import_fields_array[$r] = array('cu.fk_category'=>"Category*", 'cu.fk_user'=>"User*");
+			$this->import_fields_array[$r] = array('cu.fk_category'=>"Category*", 'cu.fk_element'=>"User*");
 			$this->import_regex_array[$r] = array('cu.fk_category'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=7');
 
 			$this->import_convertvalue_array[$r] = array(

From dec2fe81416e8e895d57a2958079126e8ee88950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 26 Jul 2023 18:31:14 +0200
Subject: [PATCH 40/69] wip

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

diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index 0e62cf52dff64..3fa261a8cd2be 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -270,7 +270,7 @@ public function countMembersByTagAndStatus($numberYears = 0)
 		$sql .= ", COUNT(".$this->db->ifsql("d.statut = ".Adherent::STATUS_RESILIATED, "'members_resiliated'", 'NULL').") as members_resiliated";
 		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as c";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_category as ct ON c.rowid = ct.fk_category";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as d ON d.rowid = ct.fk_member";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as d ON d.rowid = ct.fk_element";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_type as t ON t.rowid = d.fk_adherent_type";
 		$sql .= " WHERE c.entity IN (".getEntity('member_type').")";
 		$sql .= " AND d.entity IN (" . getEntity('adherent') . ")";

From 3dcfa66ab5ce9e46bdc0c52135a8a4e75f79c2ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 26 Jul 2023 18:51:48 +0200
Subject: [PATCH 41/69] wip

---
 htdocs/core/lib/website.lib.php                               | 4 ++--
 htdocs/core/modules/modService.class.php                      | 2 +-
 .../class/conferenceorboothattendee.class.php                 | 2 +-
 htdocs/margin/customerMargins.php                             | 4 ++--
 htdocs/margin/productMargins.php                              | 4 ++--
 htdocs/product/composition/card.php                           | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index e6e8dd819c093..4ecc784539ef8 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -1016,7 +1016,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 
 		$sql = 'SELECT wp.rowid FROM '.MAIN_DB_PREFIX.'website_page as wp';
 		if (is_array($otherfilters) && !empty($otherfilters['category'])) {
-			$sql .= ', '.MAIN_DB_PREFIX.'categorie_website_page as cwp';
+			$sql .= ', '.MAIN_DB_PREFIX.'element_category as cwp';
 		}
 		$sql .= " WHERE wp.fk_website = ".((int) $website->id);
 		if ($status >= 0) {
@@ -1044,7 +1044,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 		}
 		$sql .= $searchalgo;
 		if (is_array($otherfilters) && !empty($otherfilters['category'])) {
-			$sql .= ' AND cwp.fk_website_page = wp.rowid AND cwp.fk_categorie = '.((int) $otherfilters['category']);
+			$sql .= ' AND cwp.fk_element = wp.rowid AND cwp.fk_category = '.((int) $otherfilters['category']);
 		}
 		$sql .= ")";
 		$sql .= $db->order($sortfield, $sortorder);
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 4828513a8ff00..e8559b45d3a1a 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -270,7 +270,7 @@ public function __construct($db)
 			$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 		}
 		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
-			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cp.fk_categorie = cat.rowid';
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_category as cp ON cp.fk_element = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cp.fk_category = cat.rowid';
 		}
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lang as l ON l.fk_product = p.rowid';
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index db41d03c3283a..d25928a10fc5e 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -205,7 +205,7 @@ public function __construct(DoliDB $db)
 		}
 
 		if (!empty($conf->global->EVENTORGANIZATION_FILTERATTENDEES_CAT)) {
-			$this->fields['fk_soc']['type'] .= ' AND rowid IN (SELECT DISTINCT c.fk_soc FROM '.MAIN_DB_PREFIX.'categorie_societe as c WHERE c.fk_categorie='.(int) $conf->global->EVENTORGANIZATION_FILTERATTENDEES_CAT.')';
+			$this->fields['fk_soc']['type'] .= ' AND rowid IN (SELECT DISTINCT c.fk_element FROM '.MAIN_DB_PREFIX.'element_category as c WHERE c.fk_category='.(int) $conf->global->EVENTORGANIZATION_FILTERATTENDEES_CAT.')';
 		}
 		if (isset($conf->global->EVENTORGANIZATION_FILTERATTENDEES_TYPE)
 			&& $conf->global->EVENTORGANIZATION_FILTERATTENDEES_TYPE !== ''
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 93850b8ec10c2..09eae4a8d37d3 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -228,7 +228,7 @@
 $sql .= ", ".MAIN_DB_PREFIX."facture as f";
 $sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
 if (!empty($TSelectedCats)) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=d.fk_product';
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_category as cp ON cp.fk_element=d.fk_product';
 }
 
 if (empty($user->rights->societe->client->voir) && !$socid) {
@@ -250,7 +250,7 @@
 	$sql .= ' AND d.fk_product IN ('.$db->sanitize(implode(',', $TSelectedProducts)).')';
 }
 if (!empty($TSelectedCats)) {
-	$sql .= ' AND cp.fk_categorie IN ('.$db->sanitize(implode(',', $TSelectedCats)).')';
+	$sql .= ' AND cp.fk_category IN ('.$db->sanitize(implode(',', $TSelectedCats)).')';
 }
 if (!empty($startdate)) {
 	$sql .= " AND f.datef >= '".$db->idate($startdate)."'";
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 32cb3c9292dd6..4ffb5b02e8a6c 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -196,7 +196,7 @@
 $sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = d.fk_product";
 if (!empty($TSelectedCats)) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=p.rowid';
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_category as cp ON cp.fk_element=p.rowid';
 }
 $sql .= " WHERE f.fk_soc = s.rowid";
 $sql .= ' AND f.entity IN ('.getEntity('invoice').')';
@@ -206,7 +206,7 @@
 	$sql .= " AND d.fk_product =".((int) $id);
 }
 if (!empty($TSelectedCats)) {
-	$sql .= ' AND cp.fk_categorie IN ('.$db->sanitize(implode(',', $TSelectedCats)).')';
+	$sql .= ' AND cp.fk_category IN ('.$db->sanitize(implode(',', $TSelectedCats)).')';
 }
 if (!empty($startdate)) {
 	$sql .= " AND f.datef >= '".$db->idate($startdate)."'";
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 8c7541e4992f6..d70ef07c3127e 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -173,7 +173,7 @@
 	$sql .= $hookmanager->resPrint;
 
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON p.rowid = cp.fk_product';
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_category as cp ON p.rowid = cp.fk_element';
 	if (getDolGlobalInt('MAIN_MULTILANGS')) {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND lang='".($current_lang)."'";
 	}
@@ -198,7 +198,7 @@
 		$sql .= natural_search($params, $key);
 	}
 	if (isModEnabled('categorie') && !empty($parent) && $parent != -1) {
-		$sql .= " AND cp.fk_categorie ='".$db->escape($parent)."'";
+		$sql .= " AND cp.fk_category ='".$db->escape($parent)."'";
 	}
 	$sql .= " ORDER BY p.ref ASC";
 

From 088f8c1ca0f3ac03854a2e1ee0ef8a64eefc00a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 27 Jul 2023 08:35:37 +0200
Subject: [PATCH 42/69] wip

---
 .../class/knowledgerecord.class.php           | 34 +++++++++----------
 .../knowledgerecord_list.php                  |  4 +--
 htdocs/product/class/product.class.php        | 14 +++++++-
 .../inventory/class/inventory.class.php       |  8 ++---
 htdocs/product/stock/list.php                 |  2 +-
 htdocs/societe/list.php                       |  2 +-
 htdocs/supplier_proposal/list.php             |  4 +--
 7 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index e26f9c7d96a19..ccae0ec62ac06 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -468,31 +468,31 @@ public function update(User $user, $notrigger = false)
 	public function delete(User $user, $notrigger = false)
 	{
 		$error = 0;
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_knowledgemanagement WHERE fk_knowledgemanagement = ".((int) $this->id);
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_category WHERE fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=13) AND fk_element = ".((int) $this->id);
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error++;
-			$this->error .= $this->db->lasterror();
+			$this->errors[] = $this->db->lasterror();
 			$errorflag = -1;
 		}
 
 		// Delete all child tables
-		if (!$error) {
-			$elements = array('categorie_knowledgemanagement');
-			foreach ($elements as $table) {
-				if (!$error) {
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
-					$sql .= " WHERE fk_knowledgemanagement = ".(int) $this->id;
-
-					$result = $this->db->query($sql);
-					if (!$result) {
-						$error++;
-						$this->errors[] = $this->db->lasterror();
-					}
-				}
-			}
-		}
+		// if (!$error) {
+		// 	$elements = array();
+		// 	foreach ($elements as $table) {
+		// 		if (!$error) {
+		// 			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
+		// 			$sql .= " WHERE fk_knowledgemanagement = ".(int) $this->id;
+
+		// 			$result = $this->db->query($sql);
+		// 			if (!$result) {
+		// 				$error++;
+		// 				$this->errors[] = $this->db->lasterror();
+		// 			}
+		// 		}
+		// 	}
+		// }
 
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index 25f41a0c71925..fbbca4d5a5a6c 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -299,14 +299,14 @@
 			$searchCategoryKnowledgemanagementSqlList[] = "NOT EXISTS (SELECT ck.fk_knowledgemanagement FROM ".MAIN_DB_PREFIX."categorie_knowledgemanagement as ck WHERE t.rowid = ck.fk_knowledgemanagement)";
 		} elseif (intval($searchCategoryKnowledgemanagement) > 0) {
 			if (empty($searchCategoryKnowledgemanagementOperator)) {
-				$searchCategoryKnowledgemanagementSqlList[] = " EXISTS (SELECT ck.fk_knowledgemanagement FROM ".MAIN_DB_PREFIX."categorie_knowledgemanagement as ck WHERE t.rowid = ck.fk_knowledgemanagement AND ck.fk_categorie = ".((int) $searchCategoryKnowledgemanagement).")";
+				$searchCategoryKnowledgemanagementSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE t.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryKnowledgemanagement).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryKnowledgemanagement);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryKnowledgemanagementSqlList[] = " EXISTS (SELECT ck.fk_knowledgemanagement FROM ".MAIN_DB_PREFIX."categorie_knowledgemanagement as ck WHERE t.rowid = ck.fk_knowledgemanagement AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryKnowledgemanagementSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE t.rowid = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryKnowledgemanagementOperator == 1) {
 		if (!empty($searchCategoryKnowledgemanagementSqlList)) {
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 2e6f9bc07c5d4..4abfb82850204 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1438,9 +1438,21 @@ public function delete(User $user, $notrigger = 0)
 				}
 			}
 
+			// delete categories links
+			if (!$error) {
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_category";
+				$sql .= " WHERE fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=0) AND fk_element = ".((int) $this->id);
+
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++;
+					$this->errors[] = $this->db->lasterror();
+				}
+			}
+
 			// Delete all child tables
 			if (!$error) {
-				$elements = array('product_fournisseur_price', 'product_price', 'product_lang', 'categorie_product', 'product_stock', 'product_customer_price', 'product_lot'); // product_batch is done before
+				$elements = array('product_fournisseur_price', 'product_price', 'product_lang', 'product_stock', 'product_customer_price', 'product_lot'); // product_batch is done before
 				foreach ($elements as $table) {
 					if (!$error) {
 						$sql = "DELETE FROM ".$this->db->prefix().$table;
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 97ae607e70bcd..b617f7366e83e 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -296,10 +296,10 @@ public function validate(User $user, $notrigger = false)
 			}
 			if (!empty($this->categories_product)) {
 				$sql .= " AND EXISTS (";
-				$sql .= " SELECT cp.fk_product";
-				$sql .= " FROM ".$this->db->prefix()."categorie_product AS cp";
-				$sql .= " WHERE cp.fk_product = ps.fk_product";
-				$sql .= " AND cp.fk_categorie IN (".$this->db->sanitize($this->categories_product).")";
+				$sql .= " SELECT cp.fk_element";
+				$sql .= " FROM ".$this->db->prefix()."element_category AS cp";
+				$sql .= " WHERE cp.fk_element = ps.fk_product";
+				$sql .= " AND cp.fk_category IN (".$this->db->sanitize($this->categories_product).")";
 				$sql .= ")";
 			}
 
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 15812fece9baa..bf157b7834845 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -289,7 +289,7 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryWarehouseList as $searchCategoryWarehouse) {
 		if (intval($searchCategoryWarehouse) == -2) {
-			$searchCategoryWarehouseSqlList[] = " NOT EXISTS (SELECT ck.fk_warehouse FROM ".MAIN_DB_PREFIX."categorie_warehouse as ck WHERE t.rowid = ck.fk_warehouse)";
+			$searchCategoryWarehouseSqlList[] = " NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=9) AND t.rowid = ck.fk_element)";
 		} elseif (intval($searchCategoryWarehouse) > 0) {
 			if ($searchCategoryWarehouseOperator == 0) {
 				$searchCategoryWarehouseSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE t.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryWarehouse).")";
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 89e4f7f9b1c26..f1436b4272dc7 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -546,7 +546,7 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
 		if (intval($searchCategoryCustomer) == -2) {
-			$searchCategoryCustomerSqlList[] = "NOT EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as ck WHERE s.rowid = ck.fk_soc)";
+			$searchCategoryCustomerSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE ck.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=2) AND s.rowid = ck.fk_element)";
 		} elseif (intval($searchCategoryCustomer) > 0) {
 			if ($searchCategoryCustomerOperator == 0) {
 				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryCustomer).")";
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index be94de8da45f5..c12d19673f217 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -440,10 +440,10 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryProductList as $searchCategoryProduct) {
 		if (intval($searchCategoryProduct) == -2) {
-			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."supplier_proposaldet as sd WHERE sd.fk_supplier_proposal = sp.rowid AND sd.fk_product = ck.fk_product)";
+			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."supplier_proposaldet as sd WHERE ck.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=0) AND sd.fk_supplier_proposal = sp.rowid AND sd.fk_product = ck.fk_element)";
 		} elseif (intval($searchCategoryProduct) > 0) {
 			if ($searchCategoryProductOperator == 0) {
-				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."supplier_proposaldet as sd WHERE sd.fk_supplier_proposal = sp.rowid AND sd.fk_product = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProduct).")";
+				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."supplier_proposaldet as sd WHERE sd.fk_supplier_proposal = sp.rowid AND sd.fk_product = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProduct).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
 			}

From b87cd20f49775126d1c1b721abd542025135a9a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 27 Jul 2023 08:55:47 +0200
Subject: [PATCH 43/69] wip

---
 htdocs/compta/facture/list.php                |  4 +--
 .../modules/mailings/contacts1.modules.php    | 30 +++++++++----------
 .../modules/mailings/thirdparties.modules.php | 12 ++++----
 htdocs/fourn/commande/list.php                |  6 ++--
 htdocs/fourn/product/list.php                 |  4 +--
 htdocs/product/class/api_products.class.php   | 12 ++++----
 htdocs/societe/list.php                       |  2 +-
 7 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 78228f62c5237..a4d3ec6f8ba0a 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -835,7 +835,7 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryProductList as $searchCategoryProduct) {
 		if (intval($searchCategoryProduct) == -2) {
-			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."facturedet as fd WHERE fd.fk_facture = f.rowid AND fd.fk_product = ck.fk_product)";
+			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."facturedet as fd WHERE ck.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=0) AND fd.fk_facture = f.rowid AND fd.fk_product = ck.fk_element)";
 		} elseif (intval($searchCategoryProduct) > 0) {
 			if ($searchCategoryProductOperator == 0) {
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."facturedet as fd WHERE fd.fk_facture = f.rowid AND fd.fk_product = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProduct).")";
@@ -865,7 +865,7 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
 		if (intval($searchCategoryCustomer) == -2) {
-			$searchCategoryCustomerSqlList[] = "NOT EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as ck WHERE s.rowid = ck.fk_soc)";
+			$searchCategoryCustomerSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE ck.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=2) AND s.rowid = ck.fk_element)";
 		} elseif (intval($searchCategoryCustomer) > 0) {
 			if ($searchCategoryCustomerOperator == 0) {
 				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryCustomer).")";
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 13436761c3bb8..a6582325cddc5 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -165,12 +165,12 @@ public function formFilter()
 		$sql .= " FROM ";
 		$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
-		$sql .= " ".MAIN_DB_PREFIX."categorie_contact as cs";
+		$sql .= " ".MAIN_DB_PREFIX."element_category as cs";
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
 		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
-		$sql .= " AND cs.fk_categorie = c.rowid";
-		$sql .= " AND cs.fk_socpeople = sp.rowid";
+		$sql .= " AND cs.fk_category = c.rowid";
+		$sql .= " AND cs.fk_element = sp.rowid";
 		$sql .= " GROUP BY c.label";
 		$sql .= " ORDER BY c.label";
 		$resql = $this->db->query($sql);
@@ -238,12 +238,12 @@ public function formFilter()
 		$sql .= " FROM ";
 		$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
-		$sql .= " ".MAIN_DB_PREFIX."categorie_societe as cs";
+		$sql .= " ".MAIN_DB_PREFIX."element_category as cs";
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
 		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
-		$sql .= " AND cs.fk_categorie = c.rowid";
-		$sql .= " AND cs.fk_soc = sp.fk_soc";
+		$sql .= " AND cs.fk_category = c.rowid";
+		$sql .= " AND cs.fk_element = sp.fk_soc";
 		$sql .= " GROUP BY c.label";
 		$sql .= " ORDER BY c.label";
 		$resql = $this->db->query($sql);
@@ -275,12 +275,12 @@ public function formFilter()
 		$sql .= " FROM ";
 		$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
-		$sql .= " ".MAIN_DB_PREFIX."categorie_fournisseur as cs";
+		$sql .= " ".MAIN_DB_PREFIX."element_category as cs";
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
 		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
-		$sql .= " AND cs.fk_categorie = c.rowid";
-		$sql .= " AND cs.fk_soc = sp.fk_soc";
+		$sql .= " AND cs.fk_category = c.rowid";
+		$sql .= " AND cs.fk_element = sp.fk_soc";
 		$sql .= " GROUP BY c.label";
 		$sql .= " ORDER BY c.label";
 		$resql = $this->db->query($sql);
@@ -377,15 +377,15 @@ public function add_to_target($mailing_id)
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
 		if ($filter_category != 'all' && $filter_category != '-1') {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie as c";
-			$sql .= ", ".MAIN_DB_PREFIX."categorie_contact as cs";
+			$sql .= ", ".MAIN_DB_PREFIX."element_category as cs";
 		}
 		if ($filter_category_customer != 'all' && $filter_category_customer != '-1') {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie as c2";
-			$sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c2s";
+			$sql .= ", ".MAIN_DB_PREFIX."element_category as c2s";
 		}
 		if ($filter_category_supplier != 'all' && $filter_category_supplier != '-1') {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie as c3";
-			$sql .= ", ".MAIN_DB_PREFIX."categorie_fournisseur as c3s";
+			$sql .= ", ".MAIN_DB_PREFIX."element_category as c3s";
 		}
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
 		$sql .= " AND sp.email <> ''";
@@ -399,15 +399,15 @@ public function add_to_target($mailing_id)
 
 		// Filter on category
 		if ($filter_category != 'all' && $filter_category != '-1') {
-			$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_socpeople = sp.rowid";
+			$sql .= " AND cs.fk_category = c.rowid AND cs.fk_element = sp.rowid";
 			$sql .= " AND c.label = '".$this->db->escape($filter_category)."'";
 		}
 		if ($filter_category_customer != 'all' && $filter_category_customer != '-1') {
-			$sql .= " AND c2s.fk_categorie = c2.rowid AND c2s.fk_soc = sp.fk_soc";
+			$sql .= " AND c2s.fk_category = c2.rowid AND c2s.fk_element = sp.fk_soc";
 			$sql .= " AND c2.label = '".$this->db->escape($filter_category_customer)."'";
 		}
 		if ($filter_category_supplier != 'all' && $filter_category_supplier != '-1') {
-			$sql .= " AND c3s.fk_categorie = c3.rowid AND c3s.fk_soc = sp.fk_soc";
+			$sql .= " AND c3s.fk_category = c3.rowid AND c3s.fk_element = sp.fk_soc";
 			$sql .= " AND c3.label = '".$this->db->escape($filter_category_supplier)."'";
 		}
 
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index bc9a763ab1fef..1c5dee42ebeff 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -148,12 +148,12 @@ public function add_to_target($mailing_id)
 			$sql .= $addFilter;
 		} else {
 			$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
-			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_societe as cs, ".MAIN_DB_PREFIX."categorie as c";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."element_category as cs, ".MAIN_DB_PREFIX."categorie as c";
 			$sql .= " WHERE s.email <> ''";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
 			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
-			$sql .= " AND cs.fk_soc = s.rowid";
-			$sql .= " AND c.rowid = cs.fk_categorie";
+			$sql .= " AND cs.fk_element = s.rowid";
+			$sql .= " AND c.rowid = cs.fk_category";
 			if (GETPOST('filter_thirdparties', 'int') > 0) {
 				$sql .= " AND c.rowid=".((int) GETPOST('filter_thirdparties', 'int'));
 			}
@@ -163,12 +163,12 @@ public function add_to_target($mailing_id)
 			$sql .= $addFilter;
 			$sql .= " UNION ";
 			$sql .= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
-			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_fournisseur as cs, ".MAIN_DB_PREFIX."categorie as c";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."element_category as cs, ".MAIN_DB_PREFIX."categorie as c";
 			$sql .= " WHERE s.email <> ''";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
 			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
-			$sql .= " AND cs.fk_soc = s.rowid";
-			$sql .= " AND c.rowid = cs.fk_categorie";
+			$sql .= " AND cs.fk_element = s.rowid";
+			$sql .= " AND c.rowid = cs.fk_category";
 			if (GETPOST('filter_thirdparties', 'int') > 0) {
 				$sql .= " AND c.rowid=".((int) GETPOST('filter_thirdparties', 'int'));
 			}
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 58501c0724674..e81d238db9dca 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -939,17 +939,17 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryProductList as $searchCategoryProduct) {
 		if (intval($searchCategoryProduct) == -2) {
-			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."commande_fournisseurdet as cd WHERE cd.fk_commande = cf.rowid AND cd.fk_product = ck.fk_product)";
+			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."commande_fournisseurdet as cd WHERE ck.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=0) AND cd.fk_commande = cf.rowid AND cd.fk_product = ck.fk_element)";
 		} elseif (intval($searchCategoryProduct) > 0) {
 			if ($searchCategoryProductOperator == 0) {
-				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."commande_fournisseurdet as cd WHERE cd.fk_commande = cf.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
+				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."commande_fournisseurdet as cd WHERE cd.fk_commande = cf.rowid AND cd.fk_product = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProduct).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."commande_fournisseurdet as cd WHERE cd.fk_commande = cf.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."commande_fournisseurdet as cd WHERE cd.fk_commande = cf.rowid AND cd.fk_product = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryProductOperator == 1) {
 		if (!empty($searchCategoryProductSqlList)) {
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 851c1d13ea570..814be2170e57a 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -165,7 +165,7 @@
 
 $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 if ($catid) {
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_category as cp ON cp.fk_element = p.rowid";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as ppf ON p.rowid = ppf.fk_product AND p.entity = ppf.entity";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON ppf.fk_soc = s.rowid AND s.entity IN (".getEntity('societe').")";
@@ -183,7 +183,7 @@
 	$sql .= natural_search('p.label', $snom);
 }
 if ($catid) {
-	$sql .= " AND cp.fk_categorie = ".((int) $catid);
+	$sql .= " AND cp.fk_category = ".((int) $catid);
 }
 if ($fourn_id > 0) {
 	$sql .= " AND ppf.fk_soc = ".((int) $fourn_id);
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index f144011fde33e..477fe27c85210 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -191,7 +191,7 @@ public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $p
 		$sql .= " FROM ".$this->db->prefix()."product as t";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields AS ef ON ef.fk_object = t.rowid";	// So we will be able to filter on extrafields
 		if ($category > 0) {
-			$sql .= ", ".$this->db->prefix()."categorie_product as c";
+			$sql .= ", ".$this->db->prefix()."element_category as c";
 		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('product').')';
 
@@ -208,8 +208,8 @@ public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $p
 
 		// Select products of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".((int) $category);
-			$sql .= " AND c.fk_product = t.rowid";
+			$sql .= " AND c.fk_category = ".((int) $category);
+			$sql .= " AND c.fk_element = t.rowid";
 		}
 		if ($mode == 1) {
 			// Show only products
@@ -876,7 +876,7 @@ public function getSupplierProducts($sortfield = "t.ref", $sortorder = 'ASC', $l
 		$sql .= " FROM ".MAIN_DB_PREFIX."product AS t LEFT JOIN ".MAIN_DB_PREFIX."product_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
 
 		if ($category > 0) {
-			$sql .= ", ".$this->db->prefix()."categorie_product as c";
+			$sql .= ", ".$this->db->prefix()."element_category as c";
 		}
 		$sql .= ", ".$this->db->prefix()."product_fournisseur_price as s";
 
@@ -891,8 +891,8 @@ public function getSupplierProducts($sortfield = "t.ref", $sortorder = 'ASC', $l
 		$sql .= " AND s.fk_product = t.rowid";
 		// Select products of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".((int) $category);
-			$sql .= " AND c.fk_product = t.rowid";
+			$sql .= " AND c.fk_category = ".((int) $category);
+			$sql .= " AND c.fk_element = t.rowid";
 		}
 		if ($mode == 1) {
 			// Show only products
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index f1436b4272dc7..183dcdfecd459 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -576,7 +576,7 @@
 	$listofcategoryid = '';
 	foreach ($searchCategorySupplierList as $searchCategorySupplier) {
 		if (intval($searchCategorySupplier) == -2) {
-			$searchCategorySupplierSqlList[] = "NOT EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc)";
+			$searchCategorySupplierSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE ck.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=1) AND s.rowid = ck.fk_element)";
 		} elseif (intval($searchCategorySupplier) > 0) {
 			if ($searchCategorySupplierOperator == 0) {
 				$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategorySupplier).")";

From 7bf9becab47c7bde5be9d4d5e53629152a41feb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 27 Jul 2023 08:58:20 +0200
Subject: [PATCH 44/69] wip

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

diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 089387cd9a214..847b213c8cbba 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -280,17 +280,17 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryProductList as $searchCategoryProduct) {
 		if (intval($searchCategoryProduct) == -2) {
-			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck WHERE p.rowid = ck.fk_product)";
+			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE ck.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=0) AND p.rowid = ck.fk_element)";
 		} elseif (intval($searchCategoryProduct) > 0) {
 			if ($searchCategoryProductOperator == 0) {
-				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck WHERE p.rowid = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
+				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProduct).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck WHERE p.rowid = ck.fk_product AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryProductOperator == 1) {
 		if (!empty($searchCategoryProductSqlList)) {

From 658b55bc0086e26be0834c8a1549b3904d0de48d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 27 Jul 2023 09:01:05 +0200
Subject: [PATCH 45/69] wip

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

diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 7b7a9f85656e6..85bfaa20de1c9 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -462,17 +462,17 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryProjectList as $searchCategoryProject) {
 		if (intval($searchCategoryProject) == -2) {
-			$searchCategoryProjectSqlList[] = "NOT EXISTS (SELECT ck.fk_project FROM ".MAIN_DB_PREFIX."categorie_project as ck WHERE p.rowid = ck.fk_project)";
+			$searchCategoryProjectSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE ck.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=6) AND p.rowid = ck.fk_element)";
 		} elseif (intval($searchCategoryProject) > 0) {
 			if ($searchCategoryProjectOperator == 0) {
-				$searchCategoryProjectSqlList[] = " EXISTS (SELECT ck.fk_project FROM ".MAIN_DB_PREFIX."categorie_project as ck WHERE p.rowid = ck.fk_project AND ck.fk_categorie = ".((int) $searchCategoryProject).")";
+				$searchCategoryProjectSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProject).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProject);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryProjectSqlList[] = " EXISTS (SELECT ck.fk_project FROM ".MAIN_DB_PREFIX."categorie_project as ck WHERE p.rowid = ck.fk_project AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryProjectSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryProjectOperator == 1) {
 		if (!empty($searchCategoryProjectSqlList)) {

From 1da39b6ddce0836fa15ca3fe490d929391cb1517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 27 Jul 2023 09:41:43 +0200
Subject: [PATCH 46/69] wip

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

diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index fbbca4d5a5a6c..f7c115005a6a5 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -296,7 +296,7 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryKnowledgemanagementList as $searchCategoryKnowledgemanagement) {
 		if (intval($searchCategoryKnowledgemanagement) == -2) {
-			$searchCategoryKnowledgemanagementSqlList[] = "NOT EXISTS (SELECT ck.fk_knowledgemanagement FROM ".MAIN_DB_PREFIX."categorie_knowledgemanagement as ck WHERE t.rowid = ck.fk_knowledgemanagement)";
+			$searchCategoryKnowledgemanagementSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE ck.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=13) AND t.rowid = ck.fk_element)";
 		} elseif (intval($searchCategoryKnowledgemanagement) > 0) {
 			if (empty($searchCategoryKnowledgemanagementOperator)) {
 				$searchCategoryKnowledgemanagementSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE t.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryKnowledgemanagement).")";

From 150a593049a749bd74559d8b7509445a2b479a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 27 Jul 2023 09:44:33 +0200
Subject: [PATCH 47/69] wip

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

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 910d22e931964..74f333b220f01 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -599,17 +599,17 @@
 	$listofcategoryid = '';
 	foreach ($searchCategorySupplierList as $searchCategorySupplier) {
 		if (intval($searchCategorySupplier) == -2) {
-			$searchCategorySupplierSqlList[] = "NOT EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc)";
+			$searchCategorySupplierSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE ck.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=1) AND s.rowid = ck.fk_element)";
 		} elseif (intval($searchCategorySupplier) > 0) {
 			if ($searchCategorySupplierOperator == 0) {
-				$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie = ".((int) $searchCategorySupplier).")";
+				$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategorySupplier).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategorySupplier);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategorySupplierOperator == 1) {
 		if (!empty($searchCategorySupplierSqlList)) {

From cc4c5a83321140bbc492a8dbf0eb379ec3bf5a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 27 Jul 2023 10:39:54 +0200
Subject: [PATCH 48/69] wip

---
 htdocs/contact/list.php                       |  6 +--
 htdocs/core/class/html.formcategory.class.php |  9 ++--
 htdocs/fourn/facture/list.php                 |  6 +--
 .../class/api_knowledgemanagement.class.php   |  6 +--
 htdocs/product/reassort.php                   | 48 ++++++++++---------
 htdocs/projet/tasks/list.php                  | 14 +++---
 6 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index b763ffc1909ee..c54d464a255a3 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -481,7 +481,7 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryContactList as $searchCategoryContact) {
 		if (intval($searchCategoryContact) == -2) {
-			$searchCategoryContactSqlList[] = "NOT EXISTS (SELECT ck.fk_socpeople FROM ".MAIN_DB_PREFIX."categorie_contact as ck WHERE p.rowid = ck.fk_socpeople)";
+			$searchCategoryContactSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE ck.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=4) AND p.rowid = ck.fk_element)";
 		} elseif (intval($searchCategoryContact) > 0) {
 			if ($searchCategoryContactOperator == 0) {
 				$searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE p.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryContact).")";
@@ -513,7 +513,7 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
 		if (intval($searchCategoryCustomer) == -2) {
-			$searchCategoryCustomerSqlList[] = "NOT EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as ck WHERE s.rowid = ck.fk_soc)";
+			$searchCategoryCustomerSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=2) AND s.rowid = ck.fk_element)";
 		} elseif (intval($searchCategoryCustomer) > 0) {
 			if ($searchCategoryCustomerOperator == 0) {
 				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryCustomer).")";
@@ -545,7 +545,7 @@
 	$listofcategoryid = '';
 	foreach ($searchCategorySupplierList as $searchCategorySupplier) {
 		if (intval($searchCategorySupplier) == -2) {
-			$searchCategorySupplierSqlList[] = "NOT EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc)";
+			$searchCategorySupplierSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE ck.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=1) AND s.rowid = ck.fk_element)";
 		} elseif (intval($searchCategorySupplier) > 0) {
 			if ($searchCategorySupplierOperator == 0) {
 				$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck WHERE s.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategorySupplier).")";
diff --git a/htdocs/core/class/html.formcategory.class.php b/htdocs/core/class/html.formcategory.class.php
index ef252765ea051..1ae9ab4089595 100644
--- a/htdocs/core/class/html.formcategory.class.php
+++ b/htdocs/core/class/html.formcategory.class.php
@@ -94,10 +94,11 @@ public function selectProductCategory($selected = 0, $htmlname = 'product_catego
 	{
 		global $conf;
 
-		$sql = "SELECT cp.fk_categorie as cat_index, cat.label";
-		$sql .= " FROM ".MAIN_DB_PREFIX."categorie_product as cp";
-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie as cat ON cat.rowid = cp.fk_categorie";
-		$sql .= " GROUP BY cp.fk_categorie, cat.label";
+		$sql = "SELECT cp.fk_category as cat_index, cat.label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."element_category as cp";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie as cat ON cat.rowid = cp.fk_category";
+		$sql .= ' WHERE cat.type = 0';
+		$sql .= " GROUP BY cp.fk_category, cat.label";
 
 		dol_syslog(get_class($this)."::selectProductCategory", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 74f333b220f01..4ff8c3dd88208 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -629,17 +629,17 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryProductList as $searchCategoryProduct) {
 		if (intval($searchCategoryProduct) == -2) {
-			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."facture_fourn_det as fd WHERE fd.fk_facture_fourn = f.rowid AND p.rowid = ck.fk_product)";
+			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."facture_fourn_det as fd WHERE ck.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=0) AND fd.fk_facture_fourn = f.rowid AND p.rowid = ck.fk_element)";
 		} elseif (intval($searchCategoryProduct) > 0) {
 			if ($searchCategoryProductOperator == 0) {
-				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."facture_fourn_det as fd WHERE fd.fk_facture_fourn = f.rowid AND p.rowid = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
+				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."facture_fourn_det as fd WHERE fd.fk_facture_fourn = f.rowid AND p.rowid = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProduct).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."facture_fourn_det as fd WHERE fd.fk_facture_fourn = f.rowid AND p.rowid = ck.fk_product AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."facture_fourn_det as fd WHERE fd.fk_facture_fourn = f.rowid AND p.rowid = ck.fk_element AND ck.fk_category IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryProductOperator == 1) {
 		if (!empty($searchCategoryProductSqlList)) {
diff --git a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
index 570d09a0cddd0..b587104a90d70 100644
--- a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
+++ b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
@@ -168,7 +168,7 @@ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100,
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 		}
 		if ($category > 0) {
-			$sql .= ", ".$this->db->prefix()."categorie_knowledgemanagement as c";
+			$sql .= ", ".$this->db->prefix()."element_category as c";
 		}
 		$sql .= " WHERE 1 = 1";
 
@@ -194,8 +194,8 @@ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100,
 		}
 		// Select products of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".((int) $category);
-			$sql .= " AND c.fk_knowledgemanagement = t.rowid";
+			$sql .= " AND c.fk_category = ".((int) $category);
+			$sql .= " AND c.fk_element = t.rowid";
 		}
 		if ($sqlfilters) {
 			$errormessage = '';
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index a80afac833f26..4dcc731b9ba72 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -165,47 +165,49 @@
 		$sql .= " EXISTS ";
 	}
 	$sql .= "(";
-	$sql .= " SELECT cp.fk_categorie, cp.fk_product";
-	$sql .= " FROM " . MAIN_DB_PREFIX . "categorie_product as cp";
-	$sql .= " WHERE cp.fk_product = p.rowid"; // Join for the needed table to filter by categ
+	$sql .= " SELECT cp.fk_category, cp.fk_element";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "element_category as cp";
+	$sql .= " WHERE cp.fk_element = p.rowid"; // Join for the needed table to filter by categ
 	if ($search_categ > 0) {
-		$sql .= " AND cp.fk_categorie = " . ((int) $search_categ);
+		$sql .= " AND cp.fk_category = " . ((int) $search_categ);
+	} elseif ($search_categ == -2) {
+		$sql .= " AND cp.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=0)";
 	}
 	$sql .= ")";
 }
 if (empty($conf->global->PRODUCT_STOCK_LIST_SHOW_VIRTUAL_WITH_NO_PHYSICAL)) {
 	$sql .= " AND EXISTS (SELECT e.rowid FROM ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = s.fk_entrepot AND e.entity IN (".getEntity('stock')."))";
 } else {
-	$sql .= " AND 
+	$sql .= " AND
 		(
-			EXISTS 
-				(SELECT e.rowid 
-				 FROM ".MAIN_DB_PREFIX."entrepot as e 
-				 WHERE e.rowid = s.fk_entrepot AND e.entity IN (".getEntity('stock').")) 
+			EXISTS
+				(SELECT e.rowid
+				 FROM ".MAIN_DB_PREFIX."entrepot as e
+				 WHERE e.rowid = s.fk_entrepot AND e.entity IN (".getEntity('stock')."))
 			OR (
-				SELECT SUM(cd1.qty) as qty 
-				FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd1 
-				LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur as c1 
-					ON c1.rowid = cd1.fk_commande 
+				SELECT SUM(cd1.qty) as qty
+				FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd1
+				LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur as c1
+					ON c1.rowid = cd1.fk_commande
 				WHERE c1.entity IN (1) AND cd1.fk_product = p.rowid AND c1.fk_statut in (3,4) AND cd1.qty <> 0
 			) IS NOT NULL
 			OR (
-				SELECT SUM(cd2.qty) as qty 
-				FROM ".MAIN_DB_PREFIX."commandedet as cd2 
-				LEFT JOIN ".MAIN_DB_PREFIX."commande as c2 ON c2.rowid = cd2.fk_commande 
+				SELECT SUM(cd2.qty) as qty
+				FROM ".MAIN_DB_PREFIX."commandedet as cd2
+				LEFT JOIN ".MAIN_DB_PREFIX."commande as c2 ON c2.rowid = cd2.fk_commande
 				WHERE c2.entity IN (1) AND cd2.fk_product = p.rowid AND c2.fk_statut in (1,2) AND cd2.qty <> 0
 			) IS NOT NULL
 			OR (
-				SELECT SUM(ed3.qty) as qty 
-				FROM ".MAIN_DB_PREFIX."expeditiondet as ed3 
-				LEFT JOIN ".MAIN_DB_PREFIX."expedition as e3 ON e3.rowid = ed3.fk_expedition 
-				LEFT JOIN ".MAIN_DB_PREFIX."commandedet as cd3 ON ed3.fk_origin_line = cd3.rowid 
-				LEFT JOIN ".MAIN_DB_PREFIX."commande as c3 ON c3.rowid = cd3.fk_commande 
+				SELECT SUM(ed3.qty) as qty
+				FROM ".MAIN_DB_PREFIX."expeditiondet as ed3
+				LEFT JOIN ".MAIN_DB_PREFIX."expedition as e3 ON e3.rowid = ed3.fk_expedition
+				LEFT JOIN ".MAIN_DB_PREFIX."commandedet as cd3 ON ed3.fk_origin_line = cd3.rowid
+				LEFT JOIN ".MAIN_DB_PREFIX."commande as c3 ON c3.rowid = cd3.fk_commande
 				WHERE e3.entity IN (1) AND cd3.fk_product = p.rowid AND c3.fk_statut IN (1,2) AND e3.fk_statut IN (1,2) AND ed3.qty <> 0
 			) IS NOT NULL
 			OR (
-				SELECT SUM(mp4.qty) as qty 
-				FROM ".MAIN_DB_PREFIX."mrp_production as mp4 
+				SELECT SUM(mp4.qty) as qty
+				FROM ".MAIN_DB_PREFIX."mrp_production as mp4
 				LEFT JOIN ".MAIN_DB_PREFIX."mrp_mo as m4 ON m4.rowid = mp4.fk_mo AND m4.entity IN (1) AND m4.status IN (1,2)
 				WHERE mp4.fk_product = p.rowid AND mp4.qty <> 0
 			) IS NOT NULL
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 85bfaa20de1c9..bc4a73d7d32ae 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -490,9 +490,10 @@
 	foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
 		if (intval($searchCategoryCustomer) == -2) {
 			$sqlCategoryCustomerNotExists  = " NOT EXISTS (";
-			$sqlCategoryCustomerNotExists .= " SELECT cat_cus.fk_soc";
-			$sqlCategoryCustomerNotExists .= " FROM ".$db->prefix()."categorie_societe AS cat_cus";
-			$sqlCategoryCustomerNotExists .= " WHERE cat_cus.fk_soc = p.fk_soc";
+			$sqlCategoryCustomerNotExists .= " SELECT cat_cus.fk_element";
+			$sqlCategoryCustomerNotExists .= " FROM ".$db->prefix()."element_category AS cat_cus";
+			$sqlCategoryCustomerNotExists .= " WHERE cat_cus.fk_element = p.fk_soc";
+			$sqlCategoryCustomerNotExists .= " AND cat_cus.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=2)";
 			$sqlCategoryCustomerNotExists .= " )";
 			$searchCategoryCustomerSqlList[] = $sqlCategoryCustomerNotExists;
 		} elseif (intval($searchCategoryCustomer) > 0) {
@@ -515,9 +516,10 @@
 	foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
 		if (intval($searchCategoryCustomer) == -2) {
 			$sqlCategoryCustomerNotExists = " NOT EXISTS (";
-			$sqlCategoryCustomerNotExists .= " SELECT cat_cus.fk_soc";
-			$sqlCategoryCustomerNotExists .= " FROM ".$db->prefix()."categorie_societe AS cat_cus";
-			$sqlCategoryCustomerNotExists .= " WHERE cat_cus.fk_soc = p.fk_soc";
+			$sqlCategoryCustomerNotExists .= " SELECT cat_cus.fk_element";
+			$sqlCategoryCustomerNotExists .= " FROM ".$db->prefix()."element_category AS cat_cus";
+			$sqlCategoryCustomerNotExists .= " WHERE cat_cus.fk_element = p.fk_soc";
+			$sqlCategoryCustomerNotExists .= " AND cat_cus.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=2)";
 			$sqlCategoryCustomerNotExists .= " )";
 			$searchCategoryCustomerSqlList[] = $sqlCategoryCustomerNotExists;
 		} elseif (intval($searchCategoryCustomer) > 0) {

From 71c74c3b922a54aae4c52b7f40f78e3d6be4b880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 27 Jul 2023 10:45:13 +0200
Subject: [PATCH 49/69] wip

---
 htdocs/contrat/list.php                         | 17 +++++++++--------
 .../class/intracommreport.class.php             |  6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index ee5a776138e19..1b11ad7632414 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -358,7 +358,7 @@
 	$listofcategoryid = '';
 	foreach ($searchCategoryProductList as $searchCategoryProduct) {
 		if (intval($searchCategoryProduct) == -2) {
-			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."contratdet as cd WHERE cd.fk_contrat = c.rowid AND cd.fk_product = ck.fk_product)";
+			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."contratdet as cd WHERE ck.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=0) AND cd.fk_contrat = c.rowid AND cd.fk_product = ck.fk_element)";
 		} elseif (intval($searchCategoryProduct) > 0) {
 			if ($searchCategoryProductOperator == 0) {
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_element FROM ".MAIN_DB_PREFIX."element_category as ck, ".MAIN_DB_PREFIX."contratdet as cd WHERE cd.fk_contrat = c.rowid AND cd.fk_product = ck.fk_element AND ck.fk_category = ".((int) $searchCategoryProduct).")";
@@ -386,9 +386,10 @@
 	foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
 		if (intval($searchCategoryCustomer) == -2) {
 			$sqlCategoryCustomerNotExists  = " NOT EXISTS (";
-			$sqlCategoryCustomerNotExists .= " SELECT cat_cus.fk_soc";
-			$sqlCategoryCustomerNotExists .= " FROM ".$db->prefix()."categorie_societe AS cat_cus";
-			$sqlCategoryCustomerNotExists .= " WHERE cat_cus.fk_soc = s.rowid";
+			$sqlCategoryCustomerNotExists .= " SELECT cat_cus.fk_element";
+			$sqlCategoryCustomerNotExists .= " FROM ".$db->prefix()."element_category AS cat_cus";
+			$sqlCategoryCustomerNotExists .= " WHERE cat_cus.fk_element = s.rowid";
+			$sqlCategoryCustomerNotExists .= " AND cat_cus.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=2)";
 			$sqlCategoryCustomerNotExists .= " )";
 			$searchCategoryCustomerSqlList[] = $sqlCategoryCustomerNotExists;
 		} elseif (intval($searchCategoryCustomer) > 0) {
@@ -397,10 +398,10 @@
 	}
 	if (!empty($existsCategoryCustomerList)) {
 		$sqlCategoryCustomerExists = " EXISTS (";
-		$sqlCategoryCustomerExists .= " SELECT cat_cus.fk_soc";
-		$sqlCategoryCustomerExists .= " FROM ".$db->prefix()."categorie_societe AS cat_cus";
-		$sqlCategoryCustomerExists .= " WHERE cat_cus.fk_soc = s.rowid";
-		$sqlCategoryCustomerExists .= " AND cat_cus.fk_categorie IN (".$db->sanitize(implode(',', $existsCategoryCustomerList)).")";
+		$sqlCategoryCustomerExists .= " SELECT cat_cus.fk_element";
+		$sqlCategoryCustomerExists .= " FROM ".$db->prefix()."element_category AS cat_cus";
+		$sqlCategoryCustomerExists .= " WHERE cat_cus.fk_element = s.rowid";
+		$sqlCategoryCustomerExists .= " AND cat_cus.fk_category IN (".$db->sanitize(implode(',', $existsCategoryCustomerList)).")";
 		$sqlCategoryCustomerExists .= " )";
 		$searchCategoryCustomerSqlList[] = $sqlCategoryCustomerExists;
 	}
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index 88788f7070efd..8640c84e976d3 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -433,9 +433,9 @@ public function addItemFraisDePort(&$declaration, &$TLinesFraisDePort, $type, &$
 						AND ".$more_sql." = '".$this->db->escape($res->refinvoice)."'
 						AND d.fk_product NOT IN
 						(
-							SELECT fk_product
-							FROM ".MAIN_DB_PREFIX."categorie_product
-							WHERE fk_categorie = ".((int) $categ_fraisdeport->id)."
+							SELECT fk_element
+							FROM ".MAIN_DB_PREFIX."element_category
+							WHERE fk_category = ".((int) $categ_fraisdeport->id)."
 						)
 					)";
 

From d17e7e21d332f33fec7884c51a1921357b5978bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 27 Jul 2023 21:31:46 +0200
Subject: [PATCH 50/69] wip

---
 .../comm/mailing/class/advtargetemailing.class.php   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index e22fa89e6fce7..90befc9ec5589 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -547,7 +547,7 @@ public function query_thirdparty($arrayquery)
 				$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as saleman ON saleman.fk_soc=t.rowid ";
 			}
 			if (array_key_exists('cust_categ', $arrayquery)) {
-				$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as custcateg ON custcateg.fk_soc=t.rowid ";
+				$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."element_category as custcateg ON custcateg.fk_element=t.rowid ";
 			}
 
 			if (!empty($arrayquery['cust_name'])) {
@@ -594,7 +594,7 @@ public function query_thirdparty($arrayquery)
 				$sqlwhere[] = " (t.fk_effectif IN (".$this->db->sanitize(implode(',', $arrayquery['cust_effectif_id']))."))";
 			}
 			if (!empty($arrayquery['cust_categ']) && count($arrayquery['cust_categ']) > 0) {
-				$sqlwhere[] = " (custcateg.fk_categorie IN (".$this->db->sanitize(implode(',', $arrayquery['cust_categ']))."))";
+				$sqlwhere[] = " (custcateg.fk_category IN (".$this->db->sanitize(implode(',', $arrayquery['cust_categ']))."))";
 			}
 			if (!empty($arrayquery['cust_language']) && count($arrayquery['cust_language']) > 0) {
 				$sqlwhere[] = " (t.default_lang IN (".$this->db->sanitize("'".implode("','", $arrayquery['cust_language'])."'", 1)."))";
@@ -701,7 +701,7 @@ public function query_contact($arrayquery, $withThirdpartyFilter = 0)
 
 		if (count($arrayquery) > 0) {
 			if (array_key_exists('contact_categ', $arrayquery)) {
-				$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_contact as contactcateg ON contactcateg.fk_socpeople=t.rowid ";
+				$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."element_category as contactcateg ON contactcateg.fk_element=t.rowid ";
 			}
 
 			if (!empty($arrayquery['contact_lastname'])) {
@@ -735,7 +735,7 @@ public function query_contact($arrayquery, $withThirdpartyFilter = 0)
 				$sqlwhere[] = " (t.datec >= '".$this->db->idate($arrayquery['contact_create_st_dt'])."' AND t.datec <= '".$this->db->idate($arrayquery['contact_create_end_dt'])."')";
 			}
 			if (!empty($arrayquery['contact_categ']) && count($arrayquery['contact_categ']) > 0) {
-				$sqlwhere[] = " (contactcateg.fk_categorie IN (".$this->db->escape(implode(",", $arrayquery['contact_categ']))."))";
+				$sqlwhere[] = " (contactcateg.fk_category IN (".$this->db->escape(implode(",", $arrayquery['contact_categ']))."))";
 			}
 
 			//Standard Extrafield feature
@@ -788,7 +788,7 @@ public function query_contact($arrayquery, $withThirdpartyFilter = 0)
 						$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as saleman ON saleman.fk_soc=ts.rowid ";
 					}
 					if (array_key_exists('cust_categ', $arrayquery)) {
-						$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as custcateg ON custcateg.fk_soc=ts.rowid ";
+						$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."element_category as custcateg ON custcateg.fk_element=ts.rowid ";
 					}
 
 					if (!empty($arrayquery['cust_name'])) {
@@ -835,7 +835,7 @@ public function query_contact($arrayquery, $withThirdpartyFilter = 0)
 						$sqlwhere[] = " (ts.fk_effectif IN (".$this->db->sanitize(implode(',', $arrayquery['cust_effectif_id']))."))";
 					}
 					if (!empty($arrayquery['cust_categ']) && count($arrayquery['cust_categ']) > 0) {
-						$sqlwhere[] = " (custcateg.fk_categorie IN (".$this->db->sanitize(implode(',', $arrayquery['cust_categ']))."))";
+						$sqlwhere[] = " (custcateg.fk_category IN (".$this->db->sanitize(implode(',', $arrayquery['cust_categ']))."))";
 					}
 					if (!empty($arrayquery['cust_language']) && count($arrayquery['cust_language']) > 0) {
 						$sqlwhere[] = " (ts.default_lang IN ('".$this->db->sanitize(implode("','", $arrayquery['cust_language']))."'))";

From 55a8a86e136591164f5c07f451e2cc2c94422004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Fri, 28 Jul 2023 09:05:45 +0200
Subject: [PATCH 51/69] wip

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

diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index 3fa261a8cd2be..1cb2b8ffcd52b 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -273,6 +273,7 @@ public function countMembersByTagAndStatus($numberYears = 0)
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as d ON d.rowid = ct.fk_element";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_type as t ON t.rowid = d.fk_adherent_type";
 		$sql .= " WHERE c.entity IN (".getEntity('member_type').")";
+		$sql .= " AND c.type = 3";
 		$sql .= " AND d.entity IN (" . getEntity('adherent') . ")";
 		$sql .= " AND t.entity IN (" . getEntity('adherent') . ")";
 		if ($numberYears) {

From 2579200f8edb2eeb214fa708eaf751d98c7bebab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Fri, 28 Jul 2023 18:02:57 +0200
Subject: [PATCH 52/69] wip

---
 htdocs/contrat/list.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 1b11ad7632414..14d554bb39c57 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -412,13 +412,14 @@
 	foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
 		if (intval($searchCategoryCustomer) == -2) {
 			$sqlCategoryCustomerNotExists = " NOT EXISTS (";
-			$sqlCategoryCustomerNotExists .= " SELECT cat_cus.fk_soc";
-			$sqlCategoryCustomerNotExists .= " FROM ".$db->prefix()."categorie_societe AS cat_cus";
-			$sqlCategoryCustomerNotExists .= " WHERE cat_cus.fk_soc = s.rowid";
+			$sqlCategoryCustomerNotExists .= " SELECT cat_cus.fk_element";
+			$sqlCategoryCustomerNotExists .= " FROM ".$db->prefix()."element_category AS cat_cus";
+			$sqlCategoryCustomerNotExists .= " WHERE cat_cus.fk_element = s.rowid";
+			$sqlCategoryCustomerNotExists .= " AND cat_cus.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=2)";
 			$sqlCategoryCustomerNotExists .= " )";
 			$searchCategoryCustomerSqlList[] = $sqlCategoryCustomerNotExists;
 		} elseif (intval($searchCategoryCustomer) > 0) {
-			$searchCategoryCustomerSqlList[] = "s.rowid IN (SELECT fk_soc FROM ".$db->prefix()."categorie_societe WHERE fk_categorie = ".((int) $searchCategoryCustomer).")";
+			$searchCategoryCustomerSqlList[] = "s.rowid IN (SELECT fk_element FROM ".$db->prefix()."element_category WHERE fk_category = ".((int) $searchCategoryCustomer).")";
 		}
 	}
 	if (!empty($searchCategoryCustomerSqlList)) {

From a062306a0ae12ec253b46a4d271215cd495e2640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Fri, 28 Jul 2023 18:18:52 +0200
Subject: [PATCH 53/69] wip

---
 htdocs/product/reassortlot.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 63abd71401130..188eda45ca906 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -267,11 +267,13 @@
 		$sql .= " EXISTS ";
 	}
 	$sql .= "(";
-	$sql .= " SELECT cp.fk_categorie, cp.fk_product";
-	$sql .= " FROM " . MAIN_DB_PREFIX . "categorie_product as cp";
-	$sql .= " WHERE cp.fk_product = p.rowid"; // Join for the needed table to filter by categ
+	$sql .= " SELECT cp.fk_category, cp.fk_element";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "element_category as cp";
+	$sql .= " WHERE cp.fk_element = p.rowid"; // Join for the needed table to filter by categ
 	if ($search_categ > 0) {
-		$sql .= " AND cp.fk_categorie = " . ((int) $search_categ);
+		$sql .= " AND cp.fk_category = " . ((int) $search_categ);
+	} elseif ($search_categ == -2) {
+		$sql .= " AND cp.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=0)";
 	}
 	$sql .= ")";
 }
@@ -283,11 +285,13 @@
 		$sql .= " EXISTS ";
 	}
 	$sql .= "(";
-	$sql .= " SELECT cp.fk_categorie, cp.fk_warehouse";
-	$sql .= " FROM " . MAIN_DB_PREFIX . "categorie_warehouse as cp";
-	$sql .= " WHERE cp.fk_warehouse = e.rowid"; // Join for the needed table to filter by categ
+	$sql .= " SELECT cp.fk_category, cp.fk_element";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "element_category as cp";
+	$sql .= " WHERE cp.fk_element = e.rowid"; // Join for the needed table to filter by categ
 	if ($search_warehouse_categ > 0) {
-		$sql .= " AND cp.fk_categorie = " . ((int) $search_warehouse_categ);
+		$sql .= " AND cp.fk_category = " . ((int) $search_warehouse_categ);
+	} elseif ($search_warehouse_categ == -2) {
+		$sql .= " AND cp.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=9)";
 	}
 	$sql .= ")";
 }

From 7068b7437a2a46d8c58f9ffc5de738386dcbfa42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 29 Jul 2023 13:50:12 +0200
Subject: [PATCH 54/69] wip

---
 htdocs/install/mysql/migration/18.0.0-19.0.0.sql | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
index 5f95285088478..50e0138fdddad 100644
--- a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
+++ b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
@@ -59,6 +59,10 @@ INSERT INTO llx_c_category (id,module,classname) VALUES (10, 'actioncomm', 'Acti
 INSERT INTO llx_c_category (id,module,classname) VALUES (11, 'website_page', 'WebsitePage');
 INSERT INTO llx_c_category (id,module,classname) VALUES (12, 'ticket', 'Ticket');
 INSERT INTO llx_c_category (id,module,classname) VALUES (13, 'knowledgemanagement', 'KnowledgeRecord');
+INSERT INTO llx_c_category (id,module,classname) VALUES (14, 'invoice', 'Facture');
+INSERT INTO llx_c_category (id,module,classname) VALUES (15, 'supplier_invoice', 'FactureFournisseur');
+INSERT INTO llx_c_category (id,module,classname) VALUES (16, 'order', 'Commande');
+INSERT INTO llx_c_category (id,module,classname) VALUES (17, 'supplier_order', 'CommandeFournisseur');
 
 -- VMYSQL4.1 DROP INDEX idx_element_categorie_idx  on llx_element_categorie;
 -- VPGSQL8.2 DROP INDEX idx_element_categorie_idx;

From 530e514e3f57355c40dd789ad5bb86332501986a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 29 Jul 2023 13:51:07 +0200
Subject: [PATCH 55/69] wip

---
 htdocs/install/mysql/data/llx_c_category.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_c_category.sql b/htdocs/install/mysql/data/llx_c_category.sql
index 359e9f2f29192..35508a6513687 100644
--- a/htdocs/install/mysql/data/llx_c_category.sql
+++ b/htdocs/install/mysql/data/llx_c_category.sql
@@ -31,3 +31,8 @@ INSERT INTO llx_c_category (id,module,classname) VALUES (10, 'actioncomm', 'Acti
 INSERT INTO llx_c_category (id,module,classname) VALUES (11, 'website_page', 'WebsitePage');
 INSERT INTO llx_c_category (id,module,classname) VALUES (12, 'ticket', 'Ticket');
 INSERT INTO llx_c_category (id,module,classname) VALUES (13, 'knowledgemanagement', 'KnowledgeRecord');
+INSERT INTO llx_c_category (id,module,classname) VALUES (13, 'knowledgemanagement', 'KnowledgeRecord');
+INSERT INTO llx_c_category (id,module,classname) VALUES (14, 'invoice', 'Facture');
+INSERT INTO llx_c_category (id,module,classname) VALUES (15, 'supplier_invoice', 'FactureFournisseur');
+INSERT INTO llx_c_category (id,module,classname) VALUES (16, 'order', 'Commande');
+INSERT INTO llx_c_category (id,module,classname) VALUES (17, 'supplier_order', 'CommandeFournisseur');

From 48cfc9bb8aca07032f8ed3340e50a539550b1a82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 29 Jul 2023 14:51:30 +0200
Subject: [PATCH 56/69] wip

---
 .../stats/supplier_turnover_by_prodserv.php    |  8 ++++----
 .../stats/supplier_turnover_by_thirdparty.php  | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
index d04ad4c42598c..e0de79860f3e3 100644
--- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -280,9 +280,9 @@
 	$sql .= ",".MAIN_DB_PREFIX."facture_fourn_det as l";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid";
 	if ($selected_cat === -2) {	// Without any category
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_category as cp ON p.rowid = cp.fk_element";
 	} elseif ($selected_cat) { 	// Into a specific category
-		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
+		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."element_category as cp";
 	}
 	$sql .= " WHERE l.fk_facture_fourn = f.rowid";
 	$sql .= " AND f.fk_statut in (1,2)";
@@ -295,14 +295,14 @@
 		$sql .= " AND l.product_type = ".((int) $selected_type);
 	}
 	if ($selected_cat === -2) {	// Without any category
-		$sql .= " AND cp.fk_product is null";
+		$sql .= " AND cp.fk_element is null AND cp.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=0)";
 	} elseif ($selected_cat) {	// Into a specific category
 		$sql .= " AND (c.rowid = ".((int) $selected_cat);
 		if ($subcat) {
 			$sql .= " OR c.fk_parent = ".((int) $selected_cat);
 		}
 		$sql .= ")";
-		$sql .= " AND cp.fk_categorie = c.rowid AND cp.fk_product = p.rowid";
+		$sql .= " AND cp.fk_category = c.rowid AND cp.fk_element = p.rowid";
 	}
 	if ($selected_soc > 0) {
 		$sql .= " AND soc.rowid=".((int) $selected_soc);
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index dee0a0f2217a8..34911e7175203 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -249,9 +249,9 @@
 	$sql .= " sum(f.total_ht) as amount, sum(f.total_ttc) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
 	if ($selected_cat === -2) {	// Without any category
-		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.fk_soc";
+		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."element_category as cs ON s.rowid = cs.fk_element";
 	} elseif ($selected_cat) { 	// Into a specific category
-		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_fournisseur as cs";
+		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."element_category as cs";
 	}
 	$sql .= " WHERE f.fk_statut in (1,2)";
 	$sql .= " AND f.type IN (0,2)";
@@ -260,14 +260,14 @@
 		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	}
 	if ($selected_cat === -2) {	// Without any category
-		$sql .= " AND cs.fk_soc is null";
+		$sql .= " AND cs.fk_element is null AND cs.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=1)";
 	} elseif ($selected_cat) {	// Into a specific category
 		$sql .= " AND (c.rowid = ".((int) $selected_cat);
 		if ($subcat) {
 			$sql .= " OR c.fk_parent = ".((int) $selected_cat);
 		}
 		$sql .= ")";
-		$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
+		$sql .= " AND cs.fk_category = c.rowid AND cs.fk_element = s.rowid";
 	}
 } elseif ($modecompta == "RECETTES-DEPENSES") {
 	$sql = "SELECT s.rowid as socid, s.nom as name, s.zip, s.town, s.fk_pays, sum(pf.amount) as amount_ttc";
@@ -276,25 +276,25 @@
 	$sql .= ", ".MAIN_DB_PREFIX."paiementfourn as p";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if ($selected_cat === -2) {	// Without any category
-		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.fk_soc";
+		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."element_category as cs ON s.rowid = cs.fk_element";
 	} elseif ($selected_cat) { 	// Into a specific category
-		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_fournisseur as cs";
+		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."element_category as cs";
 	}
 	$sql .= " WHERE p.rowid = pf.fk_paiementfourn";
 	$sql .= " AND pf.fk_facturefourn = f.rowid";
-	$sql .= " AND f.fk_soc = s.rowid";
+	$sql .= " AND f.fk_element = s.rowid";
 	if ($date_start && $date_end) {
 		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 	if ($selected_cat === -2) {	// Without any category
-		$sql .= " AND cs.fk_soc is null";
+		$sql .= " AND cs.fk_element is null AND cp.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=1)";
 	} elseif ($selected_cat) {	// Into a specific category
 		$sql .= " AND (c.rowid = ".((int) $selected_cat);
 		if ($subcat) {
 			$sql .= " OR c.fk_parent = ".((int) $selected_cat);
 		}
 		$sql .= ")";
-		$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
+		$sql .= " AND cs.fk_category = c.rowid AND cs.fk_element = s.rowid";
 	}
 }
 if (!empty($search_societe)) {

From f2ff06a0fa7abb1c7e8c01f0df67dcc9f1fa7351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 29 Jul 2023 14:55:50 +0200
Subject: [PATCH 57/69] wip

---
 htdocs/compta/stats/casoc.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index b499ca17c7127..af9a276267c31 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -273,9 +273,9 @@
 	$sql .= " sum(f.total_ht) as amount, sum(f.total_ttc) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
 	if ($selected_cat === -2) {	// Without any category
-		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
+		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."element_category as cs ON s.rowid = cs.fk_element";
 	} elseif ($selected_cat) { 	// Into a specific category
-		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
+		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."element_category as cs";
 	}
 	$sql .= " WHERE f.fk_statut in (1,2)";
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
@@ -288,14 +288,14 @@
 		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	}
 	if ($selected_cat === -2) {	// Without any category
-		$sql .= " AND cs.fk_soc is null";
+		$sql .= " AND cs.fk_element is null AND cp.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=3)";
 	} elseif ($selected_cat) {	// Into a specific category
 		$sql .= " AND (c.rowid = ".((int) $selected_cat);
 		if ($subcat) {
 			$sql .= " OR c.fk_parent = ".((int) $selected_cat);
 		}
 		$sql .= ")";
-		$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
+		$sql .= " AND cs.fk_category = c.rowid AND cs.fk_element = s.rowid";
 	}
 } elseif ($modecompta == "RECETTES-DEPENSES") {
 	/*
@@ -308,25 +308,25 @@
 	$sql .= ", ".MAIN_DB_PREFIX."paiement as p";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if ($selected_cat === -2) {	// Without any category
-		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
+		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."element_category as cs ON s.rowid = cs.fk_soc";
 	} elseif ($selected_cat) { 	// Into a specific category
-		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
+		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."element_category as cs";
 	}
 	$sql .= " WHERE p.rowid = pf.fk_paiement";
 	$sql .= " AND pf.fk_facture = f.rowid";
-	$sql .= " AND f.fk_soc = s.rowid";
+	$sql .= " AND f.fk_element = s.rowid";
 	if ($date_start && $date_end) {
 		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 	if ($selected_cat === -2) {	// Without any category
-		$sql .= " AND cs.fk_soc is null";
+		$sql .= " AND cs.fk_element is null AND cp.fk_category IN (SELECT rowid FROM ".MAIN_DB_PREFIX."categorie WHERE type=3)";
 	} elseif ($selected_cat) {	// Into a specific category
 		$sql .= " AND (c.rowid = ".((int) $selected_cat);
 		if ($subcat) {
 			$sql .= " OR c.fk_parent = ".((int) $selected_cat);
 		}
 		$sql .= ")";
-		$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
+		$sql .= " AND cs.fk_category = c.rowid AND cs.fk_element = s.rowid";
 	}
 } elseif ($modecompta == "BOOKKEEPING") {
 } elseif ($modecompta == "BOOKKEEPINGCOLLECTED") {

From ae229a50a1972c9d45e6a9283421a42b49daa656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 5 Aug 2023 10:03:29 +0200
Subject: [PATCH 58/69] fix redeclare

---
 htdocs/website/class/websitepage.class.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 57b173b05b71d..c2784bf4b91b0 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -113,9 +113,6 @@ class WebsitePage extends CommonObject
 	 */
 	public $date_modification;
 
-	public $fk_user_creat;
-	public $fk_user_modif;
-
 	/**
 	 * @var string author_alias
 	 */

From 5938f9b650e555d05fd52f976caa095b03fffa95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 6 Aug 2023 16:34:12 +0200
Subject: [PATCH 59/69] wip

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

diff --git a/htdocs/core/class/cgenericdic.class.php b/htdocs/core/class/cgenericdic.class.php
index 19720d254b95d..66ef1e8abe112 100644
--- a/htdocs/core/class/cgenericdic.class.php
+++ b/htdocs/core/class/cgenericdic.class.php
@@ -29,7 +29,7 @@
 /**
  * Class CGenericDic
  */
-class CGenericDic extends Commondict
+class CGenericDic extends CommonDict
 {
 	/**
 	 * @var string Id to identify managed objects

From a579c5d4ecdfc7b6f72e4abff3df18036c2b5f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 9 Aug 2023 18:52:38 +0200
Subject: [PATCH 60/69] remove debug

---
 htdocs/core/actions_addupdatedelete.inc.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 958a87b401e59..bd102f3d7bbde 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -109,8 +109,6 @@
 			if (!empty($values_arr)) {
 				$value = implode(',', $values_arr);
 			}
-			var_dump($value);
-			exit;
 		} else {
 			if ($key == 'lang') {
 				$value = GETPOST($key, 'aZ09') ?GETPOST($key, 'aZ09') : "";

From 7be49479846c083f28119c15a6c34082f864f68a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 11 Aug 2023 11:42:40 +0200
Subject: [PATCH 61/69] fix tabs

---
 htdocs/core/class/commondocgenerator.class.php | 2 +-
 htdocs/includes/odtphp/odf.php                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 81fd0a52c95ff..2292d73142ebc 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -583,7 +583,7 @@ public function get_substitutionarray_object($object, $outputlangs, $array_key =
 			$resarray[$array_key.'_bank_number'] = $bank_account->number;
 			$resarray[$array_key.'_bank_proprio'] = $bank_account->proprio;
 		}
-		
+
 		if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Propal', 'Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {
 			$resarray[$array_key.'_total_discount_ht_locale'] = price($object->getTotalDiscount(), 0, $outputlangs);
 			$resarray[$array_key.'_total_discount_ht'] = price2num($object->getTotalDiscount());
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index e3160b880f997..c969d18cd0aff 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -834,7 +834,7 @@ public function exportAsAttachedPDF($name = "")
 			// using windows libreoffice that must be in path
 			// using linux/mac libreoffice that must be in path
 			// Note PHP Config "fastcgi.impersonate=0" must set to 0 - Default is 1
-			$command ='soffice --headless -env:UserInstallation=file:\''.$conf->user->dir_temp.'/odtaspdf\' --convert-to pdf --outdir '. escapeshellarg(dirname($name)). " ".escapeshellarg($name);
+			$command ='soffice --headless --convert-to pdf --outdir '. escapeshellarg(dirname($name)). " ".escapeshellarg($name);
 		} elseif (preg_match('/unoconv/', getDolGlobalString('MAIN_ODT_AS_PDF'))) {
 			// If issue with unoconv, see https://github.com/dagwieers/unoconv/issues/87
 

From f21e8714f7634c6b31569d5f59de53ce5784b449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 11 Aug 2023 13:39:00 +0200
Subject: [PATCH 62/69] fix

---
 htdocs/includes/odtphp/odf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index c969d18cd0aff..e3160b880f997 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -834,7 +834,7 @@ public function exportAsAttachedPDF($name = "")
 			// using windows libreoffice that must be in path
 			// using linux/mac libreoffice that must be in path
 			// Note PHP Config "fastcgi.impersonate=0" must set to 0 - Default is 1
-			$command ='soffice --headless --convert-to pdf --outdir '. escapeshellarg(dirname($name)). " ".escapeshellarg($name);
+			$command ='soffice --headless -env:UserInstallation=file:\''.$conf->user->dir_temp.'/odtaspdf\' --convert-to pdf --outdir '. escapeshellarg(dirname($name)). " ".escapeshellarg($name);
 		} elseif (preg_match('/unoconv/', getDolGlobalString('MAIN_ODT_AS_PDF'))) {
 			// If issue with unoconv, see https://github.com/dagwieers/unoconv/issues/87
 

From a174509fb51e1d30094de4eb02d90466ce4312f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 30 Aug 2023 08:27:31 +0200
Subject: [PATCH 63/69] phpcs

---
 .github/workflows/phpcs.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
index 560891f1ef150..023f1ae514ce3 100644
--- a/.github/workflows/phpcs.yml
+++ b/.github/workflows/phpcs.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          fetch-depth: 50 # important!
+          fetch-depth: 0 # important!
 
       # we may use whatever way to install phpcs, just specify the path on the next step
       # however, curl seems to be the fastest
@@ -22,7 +22,7 @@ jobs:
           curl -OL https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar
           php phpcs.phar --version
 
-      - uses: thenabeel/action-phpcs@v8
+      - uses: tinovyatkin/action-php-codesniffer@v1
         with:
           files: "**.php" # you may customize glob as needed
           phpcs_path: php phpcs.phar

From 577ba9512a6f5f4143d32bf42e506d1b128fcc24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 30 Aug 2023 08:39:06 +0200
Subject: [PATCH 64/69] phpcs

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

diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
index 023f1ae514ce3..cb383c48c2478 100644
--- a/.github/workflows/phpcs.yml
+++ b/.github/workflows/phpcs.yml
@@ -26,5 +26,5 @@ jobs:
         with:
           files: "**.php" # you may customize glob as needed
           phpcs_path: php phpcs.phar
-          standard: dev/setup/codesniffer/ruleset.xml
+          standard: 'dev/setup/codesniffer/ruleset.xml'
           fail_on_warnings: false

From 81b73c5a8ab4f6cad086067cbe8b86d8f2ec900e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 30 Aug 2023 17:36:54 +0200
Subject: [PATCH 65/69] try to fix

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

diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
index cb383c48c2478..c237d0984e9ef 100644
--- a/.github/workflows/phpcs.yml
+++ b/.github/workflows/phpcs.yml
@@ -22,7 +22,7 @@ jobs:
           curl -OL https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar
           php phpcs.phar --version
 
-      - uses: tinovyatkin/action-php-codesniffer@v1
+      - uses: thenabeel/action-phpcs@v8
         with:
           files: "**.php" # you may customize glob as needed
           phpcs_path: php phpcs.phar

From 53c3ae7826875f947c9b1088a9108c127de6f714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 30 Aug 2023 17:49:44 +0200
Subject: [PATCH 66/69] try to fix

---
 .github/workflows/phpcs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
index c237d0984e9ef..888751c683276 100644
--- a/.github/workflows/phpcs.yml
+++ b/.github/workflows/phpcs.yml
@@ -28,3 +28,4 @@ jobs:
           phpcs_path: php phpcs.phar
           standard: 'dev/setup/codesniffer/ruleset.xml'
           fail_on_warnings: false
+          scope: "blame"

From 4d8e819fe86b2be2c277167a9987aa9af36126e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 31 Aug 2023 23:35:42 +0200
Subject: [PATCH 67/69] fix

---
 .github/workflows/phpcs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
index 888751c683276..df936a89afc84 100644
--- a/.github/workflows/phpcs.yml
+++ b/.github/workflows/phpcs.yml
@@ -29,3 +29,4 @@ jobs:
           standard: 'dev/setup/codesniffer/ruleset.xml'
           fail_on_warnings: false
           scope: "blame"
+          encoding: "utf-8"

From a52a6aded27658a36ad63387b49d0558d6a20176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 11 Sep 2023 09:31:03 +0200
Subject: [PATCH 68/69] fix phpcs

---
 htdocs/install/upgrade2.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 640b1e5fe0b6f..82bdfc982909a 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3341,7 +3341,7 @@ function migrate_element_category($db, $langs, $conf)
 	$result = $db->query($sql);
 	if ($result) {
 		while ($obj = $db->fetch_object($result)) {
-			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_product.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int) $obj->fk_product.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
 		}
 		print '<b>'.$langs->trans('MigrationCategories', 'Products')."</b><br>\n";
 	} else {
@@ -3355,7 +3355,7 @@ function migrate_element_category($db, $langs, $conf)
 	$result = $db->query($sql);
 	if ($result) {
 		while ($obj = $db->fetch_object($result)) {
-			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_soc.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int) $obj->fk_soc.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
 		}
 		print '<b>'.$langs->trans('MigrationCategories', 'Suppliers')."</b><br>\n";
 	} else {
@@ -3369,7 +3369,7 @@ function migrate_element_category($db, $langs, $conf)
 	$result = $db->query($sql);
 	if ($result) {
 		while ($obj = $db->fetch_object($result)) {
-			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_soc.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int) $obj->fk_soc.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
 		}
 		print '<b>'.$langs->trans('MigrationCategories', 'Customers')."</b><br>\n";
 	} else {
@@ -3383,7 +3383,7 @@ function migrate_element_category($db, $langs, $conf)
 	$result = $db->query($sql);
 	if ($result) {
 		while ($obj = $db->fetch_object($result)) {
-			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_member.')');
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element) VALUES('.(int) $obj->fk_categorie.','.(int) $obj->fk_member.')');
 		}
 		print '<b>'.$langs->trans('MigrationCategories', 'Members')."</b><br>\n";
 	} else {
@@ -3397,7 +3397,7 @@ function migrate_element_category($db, $langs, $conf)
 	$result = $db->query($sql);
 	if ($result) {
 		while ($obj = $db->fetch_object($result)) {
-			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_socpeople.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int) $obj->fk_socpeople.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
 		}
 		print '<b>'.$langs->trans('MigrationCategories', 'Contacts')."</b><br>\n";
 	} else {
@@ -3411,7 +3411,7 @@ function migrate_element_category($db, $langs, $conf)
 	$result = $db->query($sql);
 	if ($result) {
 		while ($obj = $db->fetch_object($result)) {
-			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_account.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int) $obj->fk_account.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
 		}
 		print '<b>'.$langs->trans('MigrationCategories', 'Accounts')."</b><br>\n";
 	} else {
@@ -3425,7 +3425,7 @@ function migrate_element_category($db, $langs, $conf)
 	$result = $db->query($sql);
 	if ($result) {
 		while ($obj = $db->fetch_object($result)) {
-			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_project.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int) $obj->fk_project.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
 		}
 		print '<b>'.$langs->trans('MigrationCategories', 'Projects')."</b><br>\n";
 	} else {
@@ -3439,7 +3439,7 @@ function migrate_element_category($db, $langs, $conf)
 	$result = $db->query($sql);
 	if ($result) {
 		while ($obj = $db->fetch_object($result)) {
-			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_user.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int) $obj->fk_user.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
 		}
 		print '<b>'.$langs->trans('MigrationCategories', 'Users')."</b><br>\n";
 	} else {
@@ -3453,7 +3453,7 @@ function migrate_element_category($db, $langs, $conf)
 	$result = $db->query($sql);
 	if ($result) {
 		while ($obj = $db->fetch_object($result)) {
-			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_warehouse.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int) $obj->fk_warehouse.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
 		}
 		print '<b>'.$langs->trans('MigrationCategories', 'Warehouses')."</b><br>\n";
 	} else {
@@ -3467,7 +3467,7 @@ function migrate_element_category($db, $langs, $conf)
 	$result = $db->query($sql);
 	if ($result) {
 		while ($obj = $db->fetch_object($result)) {
-			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_actioncomm.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+			$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int) $obj->fk_actioncomm.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
 		}
 		print '<b>'.$langs->trans('MigrationCategories', 'Actioncomms')."</b><br>\n";
 	} else {
@@ -3483,7 +3483,7 @@ function migrate_element_category($db, $langs, $conf)
 		$result = $db->query($sql);
 		if ($result) {
 			while ($obj = $db->fetch_object($result)) {
-				$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_website_page.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+				$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int) $obj->fk_website_page.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
 			}
 			print '<b>'.$langs->trans('MigrationCategories', 'WebsitePages')."</b><br>\n";
 		} else {
@@ -3502,7 +3502,7 @@ function migrate_element_category($db, $langs, $conf)
 		$result = $db->query($sql);
 		if ($result) {
 			while ($obj = $db->fetch_object($result)) {
-				$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_ticket.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+				$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int) $obj->fk_ticket.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
 			}
 			print '<b>'.$langs->trans('MigrationCategories', 'Tickets')."</b><br>\n";
 		} else {
@@ -3521,7 +3521,7 @@ function migrate_element_category($db, $langs, $conf)
 		$result = $db->query($sql);
 		if ($result) {
 			while ($obj = $db->fetch_object($result)) {
-				$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int)$obj->fk_knowledgemanagement.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
+				$db->query('INSERT INTO '.MAIN_DB_PREFIX.'element_category (fk_category, fk_element, import_key) VALUES('.(int) $obj->fk_categorie.','.(int) $obj->fk_knowledgemanagement.', '.(is_null($obj->import_key) ? 'null' : $db->escape($obj->import_key)).')');
 			}
 			print '<b>'.$langs->trans('MigrationCategories', 'Knowledgemanagement')."</b><br>\n";
 		} else {

From 0eab784b9949037e72c11b4f1237c174ee97acc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 11 Sep 2023 09:39:22 +0200
Subject: [PATCH 69/69] fix phpcs

---
 .github/workflows/phpcs.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
index df936a89afc84..2dc9c3980a508 100644
--- a/.github/workflows/phpcs.yml
+++ b/.github/workflows/phpcs.yml
@@ -11,7 +11,7 @@ jobs:
   phpcs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # important!
 
@@ -29,4 +29,3 @@ jobs:
           standard: 'dev/setup/codesniffer/ruleset.xml'
           fail_on_warnings: false
           scope: "blame"
-          encoding: "utf-8"