diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php index 6bf9412b5bc..41c5813c8c6 100644 --- a/htdocs/hrm/class/evaluation.class.php +++ b/htdocs/hrm/class/evaluation.class.php @@ -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(); diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang index 5c8287b4c0b..55669d08b4f 100644 --- a/htdocs/langs/en_US/hrm.lang +++ b/htdocs/langs/en_US/hrm.lang @@ -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 %s? 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