Merge branch 'develop' of github.com:atm-maxime/dolibarr into

atm-maxime-develop

Conflicts:
	htdocs/core/class/html.formprojet.class.php

htdocs/core/class/html.formprojet.class.php

@@ -77,6 +77,7 @@ class FormProjets
 		$sql.= " WHERE p.entity = ".$conf->entity;
 		if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
 		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
 		$sql.= " ORDER BY p.ref ASC";
 
 		dol_syslog(get_class($this)."::select_projects sql=".$sql,LOG_DEBUG);