lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-28 11:17:04 +01:00
commit 4570da5463
4 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/adherents/vcard.php
View File

@ -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);
$tmpobject = explode("@", trim($object->email));
$tmpcompany = explode("@", trim($company->email));
// support by Microsoft Outlook (2019 and possible earlier)
$v->setEmail($object->email, 'INTERNET');
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"

25
htdocs/contact/vcard.php
View File

@ -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);
$tmpcontact = explode("@", trim($contact->email));
$tmpcompany = explode("@", trim($company->email));
// support by Microsoft Outlook (2019 and possible earlier)
$v->setEmail($contact->email, 'INTERNET');
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"

5
htdocs/core/class/lessc.class.php
View File

@ -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;

2
htdocs/hrm/class/skill.class.php
View File

@ -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);
}
/**