';
print '
'; // ancre
- $includedocgeneration = 0;
+ $includedocgeneration = 1;
// Documents
- if ($includedocgeneration) {
+ if ($user->rights->hrm->evaluation->read) {
$objref = dol_sanitizeFileName($object->ref);
$relativepath = $objref.'/'.$objref.'.pdf';
$filedir = $conf->hrm->dir_output.'/'.$object->element.'/'.$objref;
$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
$genallowed = $user->rights->hrm->evaluation->read; // If you can read, you can build the PDF to read content
$delallowed = $user->rights->hrm->evaluation->write; // If you can create/edit, you can remove a file on card
- print $formfile->showdocuments('hrm:Evaluation', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+ print $formfile->showdocuments('hrm:Evaluation', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang, '', $object, 0, 'remove_file_comfirm');
}
// Show links to link elements
@@ -700,9 +716,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
//Select mail models is same action as presend
- if (GETPOST('modelselected')) {
- $action = 'presend';
- }
+ /*if (GETPOST('modelselected')) {
+ // $action = 'presend';
+ }*/ // To delete.
// Presend form
$modelmail = 'evaluation';
diff --git a/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.sql
index 7327d1403dc..7fce5a1bd6b 100644
--- a/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.sql
+++ b/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.sql
@@ -24,6 +24,8 @@ CREATE TABLE llx_hrm_evaluation(
description text,
note_public text,
note_private text,
+ model_pdf varchar(255),
+ last_main_doc varchar(255),
date_creation datetime NOT NULL,
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_user_creat integer NOT NULL,
diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang
index 5cdbf97d868..3dc2c041c06 100644
--- a/htdocs/langs/en_US/hrm.lang
+++ b/htdocs/langs/en_US/hrm.lang
@@ -48,8 +48,10 @@ ValidateEvaluation=Validate evaluation
ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with reference
%s?
EvaluationCard=Evaluation card
RequiredRank=Required rank for the job profile
+RequiredRankShort=Required rank
PositionsWithThisProfile=Positions with this job profiles
EmployeeRank=Employee rank for this skill
+EmployeeRankShort=Employee rank
EmployeePosition=Employee position
EmployeePositions=Employee positions
EmployeesInThisPosition=Employees in this position
diff --git a/htdocs/langs/fr_FR/hrm.lang b/htdocs/langs/fr_FR/hrm.lang
index accfef665e1..25802673610 100644
--- a/htdocs/langs/fr_FR/hrm.lang
+++ b/htdocs/langs/fr_FR/hrm.lang
@@ -48,8 +48,10 @@ ValidateEvaluation=Valider l'évaluation
ConfirmValidateEvaluation=Êtes-vous sûr de vouloir valider cette évaluation sous la référence
%s ?
EvaluationCard=Fiche évaluation
RequiredRank=Rang requis pour le profil de poste
+RequiredRankShort=Niveau requis
PositionsWithThisProfile=Postes avec ces profils de poste
EmployeeRank=Niveau de l'employée pour cette compétence
+EmployeeRankShort=Niveau employée
EmployeePosition=Poste d'employé
EmployeePositions=Postes d'employés
EmployeesInThisPosition=Employés occupant ce poste