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

htdocs/emailcollector/class/emailcollector.class.php

@@ -708,6 +708,16 @@ class EmailCollector extends CommonObject
 	 *
 	 * @return	int		0=OK, Nb of error if error
 	 */
+
+	/**
+	 * overwitePropertiesOfObject
+	 *
+	 * @param	object	$object			Current object
+	 * @param	string	$actionparam	Action parameters
+	 * @param	string	$messagetext	Body
+	 * @param	string	$subject		Subject
+	 * @return	int						0=OK, Nb of error if error
+	 */
 	private function overwritePropertiesOfObject(&$object, $actionparam, $messagetext, $subject)
 	{
 		$errorforthisaction = 0;
@@ -1060,7 +1070,6 @@ class EmailCollector extends CommonObject
 							}
 						}
 					}
-
 				}
 
 				if (empty($thirdpartyid))		// Try to find thirdparty using email
@@ -1246,7 +1255,6 @@ class EmailCollector extends CommonObject
 					else
 					{
 						dol_syslog("EmailCollector::doCollectOneCollector message ".$imapemail." to ".$connectstringtarget." was set to read", LOG_DEBUG);
-
 					}
 				}
 				else