diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 189da9b8aa7..b37cfecbd2a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1640,6 +1640,8 @@ abstract class CommonObject
 
         $justsource=false;
         $justtarget=false;
+        $withtargettype=false;
+        $withsourcetype=false;
 
         if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid))
         {
@@ -1649,7 +1651,7 @@ abstract class CommonObject
         if (! empty($targetid) && ! empty($targettype) && empty($sourceid))
         {
         	$justtarget=true;
-        	if (! empty($sourcetype)) $withsourcetype;
+        	if (! empty($sourcetype)) $withsourcetype=true;
         }
 
         $sourceid = (! empty($sourceid) ? $sourceid : $this->id);
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 83b41a8a0c3..c37c9d3926a 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -450,17 +450,17 @@ class FormOther
         }
     }
 
-    /**
-     *		Output a HTML code to select a color
-     *
-     *		@param	string		$set_color		Pre-selected color
-     *		@param	string		$prefix			Name of HTML field
-     *		@param	string		$form_name		Name of form
-     * 		@param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
-     * 		@param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
-     * 		@return	void
-     */
-    function select_color($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='')
+    /**
+     *		Output a HTML code to select a color
+     *
+     *		@param	string		$set_color		Pre-selected color
+     *		@param	string		$prefix			Name of HTML field
+     *		@param	string		$form_name		Name of form
+     * 		@param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
+     * 		@param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
+     * 		@return	void
+     */
+    function select_color($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='')
     {
     	print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);
     }