Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

2023-09-05 21:39:15 +02:00
parent e9cb81ded8 150de687bf
commit 46919d1ac6
32 changed files with 279 additions and 101 deletions
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -274,6 +274,9 @@ function getEntity($element, $shared = 1, $currentobject = null)

 	// fix different element names (France to English)
 	switch ($element) {
+		case 'projet':
+			$element = 'project';
+			break;
 		case 'contrat':
 			$element = 'contract';
 			break; // "/contrat/class/contrat.class.php"