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

FIX : hrm_position > hrm_job_user + seEventMessage on evaluation close

Browse Source
This commit is contained in:
Gauthier PC portable 024 2021-10-01 08:06:45 +02:00
parent 1ff39d79e5
commit d01460d606
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,7 +147,7 @@ class Job extends CommonObject
// /** // /**
// * @var array List of child tables. To test if we can delete object. // * @var array List of child tables. To test if we can delete object.
// */ // */
protected $childtables = array('hrm_evaluation', 'hrm_position'); protected $childtables = array('hrm_evaluation', 'hrm_job_user');
// /** // /**
// * @var array List of child tables. To know object to delete on cascade. // * @var array List of child tables. To know object to delete on cascade.

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

@ -48,7 +48,7 @@ class Position extends CommonObject
/** /**
* @var string Name of table without prefix where object is stored. This is also the key used for extrafields management. * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
*/ */
public $table_element = 'hrm_position'; public $table_element = 'hrm_job_user';
/** /**
* @var int Does this object support multicompany module ? * @var int Does this object support multicompany module ?
@ -144,7 +144,7 @@ class Position extends CommonObject
// /** // /**
// * @var string Name of subtable line // * @var string Name of subtable line
// */ // */
// public $table_element_line = 'hrm_positionline'; // public $table_element_line = 'hrm_job_userline';
// /** // /**
// * @var string Field with ID of parent key if this object has a parent // * @var string Field with ID of parent key if this object has a parent
@ -166,7 +166,7 @@ class Position extends CommonObject
// * If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will // * If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
// * call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object // * call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
// */ // */
// protected $childtablesoncascade = array('hrm_positiondet'); // protected $childtablesoncascade = array('hrm_job_userdet');
// /** // /**
// * @var PositionLine[] Array of subtable lines // * @var PositionLine[] Array of subtable lines

5
htdocs/hrm/evaluation_card.php
View File

@ -255,7 +255,10 @@ if (empty($reshook)) {
} }
} }
} }
$object->setStatut(Evaluation::STATUS_CLOSED); if(empty($errors)) {
$object->setStatut(Evaluation::STATUS_CLOSED);
setEventMessage('EmployeeSkillsUpdated');
}
} }
if ($action == 'reopen' ) { if ($action == 'reopen' ) {

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

@ -41,6 +41,7 @@ SkillHasNoLines=This skill has no lines
skill=Skill skill=Skill
Skills=Skills Skills=Skills
SkillCard=Skill card SkillCard=Skill card
EmployeeSkillsUpdated=Employee skills have been updated (see "Skills" tab of employee card)
Eval=Evaluation Eval=Evaluation
Evals=Evaluations Evals=Evaluations
NewEval=New evaluation NewEval=New evaluation

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

@ -52,6 +52,7 @@ SkillHasNoLines=Cette compétence n'a pas de notes
skill=Compétence skill=Compétence
Skills=Compétences Skills=Compétences
SkillCard=Fiche compétence SkillCard=Fiche compétence
EmployeeSkillsUpdated=Les compétences du salarié ont été mises à jour (voir l'onglet "compétences" de la fiche du salarié)
Eval=Evaluation Eval=Evaluation
Evals=Evaluations Evals=Evaluations
NewEval=Nouvelle evaluation NewEval=Nouvelle evaluation