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

htdocs/adherents/vcard.php

@@ -122,18 +122,23 @@ if ($company->id) {
 	} elseif (empty(trim($object->email))) {
 		// when adherent e-mail is empty, use only company e-mail
 		$v->setEmail($company->email);
-	} elseif (strtolower(end(explode("@", $object->email))) == strtolower(end(explode("@", $company->email)))) {
-		// when e-mail domain of adherent and company are the same, use adherent e-mail at first (and company e-mail at second)
-		$v->setEmail($object->email);
-
-		// support by Microsoft Outlook (2019 and possible earlier)
-		$v->setEmail($company->email, 'INTERNET');
 	} else {
-		// when e-mail of adherent and company complete different use company e-mail at first (and adherent e-mail at second)
-		$v->setEmail($company->email);
-
-		// support by Microsoft Outlook (2019 and possible earlier)
-		$v->setEmail($object->email, 'INTERNET');
+		$tmpobject = explode("@", trim($object->email));
+		$tmpcompany = explode("@", trim($company->email));
+
+		if (strtolower(end($tmpobject)) == strtolower(end($tmpcompany))) {
+			// when e-mail domain of adherent and company are the same, use adherent e-mail at first (and company e-mail at second)
+			$v->setEmail($object->email);
+
+			// support by Microsoft Outlook (2019 and possible earlier)
+			$v->setEmail($company->email, 'INTERNET');
+		} else {
+			// when e-mail of adherent and company complete different use company e-mail at first (and adherent e-mail at second)
+			$v->setEmail($company->email);
+
+			// support by Microsoft Outlook (2019 and possible earlier)
+			$v->setEmail($object->email, 'INTERNET');
+		}
 	}
 
 	// Si adherent lie a un tiers non de type "particulier"

htdocs/contact/vcard.php

@@ -92,18 +92,23 @@ if ($company->id) {
 	} elseif (empty(trim($contact->email))) {
 		// when contact e-mail is empty, use only company e-mail
 		$v->setEmail($company->email);
-	} elseif (strtolower(end(explode("@", $contact->email))) == strtolower(end(explode("@", $company->email)))) {
-		// when e-mail domain of contact and company are the same, use contact e-mail at first (and company e-mail at second)
-		$v->setEmail($contact->email);
-
-		// support by Microsoft Outlook (2019 and possible earlier)
-		$v->setEmail($company->email, 'INTERNET');
 	} else {
-		// when e-mail of contact and company complete different use company e-mail at first (and contact e-mail at second)
-		$v->setEmail($company->email);
-
-		// support by Microsoft Outlook (2019 and possible earlier)
-		$v->setEmail($contact->email, 'INTERNET');
+		$tmpcontact = explode("@", trim($contact->email));
+		$tmpcompany = explode("@", trim($company->email));
+
+		if (strtolower(end($tmpcontact)) == strtolower(end($tmpcompany))) {
+			// when e-mail domain of contact and company are the same, use contact e-mail at first (and company e-mail at second)
+			$v->setEmail($contact->email);
+
+			// support by Microsoft Outlook (2019 and possible earlier)
+			$v->setEmail($company->email, 'INTERNET');
+		} else {
+			// when e-mail of contact and company complete different use company e-mail at first (and contact e-mail at second)
+			$v->setEmail($company->email);
+
+			// support by Microsoft Outlook (2019 and possible earlier)
+			$v->setEmail($contact->email, 'INTERNET');
+		}
 	}
 
 	// Si contact lie a un tiers non de type "particulier"

htdocs/core/class/lessc.class.php

@@ -703,8 +703,8 @@ class Lessc
 					// has default value
 					$value = $a[2];
 				} else {
-					$this->throwError("Failed to assign arg ".$a[1]);
 					$value = null; // :(
+					$this->throwError("Failed to assign arg ".$a[1]);	// This end function by throwing an exception
 				}
 
 				$value = $this->reduce($value);
@@ -1118,8 +1118,7 @@ class Lessc
 				if (isset($items[0])) {
 					return $this->lib_e($items[0]);
 				}
-				$this->throwError("unrecognised input");
-				return null;
+				$this->throwError("unrecognised input");	// This end function by throwing an exception
 			case "string":
 				$arg[1] = "";
 				return $arg;

htdocs/hrm/class/skill.class.php

@@ -521,7 +521,7 @@ class Skill extends CommonObject
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
-		return $this->deleteCommon($user, $notrigger);;
+		return $this->deleteCommon($user, $notrigger);
 	}
 
 	/**