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

Merge pull request #12049 from frederic34/holidayz

Browse Source 
lang file for holidays is holiday
This commit is contained in:
Laurent Destailleur 2019-10-07 10:21:36 +02:00 committed by GitHub
commit c3ae87816f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/modules/holiday/modules_holiday.php
View File

@ -96,7 +96,7 @@ class ModelNumRefHolidays
public function info() public function info()
{ {
global $langs; global $langs;
$langs->load("holidays"); $langs->load("holiday");
return $langs->trans("NoDescription"); return $langs->trans("NoDescription");
} }
@ -108,7 +108,7 @@ class ModelNumRefHolidays
public function getExample() public function getExample()
{ {
global $langs; global $langs;
$langs->load("holidays"); $langs->load("holiday");
return $langs->trans("NoExample"); return $langs->trans("NoExample");
} }

4
htdocs/holiday/document.php
View File

@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/holiday.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array('other', 'holidays', 'companies')); $langs->loadLangs(array('other', 'holiday', 'companies'));
$id = GETPOST('id', 'int'); $id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha'); $ref = GETPOST('ref', 'alpha');
@ -48,8 +48,6 @@ $confirm = GETPOST('confirm', 'alpha');
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'holiday', $id, 'holiday'); $result = restrictedArea($user, 'holiday', $id, 'holiday');
$langs->load("holiday");
// Get parameters // Get parameters
$sortfield = GETPOST('sortfield', 'alpha'); $sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha'); $sortorder = GETPOST('sortorder', 'alpha');

2
htdocs/holiday/list.php
View File

@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array('users', 'holidays', 'hrm')); $langs->loadLangs(array('users', 'holiday', 'hrm'));
// Protection if external user // Protection if external user
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();

2
htdocs/index.php
View File

@ -301,7 +301,7 @@ if (empty($user->societe_id) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTAT
"supplier_proposal", "supplier_proposal",
"projects", "projects",
"trips", "trips",
"holidays", "holiday",
"donations" "donations"
); );