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

Close #24625

Browse Source
This commit is contained in:
Laurent Destailleur 2023-05-01 14:47:21 +02:00
parent 45688e287a
commit a4563c7ad4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,13 +76,16 @@ trait CommonPeople
$thirdpartyid = 0; $thirdpartyid = 0;
$elementforaltlanguage = $this->element; $elementforaltlanguage = $this->element;
if ($this->element == 'societe') { if ($this->element == 'societe') {
/** @var Societe $this */
$thirdpartyid = $this->id; $thirdpartyid = $this->id;
} }
if ($this->element == 'contact') { if ($this->element == 'contact') {
/** @var Contact $this */
$contactid = $this->id; $contactid = $this->id;
$thirdpartyid = empty($this->fk_soc) ? 0 : $this->fk_soc; $thirdpartyid = empty($this->fk_soc) ? 0 : $this->fk_soc;
} }
if ($this->element == 'user') { if ($this->element == 'user') {
/** @var User $this */
$contactid = $this->contact_id; $contactid = $this->contact_id;
$thirdpartyid = empty($object->fk_soc) ? 0 : $object->fk_soc; $thirdpartyid = empty($object->fk_soc) ? 0 : $object->fk_soc;
} }
@ -90,7 +93,7 @@ trait CommonPeople
$out = ''; $out = '';
$outdone = 0; $outdone = 0;
$coords = $this->getFullAddress(1, ', ', (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) ? $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT : 0)); $coords = $this->getFullAddress(1, ', ', getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT'));
if ($coords) { if ($coords) {
if (!empty($conf->use_javascript_ajax)) { if (!empty($conf->use_javascript_ajax)) {
// Add picto with tooltip on map // Add picto with tooltip on map