diff --git a/class/timesheet.class.php b/class/timesheet.class.php
index 310ad8c..3eede11 100644
--- a/class/timesheet.class.php
+++ b/class/timesheet.class.php
@@ -126,8 +126,8 @@ class TimeSheet extends SaturneObject
'fk_user_creat' => ['type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'picto' => 'user', 'enabled' => 1, 'position' => 160, 'notnull' => 1, 'visible' => 0, 'foreignkey' => 'user.rowid'],
'fk_user_modif' => ['type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'picto' => 'user', 'enabled' => 1, 'position' => 170, 'notnull' => 0, 'visible' => 0, 'foreignkey' => 'user.rowid'],
'fk_user_assign' => ['type' => 'integer:User:user/class/user.class.php:1:(t.employee:=:1:AND:t.fk_soc:IS:NULL:AND:t.statut:=:1)', 'label' => 'UserAssign', 'picto' => 'user', 'enabled' => 1, 'position' => 90, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'validate' => 1, 'foreignkey' => 'user.rowid'],
- 'fk_project' => ['type' => 'integer:Project:projet/class/project.class.php:1', 'label' => 'Project', 'picto' => 'company', 'enabled' => '$conf->project->enabled', 'position' => 80, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'validate' => 1, 'foreignkey' => 'projet.rowid'],
- 'fk_soc' => ['type' => 'integer:Societe:societe/class/societe.class.php:1', 'label' => 'ThirdParty', 'picto' => 'project', 'enabled' => '$conf->societe->enabled', 'position' => 120, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'validate' => 1, 'foreignkey' => 'societe.rowid'],
+ 'fk_project' => ['type' => 'integer:Project:projet/class/project.class.php:1', 'label' => 'Project', 'picto' => 'project', 'enabled' => '$conf->project->enabled', 'position' => 80, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'validate' => 1, 'foreignkey' => 'projet.rowid'],
+ 'fk_soc' => ['type' => 'integer:Societe:societe/class/societe.class.php:1', 'label' => 'ThirdParty', 'picto' => 'company', 'enabled' => '$conf->societe->enabled', 'position' => 120, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'validate' => 1, 'foreignkey' => 'societe.rowid'],
];
/**
@@ -470,9 +470,9 @@ class TimeSheetLine extends SaturneObject
public ?float $qty;
/**
- * @var int Rang.
+ * @var int|null Rang.
*/
- public int $rang;
+ public ?int $rang;
/**
* @var string Description.
diff --git a/core/modules/modDoliSIRH.class.php b/core/modules/modDoliSIRH.class.php
index 9aaaec1..60de8f5 100644
--- a/core/modules/modDoliSIRH.class.php
+++ b/core/modules/modDoliSIRH.class.php
@@ -161,7 +161,7 @@ public function __construct($db)
$this->hidden = false;
// List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...).
- $this->depends = ['modProjet', 'modBookmark', 'modHoliday', 'modFckeditor', 'modSalaries', 'modProduct', 'modService', 'modSociete', 'modECM', 'modCategorie', 'modSaturne', 'modCron'];
+ $this->depends = ['modProjet', 'modBookmark', 'modHoliday', 'modFckeditor', 'modSalaries', 'modProduct', 'modService', 'modSociete', 'modECM', 'modCategorie', 'modSaturne', 'modCron', 'modAgenda'];
$this->requiredby = []; // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...).
$this->conflictwith = []; // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...).
diff --git a/langs/fr_FR/dolisirh.lang b/langs/fr_FR/dolisirh.lang
index 38e5da1..5d10062 100644
--- a/langs/fr_FR/dolisirh.lang
+++ b/langs/fr_FR/dolisirh.lang
@@ -103,7 +103,7 @@ ErrorServiceTime = Le temps du(des) service(s) est nul
SetupDefaultDataNotCreated = Vous n'avez pas créé les données par défaut de DOLISIRH
HowToSetupDefaultData = Pour configurer les données par défaut de DOLISIRH, veuillez cliquer sur ce lien :
ConfigDefaultData = Configuration des données par défaut de DOLISIRH
-EnableDoliSIRH = Veuillez activer le module DoliSIRH pour accéder à cette page
+EnableDolisirh = Veuillez activer le module DoliSIRH pour accéder à cette page
CertificateUserResponsible = Responsable des certificats
CertificateUserResponsibleDescription = Cette option permet définir l'utilisateur responsable des certificats des différents participants
@@ -187,20 +187,8 @@ FacturerecsCategoriesArea = Espace des tags/catégories des factures récu
#
# SetEventMessage - Notice info
-TimeSheetMustBeDraft = La navette doit être en brouillon pour accéder à cette fonctionnalité
-TimeSheetMustBeDraftToValidate = La navette est déjà validée
-TimeSheetMustBeValidated = La navette doit être validée pour la rouvrir
-TimeSheetMustBeValidatedToSign = La navette doit être validée pour que les signataires puissent signer
AllSignatoriesMustHaveSignedAndDiffTimeSetAt0 = Tous les signataires doivent avoir signé et l'utilisateur assigné doit avoir consommée toutes ses heures de travail pour verrouiller la navette
-TimeSheetMustBeLockedToSendEmail = La navette doit être verrouillée pour envoyer un email
-TimeSheetMustBeLocked = La navette doit être verrouillée afin de permettre la génération
-TimeSheetMustBeLockedGenerated = La navette doit être verrouillée et le document généré afin de pouvoir l'archiver
-ValidateTimeSheet = Valider la navette
-ConfirmValidateTimeSheet = Êtes-vous sûr de vouloir valider la navette ? La validation permet aux signataires de signer le document mais empêche l'ajout de nouveaux signataires ou la modification de la navette.
N'oubliez pas de vérifier les quantités des produits ou services liés.
-ReOpenTimeSheet = Ouvrir à nouveau la navette
-ConfirmReOpenTimeSheet = Êtes-vous sûr de vouloir rouvrir la navette ? La réouverture permet la modification de la navette et l'ajout de nouveaux signataires mais toutes les signatures du document seront perdues.
-LockTimeSheet = Verrouiller la navette
-ConfirmLockTimeSheet = Êtes-vous sûr de vouloir verrouiller la navette ? Ce verrouillage permet de figer les données et la génération du document.
+ConfirmValidateTimeSheet =
N'oubliez pas de vérifier les quantités des produits ou services liés.
TimeSpentPerfect = Parfait, toutes tes heures de travail ont été consommées
TimeSpentMustBeCompleted = Attention, toutes tes heures de travail n'ont pas été consommées (%s - %s) Va sur ton pointage de temps du mois de %s pour arranger cela
TimeSpentDiff = Attention, tu as consommé trop d'heures de travail (%s - %s) Va sur ton pointage de temps du mois de %s pour arranger cela
@@ -218,6 +206,7 @@ GoToConfigProjectPage = Aller sur la page de configurati
# Data - Donnée
TimeSheet = Navette
Timesheet = Navette
+TheTimesheet = La navette
NewTimeSheet = Nouvelle navette
NewTimesheet = Nouvelle navette
ModifyTimeSheet = Modifier la navette
diff --git a/lib/dolisirh_timespent.lib.php b/lib/dolisirh_timespent.lib.php
index 3be84d5..9a1c2c6 100644
--- a/lib/dolisirh_timespent.lib.php
+++ b/lib/dolisirh_timespent.lib.php
@@ -104,6 +104,7 @@ function load_time_spent_on_tasks_within_range(int $timestampStart, int $timesta
$timeSpentOnTasks = ['days' => 0, 'hours' => 0, 'minutes' => 0, 'total' => 0];
$timeSpentList = $task->fetchAllTimeSpent($userTmp, 'AND (ptt.task_date >= "' . $db->idate($timestampStart) . '" AND ptt.task_date < "' . $db->idate($timestampEnd) . '")');
if (is_array($timeSpentList) && !empty($timeSpentList)) {
+ $workingDays = [];
foreach ($timeSpentList as $timeSpent) {
$hours = floor($timeSpent->timespent_duration / 3600);
$minutes = floor($timeSpent->timespent_duration / 60);
@@ -120,9 +121,10 @@ function load_time_spent_on_tasks_within_range(int $timestampStart, int $timesta
$timeSpentOnTasks[$timeSpent->fk_task]['task_label'] = $timeSpent->task_label;
$timeSpentOnTasks[$timeSpent->fk_task][dol_print_date($timeSpent->timespent_date, 'day')] += $timeSpent->timespent_duration;
+ $workingDays[$timeSpent->timespent_date] = 1;
}
}
- $timeSpentOnTasks['days'] = count($daysAvailable);
+ $timeSpentOnTasks['days'] = is_array($workingDays) && !empty($workingDays) ? count($workingDays) : 0;
}
return $timeSpentOnTasks;
diff --git a/view/timesheet/timesheet_card.php b/view/timesheet/timesheet_card.php
index eaba6e4..214f059 100644
--- a/view/timesheet/timesheet_card.php
+++ b/view/timesheet/timesheet_card.php
@@ -16,12 +16,12 @@
*/
/**
- * \file view/timesheet/timesheet_card.php
- * \ingroup dolisirh
- * \brief Page to create/edit/view timesheet
+ * \file view/timesheet/timesheet_card.php
+ * \ingroup dolisirh
+ * \brief Page to create/edit/view timesheet.
*/
-// Load DoliSIRH environment
+// Load DoliSIRH environment.
if (file_exists('../../dolisirh.main.inc.php')) {
require_once __DIR__ . '/../../dolisirh.main.inc.php';
} elseif (file_exists('../../../dolisirh.main.inc.php')) {
@@ -30,33 +30,34 @@
die('Include of dolisirh main fails');
}
-// Libraries
-require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT .'/holiday/class/holiday.class.php';
+// Load Dolibarr libraries.
+require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+// Load Saturne libraries.
+require_once __DIR__ . '/../../../saturne/class/saturnesignature.class.php';
+
+// load DoliSIRH libraries.
+require_once __DIR__ . '/../../lib/dolisirh_function.lib.php';
+require_once __DIR__ . '/../../lib/dolisirh_timespent.lib.php';
+require_once __DIR__ . '/../../lib/dolisirh_timesheet.lib.php';
require_once __DIR__ . '/../../class/timesheet.class.php';
require_once __DIR__ . '/../../class/dolisirhdocuments/timesheetdocument.class.php';
require_once __DIR__ . '/../../class/workinghours.class.php';
-require_once __DIR__ . '/../../lib/dolisirh_timesheet.lib.php';
-require_once __DIR__ . '/../../lib/dolisirh_function.lib.php';
-
-require_once __DIR__ . '/../../../saturne/class/saturnesignature.class.php';
-// Global variables definitions
-global $conf, $db, $hookmanager, $langs, $mysoc, $user;
+// Global variables definitions.
+global $conf, $db, $hookmanager, $langs, $moduleNameLowerCase, $mysoc, $user;
-// Load translation files required by the page
+// Load translation files required by the page.
saturne_load_langs();
-// Get parameters
+// Get parameters.
$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
$action = GETPOST('action', 'aZ09');
$confirm = GETPOST('confirm', 'alpha');
$cancel = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'timesheetcard'; // To manage different context of search
+$contextPage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'timesheetcard'; // To manage different context of search.
$backtopage = GETPOST('backtopage', 'alpha');
$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
$lineid = GETPOST('lineid', 'int');
@@ -64,349 +65,272 @@
$month = (GETPOST('month', 'int') ? GETPOST('month', 'int') : date('m'));
$day = (GETPOST('day', 'int') ? GETPOST('day', 'int') : date('d'));
-// Initialize technical objects
-$object = new TimeSheet($db);
-$objectline = new TimeSheetLine($db);
-$signatory = new SaturneSignature($db, 'dolisirh');
-$timesheetdocument = new TimeSheetDocument($db);
-$extrafields = new ExtraFields($db);
-$project = new Project($db);
-$product = new Product($db);
-$workinghours = new Workinghours($db);
-$holiday = new Holiday($db);
-$task = new Task($db);
-$usertmp = new User($db);
+// Initialize technical objects.
+$object = new TimeSheet($db);
+$objectLine = new TimeSheetLine($db);
+$signatory = new SaturneSignature($db, $moduleNameLowerCase, $object->element);
+$document = new TimeSheetDocument($db);
+$extraFields = new ExtraFields($db);
+$product = new Product($db);
+$workingHours = new Workinghours($db);
+$task = new Task($db);
+$userTmp = new User($db);
// Initialize view objects
$form = new Form($db);
-$hookmanager->initHooks(['timesheetcard', 'globalcard']); // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(['timesheetcard', 'globalcard']); // Note that conf->hooks_modules contains array.
// Fetch optionals attributes and labels
-$extrafields->fetch_name_optionals_label($object->table_element);
+$extraFields->fetch_name_optionals_label($object->table_element);
-$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+$search_array_options = $extraFields->getOptionalsFromPost($object->table_element, '', 'search_');
// Initialize array of search criterias
-$search_all = GETPOST('search_all', 'alpha');
-$search = [];
+$searchAll = GETPOST('search_all', 'alpha');
+$search = [];
foreach ($object->fields as $key => $val) {
- if (GETPOST('search_'.$key, 'alpha')) {
- $search[$key] = GETPOST('search_'.$key, 'alpha');
- }
+ if (GETPOST('search_' . $key, 'alpha')) {
+ $search[$key] = GETPOST('search_' . $key, 'alpha');
+ }
}
if (empty($action) && empty($id) && empty($ref)) {
- $action = 'view';
+ $action = 'view';
}
// Load object
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be included, not include_once.
+require_once DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be included, not include_once.
$upload_dir = $conf->dolisirh->multidir_output[$object->entity ?? 1];
+$now = dol_now();
+
// Security check - Protection if external user
-$permissiontoread = $user->rights->dolisirh->timesheet->read;
+$permissionToRead = $user->rights->dolisirh->timesheet->read;
$permissiontoadd = $user->rights->dolisirh->timesheet->write;
-$permissiontodelete = $user->rights->dolisirh->timesheet->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-saturne_check_access($permissiontoread);
+$permissiontodelete = $user->rights->dolisirh->timesheet->delete || ($permissiontoadd && isset($object->status) && $object->status == TimeSheet::STATUS_DRAFT);
+saturne_check_access($permissionToRead);
/*
- * Actions
+ * Actions.
*/
$parameters = [];
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks.
if ($reshook < 0) {
- setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
}
if (empty($reshook)) {
- $error = 0;
-
- $backurlforlist = dol_buildpath('/dolisirh/view/timesheet/timesheet_list.php', 1);
-
- if (empty($backtopage) || ($cancel && empty($id))) {
- if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
- if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
- $backtopage = $backurlforlist;
- } else {
- $backtopage = dol_buildpath('/dolisirh/view/timesheet/timesheet_card.php', 1).'?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
- }
- }
- }
-
- $triggermodname = 'TIMESHEET_MODIFY'; // Name of trigger action code to execute when we modify record
-
- if (($action == 'add' || $action == 'update') && $permissiontoadd && !$cancel) {
- $usertmp->fetch(GETPOST('fk_user_assign'));
- $date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
- $date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
- $filter = ' AND ptt.task_date BETWEEN ' . "'" .dol_print_date($date_start, 'dayrfc') . "'" . ' AND ' . "'" . dol_print_date($date_end, 'dayrfc'). "'";
- $alltimespent = $task->fetchAllTimeSpent($usertmp, $filter);
- foreach ($alltimespent as $timespent) {
- $task->fetchObjectLinked(null, '', $timespent->timespent_id, 'project_task_time');
- if (isset($task->linkedObjects['dolisirh_timesheet'])) {
- $error++;
- }
- }
-
- if ($date_start > $date_end) {
- setEventMessages($langs->trans('ErrorDateTimeSheet', dol_print_date($date_start, 'dayreduceformat'), dol_print_date($date_end, 'dayreduceformat')), null, 'errors');
- if ($action == 'add') {
- $action = 'create';
- } elseif ($action == 'update') {
- $action = 'edit';
- }
- }
-
- if ($conf->global->DOLISIRH_TIMESHEET_CHECK_DATE_END > 0) {
- if ($date_end > dol_now()) {
- setEventMessages($langs->trans('ErrorDateEndTimeSheet', dol_print_date($date_end, 'dayreduceformat'), dol_print_date(dol_now(), 'dayreduceformat')), null, 'errors');
- if ($action == 'add') {
- $action = 'create';
- } elseif ($action == 'update') {
- $action = 'edit';
- }
- }
- }
-
- if ($error > 0) {
- setEventMessages($langs->trans('ErrorLinkedElementTimeSheetTimeSpent', $usertmp->getFullName($langs), dol_print_date($date_start, 'dayreduceformat'), dol_print_date($date_end, 'dayreduceformat')), null, 'errors');
- if ($action == 'add') {
- $action = 'create';
- } elseif ($action == 'update') {
- $action = 'edit';
- }
- }
- }
-
- // Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
- $conf->global->MAIN_DISABLE_PDF_AUTOUPDATE = 1;
- include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
-
- // Action to build doc
- if ($action == 'builddoc' && $permissiontoadd) {
- $outputlangs = $langs;
- $newlang = '';
-
- if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
- if ( ! empty($newlang)) {
- $outputlangs = new Translate('', $conf);
- $outputlangs->setDefaultLang($newlang);
+ $error = 0;
+
+ $backurlforlist = dol_buildpath('/dolisirh/view/timesheet/timesheet_list.php', 1);
+
+ if (empty($backtopage) || ($cancel && empty($id))) {
+ if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+ if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+ $backtopage = $backurlforlist;
+ } else {
+ $backtopage = dol_buildpath('/dolisirh/view/timesheet/timesheet_card.php', 1) . '?id=' . ((!empty($id) && $id > 0) ? $id : '__ID__');
+ }
}
+ }
- // To be sure vars is defined
- if (empty($hidedetails)) $hidedetails = 0;
- if (empty($hidedesc)) $hidedesc = 0;
- if (empty($hideref)) $hideref = 0;
- if (empty($moreparams)) $moreparams = null;
+ if (($action == 'add' || $action == 'update') && $permissiontoadd && !$cancel) {
+ $userTmp->fetch(GETPOST('fk_user_assign'));
+ $dateStart = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
+ $dateEnd = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
+ $filter = ' AND ptt.task_date BETWEEN ' . "'" . dol_print_date($dateStart, 'dayrfc') . "'" . ' AND ' . "'" . dol_print_date($dateEnd, 'dayrfc') . "'";
+ $timeSpents = $task->fetchAllTimeSpent($userTmp, $filter);
+ foreach ($timeSpents as $timespent) {
+ $task->fetchObjectLinked(null, '', $timespent->timespent_id, 'project_task_time');
+ if (isset($task->linkedObjects['dolisirh_timesheet'])) {
+ $error++;
+ }
+ }
- $model = GETPOST('model', 'alpha');
+ if ($dateStart > $dateEnd) {
+ setEventMessages($langs->trans('ErrorDateTimeSheet', dol_print_date($dateStart, 'dayreduceformat'), dol_print_date($dateEnd, 'dayreduceformat')), [], 'errors');
+ if ($action == 'add') {
+ $action = 'create';
+ } elseif ($action == 'update') {
+ $action = 'edit';
+ }
+ }
- $moreparams['object'] = $object;
- $moreparams['user'] = $user;
+ if (getDolGlobalInt('DOLISIRH_TIMESHEET_CHECK_DATE_END')) {
+ if ($dateEnd > $now) {
+ setEventMessages($langs->trans('ErrorDateEndTimeSheet', dol_print_date($dateEnd, 'dayreduceformat'), dol_print_date($now, 'dayreduceformat')), [], 'errors');
+ if ($action == 'add') {
+ $action = 'create';
+ } elseif ($action == 'update') {
+ $action = 'edit';
+ }
+ }
+ }
- $result = $timesheetdocument->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
- if ($result <= 0) {
- setEventMessages($object->error, $object->errors, 'errors');
- $action = '';
- } else {
- if (empty($donotredirect)) {
- setEventMessages($langs->trans('FileGenerated') . ' - ' . $timesheetdocument->last_main_doc, null);
- $urltoredirect = $_SERVER['REQUEST_URI'];
- $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
- $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect); // To avoid infinite loop
- header('Location: ' . $urltoredirect . '#builddoc');
- exit;
+ if ($error > 0) {
+ setEventMessages($langs->trans('ErrorLinkedElementTimeSheetTimeSpent', $userTmp->getFullName($langs), dol_print_date($dateStart, 'dayreduceformat'), dol_print_date($dateEnd, 'dayreduceformat')), [], 'errors');
+ if ($action == 'add') {
+ $action = 'create';
+ } elseif ($action == 'update') {
+ $action = 'edit';
}
}
}
- // Delete file in doc form
- if ($action == 'remove_file' && $permissiontodelete) {
- if ( ! empty($upload_dir)) {
- require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+ // Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen.
+ $conf->global->MAIN_DISABLE_PDF_AUTOUPDATE = 1;
+ $triggermodname = 'TIMESHEET_MODIFY'; // Name of trigger action code to execute when we modify record.
+ require_once DOL_DOCUMENT_ROOT . '/core/actions_addupdatedelete.inc.php';
+
+ // Actions save_project.
+ require_once __DIR__ . '/../../../saturne/core/tpl/actions/edit_project_action.tpl.php';
+
+ // Actions builddoc, forcebuilddoc, remove_file.
+ require_once __DIR__ . '/../../../saturne/core/tpl/documents/documents_action.tpl.php';
- $langs->load('other');
- $filetodelete = GETPOST('file', 'alpha');
- $file = $upload_dir . '/' . $filetodelete;
- $ret = dol_delete_file($file, 0, 0, 0, $object);
- if ($ret) setEventMessages($langs->trans('FileWasRemoved', $filetodelete), null, 'mesgs');
- else setEventMessages($langs->trans('ErrorFailToDeleteFile', $filetodelete), null, 'errors');
+ // Action to generate pdf from odt file.
+ require_once __DIR__ . '/../../../saturne/core/tpl/documents/saturne_manual_pdf_generation_action.tpl.php';
- // Make a redirect to avoid to keep the remove_file into the url that create side effects
- $urltoredirect = $_SERVER['REQUEST_URI'];
- $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
- $urltoredirect = preg_replace('/action=remove_file&?/', '', $urltoredirect);
+ // Action to add line.
+ if ($action == 'addline' && $permissiontoadd) {
+ // Get parameters.
+ $qty = GETPOST('qty');
+ $prodEntryMode = GETPOST('prod_entry_mode');
- header('Location: ' . $urltoredirect);
- exit;
+ if ($prodEntryMode == 'free') {
+ $productType = GETPOST('type');
+ $description = GETPOST('dp_desc', 'restricthtml');
+
+ // Check parameters.
+ if ($productType < 0) {
+ setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), [], 'errors');
+ $error++;
+ }
+ if (dol_strlen($description) < 0) {
+ setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), [], 'errors');
+ $error++;
+ }
+
+ $objectLine->description = $description;
+ $objectLine->product_type = $productType;
+ } elseif ($prodEntryMode == 'predef') {
+ $productID = GETPOST('idprod');
+ if ($productID > 0) {
+ $product->fetch($productID);
+ $objectLine->fk_product = $productID;
+ $objectLine->product_type = 0;
+ } else {
+ $error++;
+ }
} else {
- setEventMessages('BugFoundVarUploaddirnotDefined', null, 'errors');
+ $error++;
+ }
+
+ // Initialize object timesheet line.
+ $objectLine->date_creation = $object->db->idate($now);
+ $objectLine->qty = $qty;
+ $objectLine->rang = 0;
+ $objectLine->fk_timesheet = $id;
+ $objectLine->fk_parent_line = 0;
+
+ if (!$error) {
+ $result = $objectLine->create($user);
+ if ($result > 0) {
+ // Creation timesheet line OK.
+ $urlToGo = str_replace('__ID__', $result, $backtopage);
+ $urlToGo = preg_replace('/--IDFORBACKTOPAGE--/', $id, $urlToGo); // New method to autoselect project after a New on another form object creation.
+ header('Location: ' . $urlToGo);
+ exit;
+ } elseif (!empty($objectLine->errors)) {
+ // Creation timesheet line KO.
+ setEventMessages('', $objectLine->errors, 'errors');
+ } else {
+ setEventMessages($objectLine->error, [], 'errors');
+ }
+ }
+ }
+
+ // Action to edit line.
+ if ($action == 'updateline' && $permissiontoadd) {
+ // Get parameters.
+ $qty = GETPOST('qty');
+ $description = GETPOST('product_desc', 'restricthtml');
+
+ $objectLine->fetch($lineid);
+
+ // Initialize object timesheet line.
+ $objectLine->qty = $qty;
+ $objectLine->description = $description;
+
+ if (!$error) {
+ $result = $objectLine->update($user);
+ if ($result > 0) {
+ // Update timesheet line OK.
+ $urlToGo = str_replace('__ID__', $result, $backtopage);
+ $urlToGo = preg_replace('/--IDFORBACKTOPAGE--/', $id, $urlToGo); // New method to autoselect project after a New on another form object creation.
+ header('Location: ' . $urlToGo);
+ exit;
+ } elseif (!empty($objectLine->errors)) {
+ // Update timesheet line KO.
+ setEventMessages('', $objectLine->errors, 'errors');
+ } else {
+ setEventMessages($objectLine->error, [], 'errors');
+ }
+ }
+ }
+
+ // Action to set status STATUS_LOCKED.
+ if ($action == 'confirm_set_Lock' && $permissiontoadd) {
+ $errorLinked = 0;
+ $object->fetch($id);
+ if (!$error) {
+ $userTmp->fetch($object->fk_user_assign);
+ $filter = ' AND ptt.task_date BETWEEN ' . "'" . dol_print_date($object->date_start, 'dayrfc') . "'" . ' AND ' . "'" . dol_print_date($object->date_end, 'dayrfc') . "'";
+ $timeSpents = $task->fetchAllTimeSpent($userTmp, $filter);
+ foreach ($timeSpents as $timespent) {
+ $task->fetchObjectLinked(null, '', $timespent->timespent_id, 'project_task_time');
+ if (!isset($task->linkedObjects['dolisirh_timesheet'])) {
+ $task->id = $timespent->timespent_id;
+ $task->element = 'project_task_time';
+ $task->add_object_linked('dolisirh_timesheet', $object->id);
+ } else {
+ $errorLinked++;
+ }
+ }
+ if ($errorLinked == 0) {
+ $object->setLocked($user, false);
+ // Set locked OK
+ $urlToGo = str_replace('__ID__', $id, $backtopage);
+ $urlToGo = preg_replace('/--IDFORBACKTOPAGE--/', $id, $urlToGo); // New method to autoselect project after a New on another form object creation.
+ header('Location: ' . $urlToGo);
+ exit;
+ }
+ } elseif (!empty($object->errors)) {
+ // Set locked KO.
+ setEventMessages('', $object->errors, 'errors');
+ } else {
+ setEventMessages($object->error, [], 'errors');
+ }
+
+ if ($errorLinked > 0) {
+ setEventMessages($langs->trans('ErrorLinkedElementTimeSheetTimeSpent', $userTmp->getFullName($langs), dol_print_date($object->date_start, 'dayreduceformat'), dol_print_date($object->date_end, 'dayreduceformat')), [], 'errors');
}
}
- if ($action == 'set_thirdparty' && $permissiontoadd) {
- $object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
- }
-
- if ($action == 'classin' && $permissiontoadd) {
- $object->setProject(GETPOST('projectid', 'int'));
- }
-
- // Action to add line
- if ($action == 'addline' && $permissiontoadd) {
- // Get parameters
- $qty = GETPOST('qty');
- $prod_entry_mode = GETPOST('prod_entry_mode');
-
- $now = dol_now();
-
- if ($prod_entry_mode == 'free') {
- $product_type = GETPOST('type');
- $description = GETPOST('dp_desc', 'restricthtml');
-
- // Check parameters
- if ($product_type < 0) {
- setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
- $error++;
- }
- if (empty($description)) {
- setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
- $error++;
- }
-
- $objectline->description = $description;
- $objectline->product_type = $product_type;
- } elseif ($prod_entry_mode == 'predef') {
- $product_id = GETPOST('idprod');
- if ($product_id > 0) {
- $product->fetch($product_id);
- $objectline->fk_product = $product_id;
- $objectline->product_type = 0;
- } else {
- $error++;
- }
- } else {
- $error++;
- }
-
- // Initialize object timesheet line
- $objectline->date_creation = $object->db->idate($now);
- $objectline->qty = $qty;
- $objectline->rang = 0;
- $objectline->fk_timesheet = $id;
- $objectline->fk_parent_line = 0;
-
- if ( ! $error) {
- $result = $objectline->create($user);
- if ($result > 0) {
- // Creation timesheet line OK
- $urltogo = str_replace('__ID__', $result, $backtopage);
- $urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $id, $urltogo); // New method to autoselect project after a New on another form object creation
- header('Location: ' . $urltogo);
- exit;
- } else {
- // Creation timesheet line KO
- if ( ! empty($objectline->errors)) setEventMessages(null, $objectline->errors, 'errors');
- else setEventMessages($objectline->error, null, 'errors');
- }
- }
- }
-
- // Action to edit line
- if ($action == 'updateline' && $permissiontoadd) {
- // Get parameters
- $qty = GETPOST('qty');
- $description = GETPOST('product_desc', 'restricthtml');
-
- $objectline->fetch($lineid);
-
- // Initialize object timesheet line
- $objectline->qty = $qty;
- $objectline->description = $description;
-
- if ( ! $error) {
- $result = $objectline->update($user, false);
- if ($result > 0) {
- // Update timesheet line OK
- $urltogo = str_replace('__ID__', $result, $backtopage);
- $urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $parent_id, $urltogo); // New method to autoselect project after a New on another form object creation
- header('Location: ' . $urltogo);
- exit;
- } else {
- // Update timesheet line KO
- if ( ! empty($objectline->errors)) setEventMessages(null, $objectline->errors, 'errors');
- else setEventMessages($objectline->error, null, 'errors');
- }
- }
- }
-
- // Action to set status STATUS_LOCKED
- if ($action == 'confirm_setLocked' && $permissiontoadd) {
- $errorlinked = 0;
- $object->fetch($id);
- if ( ! $error) {
- $usertmp->fetch($object->fk_user_assign);
- $filter = ' AND ptt.task_date BETWEEN ' . "'" .dol_print_date($object->date_start, 'dayrfc') . "'" . ' AND ' . "'" . dol_print_date($object->date_end, 'dayrfc'). "'";
- $alltimespent = $task->fetchAllTimeSpent($usertmp, $filter);
- foreach ($alltimespent as $timespent) {
- $task->fetchObjectLinked(null, '', $timespent->timespent_id, 'project_task_time');
- if (!isset($task->linkedObjects['dolisirh_timesheet'])) {
- $task->id = $timespent->timespent_id;
- $task->element = 'project_task_time';
- $task->add_object_linked('dolisirh_timesheet', $object->id);
- } else {
- $errorlinked++;
- }
- }
- if ($errorlinked == 0) {
- $object->setLocked($user, false);
- // Set locked OK
- $urltogo = str_replace('__ID__', $result, $backtopage);
- $urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $id, $urltogo); // New method to autoselect project after a New on another form object creation
- header('Location: ' . $urltogo);
- exit;
- }
- } else {
- // Set locked KO
- if ( ! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
- else setEventMessages($object->error, null, 'errors');
- }
-
- if ($errorlinked > 0) {
- setEventMessages($langs->trans('ErrorLinkedElementTimeSheetTimeSpent', $usertmp->getFullName($langs), dol_print_date($object->date_start, 'dayreduceformat'), dol_print_date($object->date_end, 'dayreduceformat')), null, 'errors');
- }
- }
-
- // Action to set status STATUS_ARCHIVED
- if ($action == 'setArchived' && $permissiontoadd) {
- $object->fetch($id);
- if ( ! $error) {
- $result = $object->setArchived($user, false);
- if ($result > 0) {
- // Set Archived OK
- $urltogo = str_replace('__ID__', $result, $backtopage);
- $urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $id, $urltogo); // New method to autoselect project after a New on another form object creation
- header('Location: ' . $urltogo);
- exit;
- } else {
- // Set Archived KO
- if ( ! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
- else setEventMessages($object->error, null, 'errors');
- }
- }
- }
-
- // Actions to send emails
- $triggersendname = strtoupper($object->element) . '_SENTBYMAIL';
- $autocopy = 'MAIN_MAIL_AUTOCOPY_' . strtoupper($object->element) . '_TO';
- include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
+ // Action confirm_archive.
+ require_once __DIR__ . '/../../../saturne/core/tpl/signature/signature_action_workflow.tpl.php';
+
+ // Actions to send emails.
+ $triggersendname = strtoupper($object->element) . '_SENTBYMAIL';
+ $autocopy = 'MAIN_MAIL_AUTOCOPY_' . strtoupper($object->element) . '_TO';
+ require_once DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
}
/*
- * View
+ * View.
*/
$title = $langs->trans(ucfirst($object->element));
@@ -414,106 +338,107 @@
saturne_header(0, '', $title, $help_url);
-// Part to create
+// Part to create;
if ($action == 'create') {
- if (empty($permissiontoadd)) {
- accessforbidden($langs->trans('NotEnoughPermissions'), 0);
- exit;
- }
+ if (empty($permissiontoadd)) {
+ accessforbidden($langs->trans('NotEnoughPermissions'), 0);
+ exit;
+ }
- print load_fiche_titre($langs->trans('New' . ucfirst($object->element)), '', 'object_' . $object->picto);
+ print load_fiche_titre($langs->trans('New' . ucfirst($object->element)), '', 'object_' . $object->picto);
- print '';
+ print '';
}
-// Part to edit record
+// Part to edit record.
if (($id || $ref) && $action == 'edit') {
- print load_fiche_titre($langs->trans('Modify' . ucfirst($object->element)), '', 'object_' . $object->picto);
-
- print '';
+ print '';
}
-// Part to show record
+// Part to show record.
if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
- $res = $object->fetch_optionals();
+ $object->fetch_optionals();
saturne_get_fiche_head($object, 'card', $title);
saturne_banner_tab($object);
- $formconfirm = '';
-
- // setDraft confirmation
- if (($action == 'setDraft' && (empty($conf->use_javascript_ajax) || !empty($conf->dol_use_jmobile))) || (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))) {
- $formconfirm .= $form->formconfirm($_SERVER['PHP_SELF'] . '?id=' . $object->id, $langs->trans('ReOpenTimeSheet'), $langs->trans('ConfirmReOpenTimeSheet', $object->ref), 'confirm_setdraft', '', 'yes', 'actionButtonInProgress', 350, 600);
- }
- // setPendingSignature confirmation
- if (($action == 'setPendingSignature' && (empty($conf->use_javascript_ajax) || !empty($conf->dol_use_jmobile))) || (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))) {
- $formconfirm .= $form->formconfirm($_SERVER['PHP_SELF'] . '?id=' . $object->id, $langs->trans('ValidateTimeSheet'), $langs->trans('ConfirmValidateTimeSheet', $object->ref), 'confirm_validate', '', 'yes', 'actionButtonPendingSignature', 350, 600);
- }
- // setLocked confirmation
- if (($action == 'setLocked' && (empty($conf->use_javascript_ajax) || !empty($conf->dol_use_jmobile))) || (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))) {
- $formconfirm .= $form->formconfirm($_SERVER['PHP_SELF'] . '?id=' . $object->id, $langs->trans('LockTimeSheet'), $langs->trans('ConfirmLockTimeSheet', $object->ref), 'confirm_setLocked', '', 'yes', 'actionButtonLock', 350, 600);
- }
- // Confirmation to delete
- if ($action == 'delete') {
- $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'] . '?id=' . $object->id, $langs->trans('DeleteTimeSheet'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 'yes', 1);
- }
- // Confirmation to delete line
- if ($action == 'ask_deleteline') {
- $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
- }
- // Confirmation remove file
- if ($action == 'removefile') {
- $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'] . '?id=' . $object->id . '&file=' . GETPOST('file') . '&entity=' . $conf->entity, $langs->trans('RemoveFileTimeSheet'), $langs->trans('ConfirmRemoveFileTimeSheet'), 'remove_file', '', 'yes', 1, 350, 600);
- }
-
- // Call Hook formConfirm
- $parameters = ['formConfirm' => $formconfirm, 'lineid' => $lineid];
- $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
- if (empty($reshook)) {
- $formconfirm .= $hookmanager->resPrint;
- } elseif ($reshook > 0) {
- $formconfirm = $hookmanager->resPrint;
- }
-
- // Print form confirm
- print $formconfirm;
-
- print '