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

Merge pull request #21796 from cfoellmann/PR/recruitment-renaming

Browse Source 
Recruitment improvements
This commit is contained in:
Laurent Destailleur 2022-08-26 19:18:26 +02:00 committed by GitHub
commit 6f9f7fa233
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 46 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/modRecruitment.class.php
View File

@ -261,7 +261,7 @@ class modRecruitment extends DolibarrModules
'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
'mainmenu'=>'hrm',
'leftmenu'=>'recruitmentjobposition',
'url'=>'/recruitment/recruitmentindex.php',
'url'=>'/recruitment/index.php',
'langs'=>'recruitment', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
'position'=>1000 + $r,
'enabled'=>'$conf->recruitment->enabled', // Define condition to show or hide menu entry. Use '$conf->recruitment->enabled' if entry must be visible if module is enabled.

5
htdocs/core/tpl/card_presend.tpl.php
View File

@ -146,6 +146,11 @@ if ($action == 'presend') {
$formmail->fromname = (!empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME) ? $conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME : '');
$formmail->fromtype = 'special';
}
if ($object->element === 'recruitmentcandidature' ) {
$formmail->frommail = (!empty($conf->global->RECRUITMENT_EMAIL_SENDER) ? $conf->global->RECRUITMENT_EMAIL_SENDER : $recruitermail);
$formmail->fromname = (!empty($conf->global->RECRUITMENT_EMAIL_SENDER_NAME) ? $conf->global->RECRUITMENT_EMAIL_SENDER_NAME : (!empty($recruitername) ? $recruitername : ''));
$formmail->fromtype = 'special';
}
$formmail->trackid = empty($trackid) ? '' : $trackid;
$formmail->inreplyto = empty($inreplyto) ? '' : $inreplyto;

5
htdocs/langs/en_US/recruitment.lang
View File

@ -57,8 +57,9 @@ EmailRecruiter=Email recruiter
ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
NewCandidature=New application
ListOfCandidatures=List of applications
RequestedRemuneration=Requested remuneration
ProposedRemuneration=Proposed remuneration
Remuneration=Salary
RequestedRemuneration=Requested salary
ProposedRemuneration=Proposed salary
ContractProposed=Contract proposed
ContractSigned=Contract signed
ContractRefused=Contract refused

2
htdocs/recruitment/class/recruitmentcandidature.class.php
View File

@ -50,7 +50,7 @@ class RecruitmentCandidature extends CommonObject
* @var int Does this object support multicompany module ?
* 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
*/
public $ismultientitymanaged = 0;
public $ismultientitymanaged = 1;
/**
* @var int Does object support extrafields ? 0=No, 1=Yes

2
htdocs/recruitment/recruitmentindex.php → htdocs/recruitment/index.php
View File

@ -19,7 +19,7 @@
*/
/**
* \file recruitment/recruitmentindex.php
* \file recruitment/index.php
* \ingroup recruitment
* \brief Home page of recruitment top menu
*/

12
htdocs/recruitment/lib/recruitment_recruitmentcandidature.lib.php
View File

@ -41,12 +41,12 @@ function recruitmentCandidaturePrepareHead($object)
$head[$h][2] = 'card';
$h++;
if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
$head[$h][0] = dol_buildpath("/recruitment/recruitmentrating_card.php", 1).'?id='.$object->id;
$head[$h][1] = $langs->trans("Rating");
$head[$h][2] = 'rating';
$h++;
}
// if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
// $head[$h][0] = dol_buildpath("/recruitment/recruitmentrating_card.php", 1).'?id='.$object->id;
// $head[$h][1] = $langs->trans("Rating");
// $head[$h][2] = 'rating';
// $h++;
// }
if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {
$nbNote = 0;

2
htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
View File

@ -42,7 +42,7 @@ function recruitmentjobpositionPrepareHead($object)
$h++;
$head[$h][0] = dol_buildpath("/recruitment/recruitmentcandidature_list.php", 1).'?id='.$object->id;
$head[$h][1] = $langs->trans("Candidatures");
$head[$h][1] = $langs->trans("RecruitmentCandidatures");
$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature WHERE fk_recruitmentjobposition = ".((int) $object->id);
$resql = $db->query($sql);
if ($resql) {

2
htdocs/recruitment/recruitmentcandidature_agenda.php
View File

@ -124,7 +124,7 @@ if (empty($reshook)) {
$form = new Form($db);
if ($object->id > 0) {
$title = $langs->trans("Agenda");
$title = $object->ref." - ".$langs->trans('Agenda');
//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
$help_url = 'Module_Agenda_En';
llxHeader('', $title, $help_url);

21
htdocs/recruitment/recruitmentcandidature_card.php
View File

@ -257,10 +257,15 @@ $form = new Form($db);
$formfile = new FormFile($db);
$formproject = new FormProjets($db);
$title = $langs->trans("RecruitmentCandidature");
$help_url = '';
llxHeader('', $title, $help_url);
if ($action == 'create') {
$title = $langs->trans('NewCandidature');
$help_url = '';
} else {
$title = $object->ref." - ".$langs->trans('Card');
$help_url = '';
}
llxHeader('', $title, $help_url);
// Part to create
if ($action == 'create') {
@ -651,6 +656,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$trackid = 'recruitmentcandidature'.$object->id;
$inreplyto = $object->email_msgid;
$job = new RecruitmentJobPosition($db);
$job->fetch($object->fk_recruitmentjobposition);
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
$recruiter = new User($db);
$recruiter->fetch($job->fk_user_recruiter);
$recruitername = $recruiter->getFullName('');
$recruitermail = (!empty($job->email_recruiter) ? $job->email_recruiter : $recruiter->email);
include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
}

3
htdocs/recruitment/recruitmentcandidature_document.php
View File

@ -97,9 +97,8 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
$form = new Form($db);
$title = $langs->trans("RecruitmentJobPosition").' - '.$langs->trans("Files");
$title = $object->ref." - ".$langs->trans('Files');
$help_url = '';
//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('', $title, $help_url);
if ($object->id) {

2
htdocs/recruitment/recruitmentcandidature_list.php
View File

@ -556,7 +556,7 @@ $newcardbutton = '';
$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
$newcardbutton .= dolGetButtonTitleSeparator();
$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/recruitment/recruitmentcandidature_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.((int) $id)), '', $permissiontoadd);
$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/recruitment/recruitmentcandidature_card.php', 1).'?action=create&fk_recruitmentjobposition='.$id, '', $permissiontoadd);
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);

4
htdocs/recruitment/recruitmentcandidature_note.php
View File

@ -80,9 +80,9 @@ if (empty($reshook)) {
$form = new Form($db);
//$help_url='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
$title = $object->ref." - ".$langs->trans('Notes');
$help_url = '';
llxHeader('', $langs->trans('RecruitmentCandidature'), $help_url);
llxHeader('', $title, $help_url);
if ($id > 0 || !empty($ref)) {
$object->fetch_thirdparty();

2
htdocs/recruitment/recruitmentjobposition_agenda.php
View File

@ -124,7 +124,7 @@ if (empty($reshook)) {
$form = new Form($db);
if ($object->id > 0) {
$title = $langs->trans("Agenda");
$title = $object->ref." - ".$langs->trans('Agenda');
//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
$help_url = '';
llxHeader('', $title, $help_url);

2
htdocs/recruitment/recruitmentjobposition_card.php
View File

@ -177,7 +177,7 @@ $form = new Form($db);
$formfile = new FormFile($db);
$formproject = new FormProjets($db);
$title = $langs->trans("PositionToBeFilled");
$title = $object->ref." - ".$langs->trans('Card');
$help_url = '';
llxHeader('', $title, $help_url);

2
htdocs/recruitment/recruitmentjobposition_document.php
View File

@ -97,7 +97,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
$form = new Form($db);
$title = $langs->trans("RecruitmentJobPosition").' - '.$langs->trans("Files");
$title = $object->ref." - ".$langs->trans('Files');
$help_url = '';
//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('', $title, $help_url);

4
htdocs/recruitment/recruitmentjobposition_note.php
View File

@ -85,9 +85,9 @@ if (empty($reshook)) {
$form = new Form($db);
//$help_url='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
$title = $object->ref." - ".$langs->trans('Notes');
$help_url = '';
llxHeader('', $langs->trans('RecruitmentJobPosition'), $help_url);
llxHeader('', $title, $help_url);
if ($id > 0 || !empty($ref)) {
$object->fetch_thirdparty();