diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 5b3f8006345..3292d8fc3e6 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -4023,9 +4023,9 @@ class OrderLine extends CommonOrderLine
 	 *  @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *	@return	 int  <0 si ko, >0 si ok
 	 */
-	function delete($user=null, $notrigger=0)
+	function delete(User $user, $notrigger=0)
 	{
-		global $conf, $user, $langs;
+		global $conf, $langs;
 
 		$error=0;
 
diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php
index b731eb77169..332f7e115ef 100644
--- a/htdocs/core/class/comment.class.php
+++ b/htdocs/core/class/comment.class.php
@@ -357,7 +357,7 @@ class Comment extends CommonObject
 				}
 				$db->free($resql);
 			} else {
-				$error++; $this->errors[]="Error ".$this->db->lasterror();
+				$this->errors[]="Error ".$this->db->lasterror();
 				return -1;
 			}
 		}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 4f2d32292cf..b7b4f79300f 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6118,13 +6118,13 @@ abstract class CommonObject
 		{
 			$value_arr=explode(',',$value);
 			$value='';
-			if (is_array($value_arr))
+			if (is_array($value_arr) && count($value_arr)>0)
 			{
 				foreach ($value_arr as $keyval=>$valueval) {
 					$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
 				}
+				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			}
-			$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 		}
 		elseif ($type == 'chkbxlst')
 		{
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 76aa73e960e..6292008c54d 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -164,27 +164,27 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_tasks($task,$outputlangs)
+	function get_substitutionarray_tasks(Task $task,$outputlangs)
 	{
         // phpcs:enable
 		global $conf;
 
 		$resarray = array(
-		'task_ref'=>$task->ref,
-		'task_fk_project'=>$task->fk_project,
-		'task_projectref'=>$task->projectref,
-		'task_projectlabel'=>$task->projectlabel,
-		'task_label'=>$task->label,
-		'task_description'=>$task->description,
-		'task_fk_parent'=>$task->fk_parent,
-		'task_duration'=>$task->duration,
-		'task_duration_hour'=>convertSecondToTime($task->duration,'all'),
-		'task_progress'=>$task->progress,
-		'task_public'=>$task->public,
-		'task_date_start'=>dol_print_date($task->date_start,'day'),
-		'task_date_end'=>dol_print_date($task->date_end,'day'),
-		'task_note_private'=>$task->note_private,
-		'task_note_public'=>$task->note_public
+			'task_ref'=>$task->ref,
+			'task_fk_project'=>$task->fk_project,
+			'task_projectref'=>$task->projectref,
+			'task_projectlabel'=>$task->projectlabel,
+			'task_label'=>$task->label,
+			'task_description'=>$task->description,
+			'task_fk_parent'=>$task->fk_parent,
+			'task_duration'=>$task->duration,
+			'task_duration_hour'=>convertSecondToTime($task->duration,'all'),
+			'task_progress'=>$task->progress,
+			'task_public'=>$task->public,
+			'task_date_start'=>dol_print_date($task->date_start,'day'),
+			'task_date_end'=>dol_print_date($task->date_end,'day'),
+			'task_note_private'=>$task->note_private,
+			'task_note_public'=>$task->note_public
 		);
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -750,6 +750,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 							$num = $this->db->num_rows($resql);
 							$i = 0;
 							$tasks = array();
+							$row=array();
 							$listlinestasktime = $listlines->__get('taskstimes');
 							if (empty($num)) {
 								$row['rowid']='';
@@ -1064,7 +1065,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						'title' => "ListSocialContributionAssociatedProject",
 						'class' => 'ChargeSociales',
 						'table' => 'chargesociales',
-						'urlnew' => DOL_URL_ROOT . '/compta/sociales/card.php?action=create&projectid=' . $id,
+						'urlnew' => DOL_URL_ROOT . '/compta/sociales/card.php?action=create&projectid=' . $object->id,
 						'test' => $conf->tax->enabled && $user->rights->tax->charges->lire
 					),
 					'stock_mouvement' => array(