Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur (aka Eldy) 2025-01-05 15:39:44 +01:00
commit 1aa703a631
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/hrm/class/evaluation.class.php
View File

@ -210,7 +210,7 @@ class Evaluation extends CommonObject
*/
public function __construct(DoliDB $db)
{
global $conf, $langs, $user;
global $langs, $user;
$this->db = $db;
@ -225,7 +225,7 @@ class Evaluation extends CommonObject
}
if (!$user->hasRight('hrm', 'evaluation', 'readall')) {
$this->fields['fk_user']['type'] .= ':rowid IN('.$this->db->sanitize(implode(", ", $user->getAllChildIds(1))).')';
$this->fields['fk_user']['type'] .= ':t.rowid:IN:'.$this->db->sanitize(implode(",", $user->getAllChildIds(1)));
}
$this->date_eval = dol_now();

8
htdocs/langs/en_US/hrm.lang
View File

@ -46,11 +46,11 @@ NewEval=New competency assessment
ValidateEvaluation=Validate competency assessment
ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
EvaluationCard=Competency assessment
RequiredRank=Required rank for the job profile
RequiredRankShort=Required rank
RequiredRank=Required level for the job profile
RequiredRankShort=Required level
PositionsWithThisProfile=Positions with this job profiles
EmployeeRank=Employee rank for this skill
EmployeeRankShort=Employee rank
EmployeeRank=Employee level for this skill
EmployeeRankShort=Employee level
EmployeePosition=Employee position
EmployeePositions=Employee positions
EmployeesInThisPosition=Employees in this position