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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2022-09-13 15:39:29 +02:00
commit 3869354a17
11 changed files with 80 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/hrm/admin/evaluation_extrafields.php
View File

@ -21,9 +21,9 @@
*/ */
/** /**
* \file admin/evaluation_extrafields.php * \file htdocs/hrm/admin/evaluation_extrafields.php
* \ingroup hrm * \ingroup hrm
* \brief Page to setup extra fields of hrm * \brief Page to setup extra fields of hrm evaluation
*/ */
// Load Dolibarr environment // Load Dolibarr environment
@ -44,10 +44,12 @@ foreach ($tmptype2label as $key => $val) {
$type2label[$key] = $langs->transnoentitiesnoconv($val); $type2label[$key] = $langs->transnoentitiesnoconv($val);
} }
// Get Parameters
$action = GETPOST('action', 'aZ09'); $action = GETPOST('action', 'aZ09');
$attrname = GETPOST('attrname', 'alpha'); $attrname = GETPOST('attrname', 'alpha');
$elementtype = 'hrm_evaluation'; //Must be the $table_element of the class that manage extrafield $elementtype = 'hrm_evaluation'; //Must be the $table_element of the class that manage extrafield
// Security Check
if (!$user->admin) { if (!$user->admin) {
accessforbidden(); accessforbidden();
} }

6
htdocs/hrm/admin/job_extrafields.php
View File

@ -21,9 +21,9 @@
*/ */
/** /**
* \file admin/job_extrafields.php * \file htdocs/hrm/admin/job_extrafields.php
* \ingroup hrm * \ingroup hrm
* \brief Page to setup extra fields of hrm * \brief Page to setup extra fields of hrm jobs
*/ */
// Load Dolibarr environment // Load Dolibarr environment
@ -44,10 +44,12 @@ foreach ($tmptype2label as $key => $val) {
$type2label[$key] = $langs->transnoentitiesnoconv($val); $type2label[$key] = $langs->transnoentitiesnoconv($val);
} }
// Get Parameters
$action = GETPOST('action', 'aZ09'); $action = GETPOST('action', 'aZ09');
$attrname = GETPOST('attrname', 'alpha'); $attrname = GETPOST('attrname', 'alpha');
$elementtype = 'hrm_job'; //Must be the $table_element of the class that manage extrafield $elementtype = 'hrm_job'; //Must be the $table_element of the class that manage extrafield
// Security Check
if (!$user->admin) { if (!$user->admin) {
accessforbidden(); accessforbidden();
} }

5
htdocs/hrm/admin/skill_extrafields.php
View File

@ -21,9 +21,9 @@
*/ */
/** /**
* \file admin/skill_extrafields.php * \file htdocs/hrm/admin/skill_extrafields.php
* \ingroup hrm * \ingroup hrm
* \brief Page to setup extra fields of hrm * \brief Page to setup extra fields of hrm skills
*/ */
// Load Dolibarr environment // Load Dolibarr environment
@ -48,6 +48,7 @@ $action = GETPOST('action', 'aZ09');
$attrname = GETPOST('attrname', 'alpha'); $attrname = GETPOST('attrname', 'alpha');
$elementtype = 'hrm_skill'; //Must be the $table_element of the class that manage extrafield $elementtype = 'hrm_skill'; //Must be the $table_element of the class that manage extrafield
// Security check
if (!$user->admin) { if (!$user->admin) {
accessforbidden(); accessforbidden();
} }

12
htdocs/hrm/skill_agenda.php
View File

@ -20,7 +20,7 @@
*/ */
/** /**
* \file skill_agenda.php * \file htdocs/hrm/skill_agenda.php
* \ingroup hrm * \ingroup hrm
* \brief Tab of events on skill * \brief Tab of events on skill
*/ */
@ -29,15 +29,15 @@
// Load Dolibarr environment // Load Dolibarr environment
require '../main.inc.php'; require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php'; require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php'; require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("hrm", "other")); $langs->loadLangs(array('hrm', 'other'));
// Get parameters // Get parameters
$id = GETPOST('id', 'int'); $id = GETPOST('id', 'int');
@ -56,6 +56,7 @@ if (GETPOST('actioncode', 'array')) {
} }
$search_agenda_label = GETPOST('search_agenda_label'); $search_agenda_label = GETPOST('search_agenda_label');
// Get Parameters for Pagination
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'aZ09comma'); $sortfield = GETPOST('sortfield', 'aZ09comma');
$sortorder = GETPOST('sortorder', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma');
@ -87,6 +88,7 @@ if ($id > 0 || !empty($ref)) {
$upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id; $upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
} }
// Permissions
$permissiontoread = $user->rights->hrm->all->read; $permissiontoread = $user->rights->hrm->all->read;
$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php $permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php

8
htdocs/hrm/skill_card.php
View File

@ -20,9 +20,9 @@
*/ */
/** /**
* \file skill_card.php * \file htdocs/hrm/skill_card.php
* \ingroup hrm * \ingroup hrm
* \brief Page to create/edit/view skill * \brief Page to create/edit/view skills
*/ */
@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("hrm", "other", 'products')); $langs->loadLangs(array('hrm', 'other', 'products')); // why products?
// Get parameters // Get parameters
$id = GETPOST('id', 'int'); $id = GETPOST('id', 'int');
@ -77,7 +77,7 @@ if (empty($action) && empty($id) && empty($ref)) {
// Load object // Load object
include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
// Permissions
$permissiontoread = $user->rights->hrm->all->read; $permissiontoread = $user->rights->hrm->all->read;
$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php $permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
$permissiontodelete = $user->rights->hrm->all->delete; $permissiontodelete = $user->rights->hrm->all->delete;

18
htdocs/hrm/skill_contact.php
View File

@ -20,7 +20,7 @@
*/ */
/** /**
* \file skill_contact.php * \file htdocs/hrm/skill_contact.php
* \ingroup hrm * \ingroup hrm
* \brief Tab for contacts linked to Skill * \brief Tab for contacts linked to Skill
*/ */
@ -28,14 +28,17 @@
// Load Dolibarr environment // Load Dolibarr environment
require '../main.inc.php'; require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php'; require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php'; require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
// Load translation files required by the page
$langs->loadLangs(array("hrm", "companies", "other", "mails"));
// Load translation files required by the page
$langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
// Get Parameters
$id = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility $id = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
$ref = GETPOST('ref', 'alpha'); $ref = GETPOST('ref', 'alpha');
$lineid = GETPOST('lineid', 'int'); $lineid = GETPOST('lineid', 'int');
@ -53,6 +56,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
// Load object // Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
// Permissions
$permission = $user->rights->hrm->skill->write; $permission = $user->rights->hrm->skill->write;
// Security check (enable the most restrictive one) // Security check (enable the most restrictive one)
@ -65,9 +69,11 @@ $permission = $user->rights->hrm->skill->write;
/* /*
* Add a new contact * Action
*/ */
// Add a new contact
if ($action == 'addcontact' && $permission) { if ($action == 'addcontact' && $permission) {
$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int')); $contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));

9
htdocs/hrm/skill_document.php
View File

@ -20,7 +20,7 @@
*/ */
/** /**
* \file skill_document.php * \file htdocs/hrm/skill_document.php
* \ingroup hrm * \ingroup hrm
* \brief Tab for documents linked to skill * \brief Tab for documents linked to skill
*/ */
@ -37,15 +37,15 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php'; require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("hrm", "companies", "other", "mails")); $langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
// Get Parameters
$action = GETPOST('action', 'aZ09'); $action = GETPOST('action', 'aZ09');
$confirm = GETPOST('confirm'); $confirm = GETPOST('confirm');
$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int')); $id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
$ref = GETPOST('ref', 'alpha'); $ref = GETPOST('ref', 'alpha');
// Get parameters // Get Parameters for Pagination
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'aZ09comma'); $sortfield = GETPOST('sortfield', 'aZ09comma');
$sortorder = GETPOST('sortorder', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma');
@ -79,6 +79,7 @@ if ($id > 0 || !empty($ref)) {
$upload_dir = $conf->hrm->multidir_output[$object->entity ? $object->entity : $conf->entity]."/skill/".get_exdir(0, 0, 0, 1, $object); $upload_dir = $conf->hrm->multidir_output[$object->entity ? $object->entity : $conf->entity]."/skill/".get_exdir(0, 0, 0, 1, $object);
} }
// Permissions
$permissiontoread = $user->rights->hrm->all->read; $permissiontoread = $user->rights->hrm->all->read;
$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php $permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php

10
htdocs/hrm/skill_list.php
View File

@ -20,7 +20,7 @@
*/ */
/** /**
* \file skill_list.php * \file htdocs/hrm/skill_list.php
* \ingroup hrm * \ingroup hrm
* \brief List page for skill * \brief List page for skill
*/ */
@ -40,8 +40,11 @@ require_once __DIR__.'/class/skill.class.php';
//dol_include_once('/othermodule/class/otherobject.class.php'); //dol_include_once('/othermodule/class/otherobject.class.php');
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("hrm", "other")); $langs->loadLangs(array('hrm', 'other'));
// Get Parameters
$id = GETPOST('id', 'int');
$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... $action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists) $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ? $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
@ -52,8 +55,6 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sk
$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
$id = GETPOST('id', 'int');
// Load variable for pagination // Load variable for pagination
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'aZ09comma'); $sortfield = GETPOST('sortfield', 'aZ09comma');
@ -130,6 +131,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
$object->fields = dol_sort_array($object->fields, 'position'); $object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position'); $arrayfields = dol_sort_array($arrayfields, 'position');
// Permissions
$permissiontoread = $user->rights->hrm->all->read; $permissiontoread = $user->rights->hrm->all->read;
$permissiontoadd = $user->rights->hrm->all->write; $permissiontoadd = $user->rights->hrm->all->write;
$permissiontodelete = $user->rights->hrm->all->delete; $permissiontodelete = $user->rights->hrm->all->delete;

5
htdocs/hrm/skill_note.php
View File

@ -20,7 +20,7 @@
*/ */
/** /**
* \file skill_note.php * \file htdocs/hrm/skill_note.php
* \ingroup hrm * \ingroup hrm
* \brief Tab for notes on skill * \brief Tab for notes on skill
*/ */
@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php'; require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("hrm", "companies")); $langs->loadLangs(array('hrm', 'companies'));
// Get parameters // Get parameters
$id = GETPOST('id', 'int'); $id = GETPOST('id', 'int');
@ -56,6 +56,7 @@ if ($id > 0 || !empty($ref)) {
$upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id; $upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
} }
// Permissions
$permissionnote = $user->rights->hrm->all->write; $permissionnote = $user->rights->hrm->all->write;
$permissiontoread = $user->rights->hrm->all->read; // Used by the include of actions_addupdatedelete.inc.php $permissiontoread = $user->rights->hrm->all->read; // Used by the include of actions_addupdatedelete.inc.php

7
htdocs/hrm/skill_tab.php
View File

@ -20,13 +20,12 @@
*/ */
/** /**
* \file skill_tab.php * \file htdocs/hrm/skill_tab.php
* \ingroup hrm * \ingroup hrm
* \brief Page to add/delete/view skill to jobs/users * \brief Page to add/delete/view skill to jobs/users
*/ */
// Load Dolibarr environment // Load Dolibarr environment
require '../main.inc.php'; require '../main.inc.php';
@ -39,8 +38,9 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.php';
require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php'; require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("hrm", "other")); $langs->loadLangs(array('hrm', 'other'));
// Get Parameters
$id = GETPOST('id', 'int'); $id = GETPOST('id', 'int');
$TSkillsToAdd = GETPOST('fk_skill', 'array'); $TSkillsToAdd = GETPOST('fk_skill', 'array');
$objecttype = GETPOST('objecttype', 'alpha'); $objecttype = GETPOST('objecttype', 'alpha');
@ -73,6 +73,7 @@ $hookmanager->initHooks(array('skilltab', 'globalcard')); // Note that conf->hoo
// Load object // Load object
include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
// Permissions
$permissiontoread = $user->rights->hrm->all->read; $permissiontoread = $user->rights->hrm->all->read;
$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php $permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php

4
htdocs/modulebuilder/template/admin/setup.php
View File

@ -97,7 +97,7 @@ if (!class_exists('FormSetup')) {
$formSetup = new FormSetup($db); $formSetup = new FormSetup($db);
// Hôte // HTTP HOST
$item = $formSetup->newItem('NO_PARAM_JUST_TEXT'); $item = $formSetup->newItem('NO_PARAM_JUST_TEXT');
$item->fieldOverride = (empty($_SERVER['HTTPS']) ? 'http://' : 'https://') . $_SERVER['HTTP_HOST']; $item->fieldOverride = (empty($_SERVER['HTTPS']) ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'];
$item->cssClass = 'minwidth500'; $item->cssClass = 'minwidth500';
@ -106,7 +106,7 @@ $item->cssClass = 'minwidth500';
$item = $formSetup->newItem('MYMODULE_MYPARAM1'); $item = $formSetup->newItem('MYMODULE_MYPARAM1');
$item->defaultFieldValue = 'default value'; $item->defaultFieldValue = 'default value';
// Setup conf MYMODULE_MYPARAM1 as a simple textarea input but we replace the text of field title // Setup conf MYMODULE_MYPARAM2 as a simple textarea input but we replace the text of field title
$item = $formSetup->newItem('MYMODULE_MYPARAM2'); $item = $formSetup->newItem('MYMODULE_MYPARAM2');
$item->nameText = $item->getNameText().' more html text '; $item->nameText = $item->getNameText().' more html text ';