This commit is contained in:
Alexandre SPANGARO 2022-08-29 10:56:06 +02:00
parent 4184e416aa
commit e2fdc64666
3 changed files with 10 additions and 10 deletions

View File

@ -35,14 +35,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
if (isModEnabled('projet')) {
if (isModEnabled('project')) {
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
}
// Load translation files required by the page
$langs->loadLangs(array("compta", "banks", "bills", "users", "salaries", "hrm", "trips"));
if (isModEnabled('projet')) {
if (isModEnabled('project')) {
$langs->load("projects");
}
@ -441,7 +441,7 @@ if ($action == "update_extras" && !empty($user->rights->salaries->read)) {
$form = new Form($db);
$formfile = new FormFile($db);
if (isModEnabled('projet')) $formproject = new FormProjets($db);
if (isModEnabled('project')) $formproject = new FormProjets($db);
$title = $langs->trans('Salary')." - ".$langs->trans('Card');
$help_url = "";
@ -559,7 +559,7 @@ if ($action == 'create') {
print '</tr>';
// Project
if (isModEnabled('projet')) {
if (isModEnabled('project')) {
$formproject = new FormProjets($db);
print '<tr><td>'.$langs->trans("Project").'</td><td>';
@ -794,7 +794,7 @@ if ($id) {
}
// Project
if (isModEnabled('projet')) {
if (isModEnabled('project')) {
$morehtmlref .= '<br>'.$langs->trans('Project').' ';
if ($user->rights->salaries->write) {
if ($action != 'classify') {

View File

@ -132,7 +132,7 @@ if ($action == 'setlabel' && $user->rights->salaries->write) {
*/
$form = new Form($db);
if (isModEnabled('projet')) $formproject = new FormProjets($db);
if (isModEnabled('project')) $formproject = new FormProjets($db);
$title = $langs->trans('Salary')." - ".$langs->trans('Documents');
$help_url = "";
@ -176,7 +176,7 @@ if ($object->id) {
$morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
// Project
if (isModEnabled('projet')) {
if (isModEnabled('project')) {
$morehtmlref .= '<br>'.$langs->trans('Project').' ';
if ($user->rights->salaries->write) {
if ($action != 'classify') {

View File

@ -28,7 +28,7 @@ require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
if (isModEnabled('projet')) {
if (isModEnabled('project')) {
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
}
@ -100,7 +100,7 @@ if ($action == 'setlabel' && $user->rights->salaries->write) {
* View
*/
if (isModEnabled('projet')) $formproject = new FormProjets($db);
if (isModEnabled('project')) $formproject = new FormProjets($db);
$title = $langs->trans('Salary')." - ".$langs->trans('Info');
$help_url = "";
@ -139,7 +139,7 @@ if ($action != 'editlabel') {
$morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
// Project
if (isModEnabled('projet')) {
if (isModEnabled('project')) {
$morehtmlref .= '<br>'.$langs->trans('Project').' ';
if ($user->rights->salaries->write) {
if ($action != 'classify') {