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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2022-11-26 00:22:57 +01:00
commit b84a7def1f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/fr_FR/main.lang
View File

@ -1207,3 +1207,4 @@ CreatedByPublicPortal=Créé à partir du portail public
UserAgent=User Agent UserAgent=User Agent
InternalUser=Utilisateur interne InternalUser=Utilisateur interne
ExternalUser=Utilisateur externe ExternalUser=Utilisateur externe
WarningUserDifferentContactSocid=Contact non relié à un tiers. Le tiers ne sera pas enregistré.

3
htdocs/user/card.php
View File

@ -537,6 +537,9 @@ if (empty($reshook)) {
$sql .= " SET fk_socpeople=".((int) $contactid); $sql .= " SET fk_socpeople=".((int) $contactid);
if (!empty($contact->socid)) { if (!empty($contact->socid)) {
$sql .= ", fk_soc=".((int) $contact->socid); $sql .= ", fk_soc=".((int) $contact->socid);
} elseif ($socid > 0) {
$sql .= ", fk_soc = null";
setEventMessages($langs->trans("WarningUserDifferentContactSocid"), '', 'warnings'); // Add message if post socid != $contact->socid
} }
$sql .= " WHERE rowid = ".((int) $object->id); $sql .= " WHERE rowid = ".((int) $object->id);
} elseif ($socid > 0) { } elseif ($socid > 0) {