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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2022-02-04 15:32:50 +01:00
commit e85051aaaa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ class Position extends CommonObject
/** /**
* @var int Does object support extrafields ? 0=No, 1=Yes * @var int Does object support extrafields ? 0=No, 1=Yes
*/ */
public $isextrafieldmanaged = 1; public $isextrafieldmanaged = 0;
/** /**
* @var string String with name of icon for position. Must be the part after the 'object_' into object_position.png * @var string String with name of icon for position. Must be the part after the 'object_' into object_position.png

2
htdocs/hrm/position_card.php
View File

@ -276,7 +276,7 @@ function DisplayPositionCard(&$object)
$morehtmlref = '<div class="refidno">'; $morehtmlref = '<div class="refidno">';
$u_position = new User(($db)); $u_position = new User(($db));
$u_position->fetch($object->fk_user); $u_position->fetch($object->fk_user);
$morehtmlref .= $langs->trans('Employee').' : '.$u_position->getNomUrl(1); $morehtmlref .= $langs->trans('Employee').' : '.($u_position->id > 0 ? $u_position->getNomUrl(1) : '');
$job = new Job($db); $job = new Job($db);
$job->fetch($object->fk_job); $job->fetch($object->fk_job);
$morehtmlref .= '<br>'.$langs->trans('Job').' : '.$job->getNomUrl(1); $morehtmlref .= '<br>'.$langs->trans('Job').' : '.$job->getNomUrl(1);