From 2e0c3e622107cb5eb40dffb9b27a275e5f3e67a3 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Wed, 3 Dec 2025 10:30:38 +0100
Subject: [PATCH 01/96] Add default reminder email template
---
ChangeLog.md | 4 +
README.md | 2 +
admin/setup.php | 217 ++++++++++++++++----
class/timesheetweek_reminder.class.php | 251 ++++++++++++++++++++++++
core/modules/modTimesheetWeek.class.php | 218 +++++++++++++++++---
langs/en_US/timesheetweek.lang | 23 +++
langs/fr_FR/timesheetweek.lang | 23 +++
7 files changed, 679 insertions(+), 59 deletions(-)
create mode 100644 class/timesheetweek_reminder.class.php
diff --git a/ChangeLog.md b/ChangeLog.md
index 8cbd24b..36eb6bf 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,9 @@
# CHANGELOG MODULE TIMESHEETWEEK FOR [DOLIBARR ERP CRM](https://www.dolibarr.org)
+## 1.6.0 (20/06/2026)
+- Ajoute un rappel hebdomadaire automatique par email configurable (activation, jour, heure, modèle) et une tâche planifiée dédiée avec bouton de test administrateur.
+ / Adds a configurable automatic weekly email reminder (enablement, day, time, template) plus a dedicated scheduled task and admin test button.
+
## 1.5.0 (01/12/2025)
- Ajoute une action de masse pour générer un PDF unique fusionnant les feuilles sélectionnées en utilisant le modèle par défaut. / Adds a mass action to generate a single merged PDF for selected timesheets using the default template.
diff --git a/README.md b/README.md
index 3273f32..364e614 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ TimesheetWeek ajoute une gestion hebdomadaire des feuilles de temps fidèle à l
- Redirection automatique vers la feuille existante en cas de tentative de doublon afin d'éviter les saisies multiples.
- Suivi des compteurs hebdomadaires de zones et de paniers directement sur les feuilles et recalcul automatique à chaque enregistrement.
- Saisie dédiée pour les salariés en forfait jour grâce à des sélecteurs Journée/Matin/Après-midi convertissant automatiquement les heures.
+- Rappel hebdomadaire automatique par email configurable (activation, jour, heure, modèle) avec tâche planifiée dédiée et bouton d'envoi de test administrateur.
- Affichage des compteurs dans la liste hebdomadaire et ajout du libellé « Zone » sur chaque sélecteur quotidien pour clarifier la saisie.
- Ligne de total en bas de la liste hebdomadaire pour additionner heures, zones, paniers et afficher la colonne de date de validation.
- Création rapide d'une feuille d'heures via le raccourci « Ajouter » du menu supérieur.
@@ -51,6 +52,7 @@ TimesheetWeek delivers weekly timesheet management that follows Dolibarr design
- Automatic redirect to the existing timesheet when a duplicate creation is attempted.
- Weekly counters for zones and meal allowances with automatic recomputation on each save.
- Dedicated input for daily rate employees with Full day/Morning/Afternoon selectors that automatically convert hours.
+- Configurable automatic weekly email reminder (enablement, weekday, time, template) with a dedicated scheduled task and admin test send button.
- Counter display inside the weekly list plus a « Zone » caption on each daily selector for better input guidance.
- Total row at the bottom of the weekly list to sum hours, zones, meals and expose the validation date column.
- Quick creation shortcut available from the top-right « Add » menu.
diff --git a/admin/setup.php b/admin/setup.php
index 1394de5..7d19608 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -22,7 +22,6 @@
*/
// EN: Load Dolibarr environment with fallback paths.
-// FR: Charge l'environnement Dolibarr en testant les chemins possibles.
$res = 0;
if (!$res && file_exists(__DIR__.'/../main.inc.php')) {
$res = require_once __DIR__.'/../main.inc.php';
@@ -40,34 +39,37 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
// EN: Load document helper functions required for model toggles.
-// FR: Charge les fonctions d'aide aux documents nécessaires aux commutateurs de modèles.
require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
dol_include_once('/timesheetweek/lib/timesheetweek.lib.php');
dol_include_once('/timesheetweek/class/timesheetweek.class.php');
+dol_include_once('/timesheetweek/class/timesheetweek_reminder.class.php');
// EN: Load translation files required for the configuration page.
-// FR: Charge les fichiers de traduction nécessaires à la page de configuration.
$langs->loadLangs(array('admin', 'other', 'timesheetweek@timesheetweek'));
// EN: Only administrators can access the setup.
-// FR: Seuls les administrateurs peuvent accéder à la configuration.
if (empty($user->admin)) {
accessforbidden();
}
// EN: Read HTTP parameters once so we can re-use them further down.
-// FR: Lit les paramètres HTTP une seule fois pour les réutiliser ensuite.
$action = GETPOST('action', 'aZ09');
$value = GETPOST('value', 'alphanohtml');
$token = GETPOST('token', 'alphanohtml');
// EN: Capture additional parameters used to reproduce Dolibarr's document model toggles.
-// FR: Capture les paramètres additionnels utilisés par les bascules de modèles de document Dolibarr.
$docLabel = GETPOST('label', 'alphanohtml');
$scanDir = GETPOST('scan_dir', 'alpha');
+$reminderAction = GETPOST('reminder_action', 'aZ09');
+
+if (is_readable(DOL_DOCUMENT_ROOT.'/core/class/cemailtemplates.class.php')) {
+ dol_include_once('/core/class/cemailtemplates.class.php');
+} elseif (is_readable(DOL_DOCUMENT_ROOT.'/core/class/emailtemplates.class.php')) {
+ dol_include_once('/core/class/emailtemplates.class.php');
+}
// EN: Helper to enable a PDF model in the database.
-// FR: Aide pour activer un modèle PDF dans la base.
function timesheetweekEnableDocumentModel($model, $label = '', $scandir = '')
{
global $db, $conf;
@@ -77,7 +79,6 @@ function timesheetweekEnableDocumentModel($model, $label = '', $scandir = '')
}
// EN: Check if the model already exists for the current entity to avoid duplicates.
- // FR: Vérifie si le modèle existe déjà pour l'entité courante afin d'éviter les doublons.
$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX."document_model WHERE nom='".$db->escape($model)."' AND type='timesheetweek' AND entity=".((int) $conf->entity);
$resql = $db->query($sql);
if (!$resql) {
@@ -91,13 +92,11 @@ function timesheetweekEnableDocumentModel($model, $label = '', $scandir = '')
$fields = array();
// EN: Refresh label when provided to keep UI messages in sync.
- // FR: Met à jour le libellé fourni pour garder l'interface cohérente.
if ($label !== '') {
$fields[] = "libelle='".$db->escape($label)."'";
}
// EN: Refresh directory hint when provided to ease future scans.
- // FR: Met à jour le chemin fourni pour faciliter les scans ultérieurs.
if ($scandir !== '') {
$fields[] = "description='".$db->escape($scandir)."'";
}
@@ -122,7 +121,6 @@ function timesheetweekEnableDocumentModel($model, $label = '', $scandir = '')
// EN: Helper to disable a PDF model from the database.
-// FR: Aide pour désactiver un modèle PDF dans la base.
function timesheetweekDisableDocumentModel($model)
{
if (empty($model)) {
@@ -134,7 +132,6 @@ function timesheetweekDisableDocumentModel($model)
}
// EN: Build the list of numbering modules available for the module.
-// FR: Construit la liste des modules de numérotation disponibles pour le module.
function timesheetweekListNumberingModules(array $directories, Translate $langs, TimesheetWeek $sample, $selected)
{
global $db;
@@ -143,7 +140,6 @@ function timesheetweekListNumberingModules(array $directories, Translate $langs,
foreach ($directories as $reldir) {
// EN: Resolve the directory that holds the numbering module classes.
- // FR: Résout le répertoire qui contient les classes de numérotation.
$dir = dol_buildpath(rtrim($reldir, '/').'/timesheetweek/core/modules/timesheetweek/');
if (!is_dir($dir)) {
continue;
@@ -210,7 +206,6 @@ function timesheetweekListNumberingModules(array $directories, Translate $langs,
}
// EN: Build the list of available document models for the module.
-// FR: Construit la liste des modèles de documents disponibles pour le module.
function timesheetweekListDocumentModels(array $directories, Translate $langs, array $enabled, $default)
{
global $db;
@@ -219,7 +214,6 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
foreach ($directories as $reldir) {
// EN: Resolve the directory that stores the document model definitions.
- // FR: Résout le répertoire qui contient les définitions de modèles de document.
$dir = dol_buildpath(rtrim($reldir, '/').'/timesheetweek/core/modules/timesheetweek/doc/');
if (!is_dir($dir)) {
continue;
@@ -275,8 +269,15 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
// EN: Verify CSRF token when the request changes the configuration.
-// FR: Vérifie le jeton CSRF lorsque la requête modifie la configuration.
if (in_array($action, array('setmodule', 'setdoc', 'setdocmodel', 'delmodel', 'setquarterday'), true)) {
+ if (function_exists('dol_verify_token')) {
+ if (empty($token) || dol_verify_token($token) <= 0) {
+ accessforbidden();
+ }
+ }
+}
+
+if (in_array($reminderAction, array('savereminder', 'testreminder'), true)) {
if (function_exists('dol_verify_token')) {
if (empty($token) || dol_verify_token($token) <= 0) {
accessforbidden();
@@ -285,7 +286,6 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
// EN: Persist the chosen numbering module.
-// FR: Enregistre le module de numérotation choisi.
if ($action === 'setmodule' && !empty($value)) {
$result = dolibarr_set_const($db, 'TIMESHEETWEEK_ADDON', $value, 'chaine', 0, '', $conf->entity);
if ($result > 0) {
@@ -296,7 +296,6 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
// EN: Set the default PDF model while ensuring the model is enabled.
-// FR: Définit le modèle PDF par défaut tout en s'assurant qu'il est activé.
if ($action === 'setdoc' && !empty($value)) {
$res = timesheetweekEnableDocumentModel($value, $docLabel, $scanDir);
if ($res > 0) {
@@ -310,7 +309,6 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
// EN: Activate a PDF model without making it the default.
-// FR: Active un modèle PDF sans le définir comme défaut.
if ($action === 'setdocmodel' && !empty($value)) {
$res = timesheetweekEnableDocumentModel($value, $docLabel, $scanDir);
if ($res > 0) {
@@ -321,7 +319,6 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
// EN: Disable a PDF model and remove the default flag if needed.
-// FR: Désactive un modèle PDF et supprime le statut par défaut si nécessaire.
if ($action === 'delmodel' && !empty($value)) {
$res = timesheetweekDisableDocumentModel($value);
if ($res > 0) {
@@ -335,12 +332,11 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
// EN: Enable or disable the quarter-day selector for daily rate contracts.
-// FR: Active ou désactive le sélecteur quart de jour pour les contrats au forfait jour.
if ($action === 'setquarterday') {
- $targetValue = (int) GETPOST('value', 'int');
- if ($targetValue !== 0) {
- $targetValue = 1;
- }
+ $targetValue = (int) GETPOST('value', 'int');
+ if ($targetValue !== 0) {
+ $targetValue = 1;
+ }
$res = dolibarr_set_const($db, 'TIMESHEETWEEK_QUARTERDAYFORDAILYCONTRACT', $targetValue, 'chaine', 0, '', $conf->entity);
if ($res > 0) {
setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
@@ -349,19 +345,70 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
}
+if ($reminderAction === 'savereminder') {
+$reminderEnabledValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_ENABLED', 'int');
+$reminderWeekdayValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_WEEKDAY', 'int');
+$reminderHourValue = trim(GETPOST('TIMESHEETWEEK_REMINDER_HOUR', 'alphanohtml'));
+ $reminderTemplateValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE', 'int');
+
+ $error = 0;
+
+ if ($reminderWeekdayValue < 1 || $reminderWeekdayValue > 7) {
+ setEventMessages($langs->trans('TimesheetWeekReminderWeekdayInvalid'), null, 'errors');
+ $error++;
+ }
+
+ if (!preg_match('/^(?:[01]\\d|2[0-3]):[0-5]\\d$/', $reminderHourValue)) {
+ setEventMessages($langs->trans('TimesheetWeekReminderHourInvalid'), null, 'errors');
+ $error++;
+ }
+
+ if (!$error) {
+ $results = array();
+ $results[] = dolibarr_set_const($db, 'TIMESHEETWEEK_REMINDER_ENABLED', ($reminderEnabledValue ? 1 : 0), 'chaine', 0, '', $conf->entity);
+ $results[] = dolibarr_set_const($db, 'TIMESHEETWEEK_REMINDER_WEEKDAY', $reminderWeekdayValue, 'chaine', 0, '', $conf->entity);
+ $results[] = dolibarr_set_const($db, 'TIMESHEETWEEK_REMINDER_HOUR', $reminderHourValue, 'chaine', 0, '', $conf->entity);
+ $results[] = dolibarr_set_const($db, 'TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE', $reminderTemplateValue, 'chaine', 0, '', $conf->entity);
+
+ $hasError = false;
+ foreach ($results as $resultValue) {
+ if ($resultValue <= 0) {
+ $hasError = true;
+ break;
+ }
+ }
+
+ if ($hasError) {
+ setEventMessages($langs->trans('Error'), null, 'errors');
+ } else {
+ setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
+}
+}
+}
+
+ if ($reminderAction === 'testreminder') {
+ $resultTest = TimesheetweekReminder::sendTest($db, $user);
+ if ($resultTest > 0) {
+ setEventMessages($langs->trans('TimesheetWeekReminderTestSuccess', $resultTest), null, 'mesgs');
+ } else {
+ setEventMessages($langs->trans('TimesheetWeekReminderTestError'), null, 'errors');
+ }
+}
+
// EN: Read the selected options so we can highlight them in the UI.
-// FR: Lit les options sélectionnées pour les mettre en avant dans l'interface.
$selectedNumbering = getDolGlobalString('TIMESHEETWEEK_ADDON', 'mod_timesheetweek_standard');
$defaultPdf = getDolGlobalString('TIMESHEETWEEK_ADDON_PDF', 'standard_timesheetweek');
$useQuarterDaySelector = getDolGlobalInt('TIMESHEETWEEK_QUARTERDAYFORDAILYCONTRACT', 0);
+$reminderEnabled = getDolGlobalInt('TIMESHEETWEEK_REMINDER_ENABLED', 0);
+$reminderWeekday = getDolGlobalInt('TIMESHEETWEEK_REMINDER_WEEKDAY', 1);
+$reminderHour = getDolGlobalString('TIMESHEETWEEK_REMINDER_HOUR', '18:00');
+$reminderTemplateId = getDolGlobalInt('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE', 0);
$directories = array_merge(array('/'), (array) $conf->modules_parts['models']);
// EN: Prepare a lightweight object to test numbering module activation.
-// FR: Prépare un objet léger pour tester l'activation des modules de numérotation.
$sampleTimesheet = new TimesheetWeek($db);
// EN: Fetch the enabled document models from the database.
-// FR: Récupère les modèles de documents activés depuis la base.
$enabledModels = array();
$sql = 'SELECT nom FROM '.MAIN_DB_PREFIX."document_model WHERE type='timesheetweek' AND entity IN (0, ".((int) $conf->entity).')';
$resql = $db->query($sql);
@@ -373,10 +420,29 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
// EN: Build the metadata arrays used by the HTML rendering below.
-// FR: Construit les tableaux de métadonnées utilisés par l'affichage HTML ci-dessous.
$numberingModules = timesheetweekListNumberingModules($directories, $langs, $sampleTimesheet, $selectedNumbering);
$documentModels = timesheetweekListDocumentModels($directories, $langs, $enabledModels, $defaultPdf);
$pageToken = function_exists('newToken') ? newToken() : '';
+$form = new Form($db);
+
+$emailTemplates = array();
+$emailTemplateClass = '';
+if (class_exists('CEmailTemplates')) {
+ $emailTemplateClass = 'CEmailTemplates';
+} elseif (class_exists('EmailTemplates')) {
+ $emailTemplateClass = 'EmailTemplates';
+}
+
+if (!empty($emailTemplateClass)) {
+ $emailTemplateObject = new $emailTemplateClass($db);
+ if (method_exists($emailTemplateObject, 'fetchAll')) {
+ $filters = array('entity' => $conf->entity);
+ $templatesResult = $emailTemplateObject->fetchAll('', '', 0, 0, $filters);
+ if (is_array($templatesResult)) {
+ $emailTemplates = $templatesResult;
+ }
+ }
+}
$title = $langs->trans('ModuleSetup', 'Timesheetweek');
$helpurl = '';
@@ -397,7 +463,6 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
print '';
// EN: Display the numbering modules with switch-based activation instead of radios.
-// FR: Affiche les modules de numérotation avec des commutateurs plutôt qu'avec des radios.
print '
'.$langs->trans('TimesheetWeekNumberingHelp').'
';
print '
';
@@ -433,7 +498,6 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
print '
'.(!empty($moduleInfo['example']) ? dol_escape_htmltag($moduleInfo['example']) : ' ').' ';
// EN: Render the activation toggle that selects the numbering model with CSRF protection.
- // FR: Affiche le commutateur d’activation qui sélectionne le modèle de numérotation avec protection CSRF.
print '
';
if ($moduleInfo['active']) {
print img_picto($langs->trans('Enabled'), 'switch_on');
@@ -455,7 +519,6 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
print ''.$langs->trans('TimesheetWeekDailyRateOptionsHelp').'
';
@@ -468,7 +531,6 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
print '';
// EN: Render the switch dedicated to the quarter-day declaration helper.
-// FR: Affiche le commutateur dédié à l'aide de déclaration des quarts de jour.
print ' ';
print ''.$langs->trans('TimesheetWeekQuarterDayForDailyContract').' ';
print ''.$langs->trans('TimesheetWeekQuarterDayForDailyContractHelp').' ';
@@ -488,6 +550,95 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
print ''.$langs->trans('TimesheetWeekReminderSectionHelp').'
';
+
+print '';
+
+print ''.$langs->trans('TimesheetWeekPDFModelsHelp').'
';
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
new file mode 100644
index 0000000..763dea0
--- /dev/null
+++ b/class/timesheetweek_reminder.class.php
@@ -0,0 +1,251 @@
+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see ';
-$templateOptions = array(0 => $langs->trans('None'));
-foreach ($emailTemplates as $templateItem) {
- $templateId = 0;
- if (!empty($templateItem->id)) {
- $templateId = (int) $templateItem->id;
- } elseif (!empty($templateItem->rowid)) {
- $templateId = (int) $templateItem->rowid;
- }
-
- if (empty($templateId)) {
- continue;
- }
-
- $templateLabel = '';
- if (!empty($templateItem->label)) {
- $templateLabel = $templateItem->label;
- } elseif (!empty($templateItem->ref)) {
- $templateLabel = $templateItem->ref;
- } elseif (!empty($templateItem->topic)) {
- $templateLabel = $templateItem->topic;
- } else {
- $templateLabel = '#'.$templateId;
- }
-
- $templateOptions[$templateId] = $templateLabel;
-}
-
print '
';
print ''.$langs->trans('TimesheetWeekReminderEmailTemplate').' ';
print ''.$langs->trans('TimesheetWeekReminderEmailTemplateHelp').' ';
-print ''.$form->selectarray('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE', $templateOptions, $reminderTemplateId, 0, 0, 0, '', 0, 0, 0, '', '', 1).' ';
+print ''.$formSetup->newItem('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE')->setAsSelect($options).' ';
print ' ';
print '';
From ef46fcda476b73fcdc0de42c62d41dae458b1dbe Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 21:59:30 +0100
Subject: [PATCH 28/96] Update setup.php
---
admin/setup.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/admin/setup.php b/admin/setup.php
index d2db6ff..8bdd76e 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -592,6 +592,7 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
print '
'.$langs->trans('TimesheetWeekReminderEnabledHelp').' ';
print '
';
print ' ';
print '';
@@ -620,7 +621,7 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
print '
';
print ''.$langs->trans('TimesheetWeekReminderEmailTemplate').' ';
print ''.$langs->trans('TimesheetWeekReminderEmailTemplateHelp').' ';
-print ''.$formSetup->newItem('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE')->setAsSelect($options).' ';
+$formSetup->newItem('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE')->setAsSelect($options);//print ''.$formSetup->newItem('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE')->setAsSelect($options).' ';
print ' ';
print '';
From 7a56c5f1f4420c407d83c5495f73115b49b1646e Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 22:03:07 +0100
Subject: [PATCH 29/96] Update setup.php
---
admin/setup.php | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/admin/setup.php b/admin/setup.php
index 8bdd76e..1b5c9e1 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -623,6 +623,14 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
print '
'.$langs->trans('TimesheetWeekReminderEmailTemplateHelp').' ';
$formSetup->newItem('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE')->setAsSelect($options);//print '
'.$formSetup->newItem('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE')->setAsSelect($options).' ';
print '';
+if ($action == 'edit') {
+ print $formSetup->generateOutput(true);
+} else {
+ print $formSetup->generateOutput();
+ print '
';
+}
print '';
print '
';
From fa29c460d0e9e9d2169b66d9fd00ab1b35749200 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 22:21:24 +0100
Subject: [PATCH 30/96] Update setup.php
---
admin/setup.php | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/admin/setup.php b/admin/setup.php
index 1b5c9e1..8c096ac 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -592,7 +592,6 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
print '
'.$langs->trans('TimesheetWeekReminderEnabledHelp').' ';
print '
';
print ' ';
print '';
@@ -621,24 +620,16 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
print '
';
print ''.$langs->trans('TimesheetWeekReminderEmailTemplate').' ';
print ''.$langs->trans('TimesheetWeekReminderEmailTemplateHelp').' ';
-$formSetup->newItem('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE')->setAsSelect($options);//print ''.$formSetup->newItem('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE')->setAsSelect($options).' ';
+print ''.$formSetup->newItem('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE')->setAsSelect($options).' ';
print ' ';
-if ($action == 'edit') {
- print $formSetup->generateOutput(true);
-} else {
- print $formSetup->generateOutput();
- print '
';
-}
print '';
print '
';
-print ''.$langs->trans('Save').' ';
+print ''.$langs->trans('TimesheetWeekReminderSendTest').' ';
+print '
';
print '';
From 0722eb7d8545a1fc42401826104f28e8440101e6 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 22:29:48 +0100
Subject: [PATCH 31/96] Update setup.php
---
admin/setup.php | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/admin/setup.php b/admin/setup.php
index 8c096ac..d3315d3 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -65,22 +65,12 @@
dol_include_once('/core/class/cemailtemplates.class.php');
-if (!class_exists('FormSetup')) {
- // For retrocompatibility Dolibarr < 16.0
- if (floatval(DOL_VERSION) < 16.0 && !class_exists('FormSetup')) {
- require_once __DIR__.'/../backport/v16/core/class/html.formsetup.class.php';
- } else {
- require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
- }
-}
-
-$formSetup = new FormSetup($db);
$form = new Form($db);
$sql = "SELECT rowid, label ";
$sql.= "FROM ".MAIN_DB_PREFIX."c_email_templates ";
-$sql.= "WHERE enabled='1' ";
-$sql.= "AND active='1' ";
+$sql.= "WHERE active='1' ";
+//$sql.= "AND enabled='1' ";
$sql.= "AND type_template = 'actioncomm_send' ";
$sql.= "AND entity='".getEntity('timesheetweek')."' ";
//$sql.= "GROUP BY label";
@@ -90,6 +80,7 @@
while ($obj = $db->fetch_object($result)) {
$options[$obj->label] = $obj->label;
}
+ var_dump($result);
}
// EN: Helper to enable a PDF model in the database.
@@ -620,7 +611,7 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
print '';
print ''.$langs->trans('TimesheetWeekReminderEmailTemplate').' ';
print ''.$langs->trans('TimesheetWeekReminderEmailTemplateHelp').' ';
-print ''.$formSetup->newItem('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE')->setAsSelect($options).' ';
+print ''.$form->selectarray('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE', $templateOptions, $reminderTemplateId, 0, 0, 0, '', 0, 0, 0, '', '', 1).' ';
print ' ';
print '';
From ccc5ff64e78389aa7bf8a8a0e1d7579de3c487af Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 22:33:12 +0100
Subject: [PATCH 32/96] Update setup.php
---
admin/setup.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/setup.php b/admin/setup.php
index d3315d3..b6a6bca 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -72,7 +72,7 @@
$sql.= "WHERE active='1' ";
//$sql.= "AND enabled='1' ";
$sql.= "AND type_template = 'actioncomm_send' ";
-$sql.= "AND entity='".getEntity('timesheetweek')."' ";
+//$sql.= "AND entity='".getEntity('timesheetweek')."' ";
//$sql.= "GROUP BY label";
$result = $db->query($sql);
$options = array();
From d7c01b8d1fb9a5bfea97c6bb27c43ceef51bc607 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 22:36:01 +0100
Subject: [PATCH 33/96] Update setup.php
---
admin/setup.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin/setup.php b/admin/setup.php
index b6a6bca..4dbef82 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -75,10 +75,10 @@
//$sql.= "AND entity='".getEntity('timesheetweek')."' ";
//$sql.= "GROUP BY label";
$result = $db->query($sql);
-$options = array();
+$templateOptions = array();
if ($result) {
while ($obj = $db->fetch_object($result)) {
- $options[$obj->label] = $obj->label;
+ $templateOptions[$obj->label] = $obj->label;
}
var_dump($result);
}
From 8a66b6d88acfdfd67e3a3d6227a2c88d5ab971a9 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 22:41:02 +0100
Subject: [PATCH 34/96] Update setup.php
---
admin/setup.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/admin/setup.php b/admin/setup.php
index 4dbef82..50dfbf8 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -618,6 +618,7 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
print '';
print '';
+print dolGetButtonAction('', ($langs->trans("Save")!='Save'?$langs->trans("Save"):'Enregistrer'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=ask_validate&token='.$token);
print '
';
print '';
-print dolGetButtonAction('', ($langs->trans("Save")!='Save'?$langs->trans("Save"):'Enregistrer'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=ask_validate&token='.$token);
-print '
';
print '';
From a67d553d81dcbd50c227ad2060716dd687082284 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 22:47:15 +0100
Subject: [PATCH 36/96] Update setup.php
---
admin/setup.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin/setup.php b/admin/setup.php
index 20d5796..a517f40 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -618,10 +618,10 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
print '';
print '';
-print dolGetButtonAction('', ($langs->trans("Save")!='Save'?$langs->trans("Save"):'Enregistrer'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=savereminder&token='.$token);
+print dolGetButtonAction('', ($langs->trans("Save")!='Save'?$langs->trans("Save"):'Enregistrer'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=savereminder&token='.$pageToken);
//print '
';
print '';
From cf2f49ed2b084402754cde93297869be4700497a Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 22:50:07 +0100
Subject: [PATCH 37/96] Update setup.php
---
admin/setup.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/admin/setup.php b/admin/setup.php
index a517f40..abad7df 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -80,7 +80,6 @@
while ($obj = $db->fetch_object($result)) {
$templateOptions[$obj->label] = $obj->label;
}
- var_dump($result);
}
// EN: Helper to enable a PDF model in the database.
From 986b05896cca4a1ee8fa034c2522c0e4bc509f5b Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 22:51:20 +0100
Subject: [PATCH 38/96] Update setup.php
---
admin/setup.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin/setup.php b/admin/setup.php
index abad7df..f89690b 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -395,8 +395,8 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
setEventMessages($langs->trans('Error'), null, 'errors');
} else {
setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
-}
-}
+ }
+ }
}
if ($action === 'testreminder') {
From 0cdf9d50a167fd82042b92aef94a40bf816e40ea Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 22:53:27 +0100
Subject: [PATCH 39/96] Update setup.php
---
admin/setup.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/admin/setup.php b/admin/setup.php
index f89690b..c9d7f4a 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -359,9 +359,9 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
if ($action === 'savereminder') {
-$reminderEnabledValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_ENABLED', 'int');
-$reminderWeekdayValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_WEEKDAY', 'int');
-$reminderHourValue = trim(GETPOST('TIMESHEETWEEK_REMINDER_HOUR', 'alphanohtml'));
+ $reminderEnabledValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_ENABLED', 'int');
+ $reminderWeekdayValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_WEEKDAY', 'int');
+ $reminderHourValue = trim(GETPOST('TIMESHEETWEEK_REMINDER_HOUR', 'alphanohtml'));
$reminderTemplateValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE', 'int');
$error = 0;
@@ -617,10 +617,10 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
print '';
print '';
-print dolGetButtonAction('', ($langs->trans("Save")!='Save'?$langs->trans("Save"):'Enregistrer'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=savereminder&token='.$pageToken);
+print dolGetButtonAction('', ($langs->trans("Save")!='Save'?$langs->trans("Save"):'Enregistrer'), 'default', $_SERVER["PHP_SELF"].'?action=savereminder&token='.$pageToken);
//print '
';
print '';
From f9141c2e545a7329caaaa44d5994b484d14f3237 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 22:58:21 +0100
Subject: [PATCH 40/96] Update setup.php
---
admin/setup.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin/setup.php b/admin/setup.php
index c9d7f4a..981ed28 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -359,10 +359,10 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
if ($action === 'savereminder') {
- $reminderEnabledValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_ENABLED', 'int');
- $reminderWeekdayValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_WEEKDAY', 'int');
- $reminderHourValue = trim(GETPOST('TIMESHEETWEEK_REMINDER_HOUR', 'alphanohtml'));
- $reminderTemplateValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE', 'int');
+ $reminderEnabledValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_ENABLED', 'int'); var_dump($reminderEnabledValue);
+ $reminderWeekdayValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_WEEKDAY', 'int'); var_dump($reminderWeekdayValue);
+ $reminderHourValue = trim(GETPOST('TIMESHEETWEEK_REMINDER_HOUR', 'alphanohtml')); var_dump($reminderHourValue);
+ $reminderTemplateValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE', 'int'); var_dump($reminderTemplateValue);
$error = 0;
From ba1017db75f4e733d7145a7eaf835c77ad75b7bc Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 23:07:24 +0100
Subject: [PATCH 41/96] Update setup.php
---
admin/setup.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/setup.php b/admin/setup.php
index 981ed28..7ea736e 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -290,7 +290,7 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
}
-if (in_array($reminderAction, array('savereminder', 'testreminder'), true)) {
+if (in_array($action, array('savereminder', 'testreminder'), true)) {
if (function_exists('dol_verify_token')) {
if (empty($token) || dol_verify_token($token) <= 0) {
accessforbidden();
From 49c8fe5a65e78901dd1d83959472583377325ec2 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 23:12:03 +0100
Subject: [PATCH 42/96] Update setup.php
---
admin/setup.php | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/admin/setup.php b/admin/setup.php
index 7ea736e..0ca3c83 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -282,7 +282,7 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
// EN: Verify CSRF token when the request changes the configuration.
-if (in_array($action, array('setmodule', 'setdoc', 'setdocmodel', 'delmodel', 'setquarterday'), true)) {
+if (in_array($action, array('setmodule', 'setdoc', 'setdocmodel', 'delmodel', 'setquarterday','savereminder', 'testreminder'), true)) {
if (function_exists('dol_verify_token')) {
if (empty($token) || dol_verify_token($token) <= 0) {
accessforbidden();
@@ -290,14 +290,6 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
}
-if (in_array($action, array('savereminder', 'testreminder'), true)) {
- if (function_exists('dol_verify_token')) {
- if (empty($token) || dol_verify_token($token) <= 0) {
- accessforbidden();
- }
- }
-}
-
// EN: Persist the chosen numbering module.
if ($action === 'setmodule' && !empty($value)) {
$result = dolibarr_set_const($db, 'TIMESHEETWEEK_ADDON', $value, 'chaine', 0, '', $conf->entity);
From 077bafc18c7913f6fa706d49bf120339d0cc9183 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 23:15:36 +0100
Subject: [PATCH 43/96] Update setup.php
---
admin/setup.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/admin/setup.php b/admin/setup.php
index 0ca3c83..354e2f5 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -61,7 +61,6 @@
// EN: Capture additional parameters used to reproduce Dolibarr's document model toggles.
$docLabel = GETPOST('label', 'alphanohtml');
$scanDir = GETPOST('scan_dir', 'alpha');
-$reminderAction = GETPOST('reminder_action', 'aZ09');
dol_include_once('/core/class/cemailtemplates.class.php');
@@ -282,7 +281,7 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
// EN: Verify CSRF token when the request changes the configuration.
-if (in_array($action, array('setmodule', 'setdoc', 'setdocmodel', 'delmodel', 'setquarterday','savereminder', 'testreminder'), true)) {
+if (in_array($action, array('setmodule', 'setdoc', 'setdocmodel', 'delmodel', 'setquarterday', 'savereminder', 'testreminder'), true)) {
if (function_exists('dol_verify_token')) {
if (empty($token) || dol_verify_token($token) <= 0) {
accessforbidden();
From 7e1e4a2ae401c12b7c98d846b0837754b2705f3b Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 23:44:18 +0100
Subject: [PATCH 44/96] Fix reminder form submission
---
admin/setup.php | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/admin/setup.php b/admin/setup.php
index 354e2f5..9362a0a 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -350,10 +350,10 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
if ($action === 'savereminder') {
- $reminderEnabledValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_ENABLED', 'int'); var_dump($reminderEnabledValue);
- $reminderWeekdayValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_WEEKDAY', 'int'); var_dump($reminderWeekdayValue);
- $reminderHourValue = trim(GETPOST('TIMESHEETWEEK_REMINDER_HOUR', 'alphanohtml')); var_dump($reminderHourValue);
- $reminderTemplateValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE', 'int'); var_dump($reminderTemplateValue);
+$reminderEnabledValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_ENABLED', 'int');
+$reminderWeekdayValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_WEEKDAY', 'int');
+$reminderHourValue = trim(GETPOST('TIMESHEETWEEK_REMINDER_HOUR', 'alphanohtml'));
+$reminderTemplateValue = (int) GETPOST('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE', 'int');
$error = 0;
@@ -608,11 +608,9 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
print '';
print '';
-print dolGetButtonAction('', ($langs->trans("Save")!='Save'?$langs->trans("Save"):'Enregistrer'), 'default', $_SERVER["PHP_SELF"].'?action=savereminder&token='.$pageToken);
-//print ''.($langs->trans("Save")!='Save'?$langs->trans("Save"):'Enregistrer').' ';
print ' ';
-print dolGetButtonAction('', ($langs->trans("TimesheetWeekReminderSendTest")!='Send a test e-mail'?$langs->trans("TimesheetWeekReminderSendTest"):'Envoyer un mail de test'), 'default', $_SERVER["PHP_SELF"].'?action=testreminder&token='.$pageToken);
-//print ''.($langs->trans("TimesheetWeekReminderSendTest")!='Send a test e-mail'?$langs->trans("TimesheetWeekReminderSendTest"):'Envoyer un mail de test').' ';
print '
';
print '';
From 9a5a0349e497a1e51f85f04c7e3f6b9f9b4291b3 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 23:50:32 +0100
Subject: [PATCH 45/96] Update setup.php
---
admin/setup.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/admin/setup.php b/admin/setup.php
index 9362a0a..30ffc6c 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -40,6 +40,7 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/cemailtemplates.class.php';
// EN: Load document helper functions required for model toggles.
require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
dol_include_once('/timesheetweek/lib/timesheetweek.lib.php');
@@ -62,8 +63,6 @@
$docLabel = GETPOST('label', 'alphanohtml');
$scanDir = GETPOST('scan_dir', 'alpha');
-dol_include_once('/core/class/cemailtemplates.class.php');
-
$form = new Form($db);
$sql = "SELECT rowid, label ";
From 1c02ecbfec863161b4ee26b6cb3e935d9ede7d7d Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 23:52:01 +0100
Subject: [PATCH 46/96] Update setup.php
---
admin/setup.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/setup.php b/admin/setup.php
index 30ffc6c..acef28d 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -40,7 +40,7 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/cemailtemplates.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/cemailtemplate.class.php';
// EN: Load document helper functions required for model toggles.
require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
dol_include_once('/timesheetweek/lib/timesheetweek.lib.php');
From 5c32147cf9004217306336302e987c596e5fc5a2 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Thu, 4 Dec 2025 23:54:12 +0100
Subject: [PATCH 47/96] Update setup.php
---
admin/setup.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/setup.php b/admin/setup.php
index acef28d..e4b1ce3 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -76,7 +76,7 @@
$templateOptions = array();
if ($result) {
while ($obj = $db->fetch_object($result)) {
- $templateOptions[$obj->label] = $obj->label;
+ $templateOptions[(int) $obj->rowid] = $obj->label;
}
}
From 624b5cd1afa4bcf7aca42a5331c1764c839493f7 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 00:03:29 +0100
Subject: [PATCH 48/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index b0de9cb..d08d22f 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -39,11 +39,7 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-if (is_readable(DOL_DOCUMENT_ROOT.'/core/class/cemailtemplates.class.php')) {
- dol_include_once('/core/class/cemailtemplates.class.php');
-} elseif (is_readable(DOL_DOCUMENT_ROOT.'/core/class/emailtemplates.class.php')) {
- dol_include_once('/core/class/emailtemplates.class.php');
-}
+dol_include_once('/core/class/cemailtemplate.class.php');
dol_include_once('/timesheetweek/class/timesheetweek.class.php');
From ae298ff9a3226490a5f104f07f18fe394b7130b9 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 00:05:20 +0100
Subject: [PATCH 49/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index d08d22f..40ae472 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -39,7 +39,7 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-dol_include_once('/core/class/cemailtemplate.class.php');
+require_once DOL_DOCUMENT_ROOT.'/core/class/cemailtemplate.class.php';
dol_include_once('/timesheetweek/class/timesheetweek.class.php');
From 7128da62f13192e83ed93019b745c730d11982ec Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 00:07:52 +0100
Subject: [PATCH 50/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index 40ae472..713525e 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -120,10 +120,8 @@ public static function run($db, $limit = 0, $forcerun = 0, array $targetUserIds
}
$emailTemplateClass = '';
- if (class_exists('CEmailTemplates')) {
- $emailTemplateClass = 'CEmailTemplates';
- } elseif (class_exists('EmailTemplates')) {
- $emailTemplateClass = 'EmailTemplates';
+ if (class_exists('CEmailTemplate')) {
+ $emailTemplateClass = 'CEmailTemplate';
}
if (empty($emailTemplateClass)) {
From 65e3c4c4ebd968ef974fa2a3b091bcaa6cbf97b3 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 00:13:10 +0100
Subject: [PATCH 51/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index 713525e..9b89638 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -89,6 +89,7 @@ public static function run($db, $limit = 0, $forcerun = 0, array $targetUserIds
}
$templateIdConst = dolibarr_get_const($db, 'TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE', $conf->entity);
+ var_dump($templateIdConst);
$templateId = !empty($templateIdConst) ? (int) $templateIdConst : 0;
if (empty($templateId)) {
dol_syslog($langs->trans('TimesheetWeekReminderTemplateMissing'), LOG_WARNING);
From 777f098195ce32284fc02b2f8cc984a9a6060221 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 00:28:46 +0100
Subject: [PATCH 52/96] Use CEmailTemplate apifetch for reminders
---
class/timesheetweek_reminder.class.php | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index 9b89638..c777bf9 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -89,7 +89,6 @@ public static function run($db, $limit = 0, $forcerun = 0, array $targetUserIds
}
$templateIdConst = dolibarr_get_const($db, 'TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE', $conf->entity);
- var_dump($templateIdConst);
$templateId = !empty($templateIdConst) ? (int) $templateIdConst : 0;
if (empty($templateId)) {
dol_syslog($langs->trans('TimesheetWeekReminderTemplateMissing'), LOG_WARNING);
@@ -119,19 +118,26 @@ public static function run($db, $limit = 0, $forcerun = 0, array $targetUserIds
return 0;
}
}
-
- $emailTemplateClass = '';
+
+ $emailTemplate = null;
+ $templateFetch = 0;
if (class_exists('CEmailTemplate')) {
- $emailTemplateClass = 'CEmailTemplate';
+ $emailTemplate = new CEmailTemplate($db);
+ if (method_exists($emailTemplate, 'apifetch')) {
+ $templateFetch = $emailTemplate->apifetch($templateId);
+ } else {
+ $templateFetch = $emailTemplate->fetch($templateId);
+ }
+ } elseif (class_exists('EmailTemplate')) {
+ $emailTemplate = new EmailTemplate($db);
+ $templateFetch = $emailTemplate->fetch($templateId);
}
- if (empty($emailTemplateClass)) {
+ if (empty($emailTemplate)) {
dol_syslog($langs->trans('TimesheetWeekReminderTemplateMissing'), LOG_ERR);
return -1;
}
- $emailTemplate = new $emailTemplateClass($db);
- $templateFetch = $emailTemplate->fetch($templateId);
if ($templateFetch <= 0) {
dol_syslog($langs->trans('TimesheetWeekReminderTemplateMissing'), LOG_WARNING);
return 0;
From 5f6461448b3b91a4c2a40a45c8611272598b0f0b Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 00:38:39 +0100
Subject: [PATCH 53/96] Handle cron reminder without explicit db argument
---
class/timesheetweek_reminder.class.php | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index c777bf9..ca3b1c3 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -59,10 +59,20 @@ class TimesheetweekReminder
* @param array $targetUserIds Limit execution to specific user ids when provided
* @return int <0 if KO, >=0 if OK (number of emails sent)
*/
- public static function run($db, $limit = 0, $forcerun = 0, array $targetUserIds = array())
+ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array $targetUserIds = array())
{
global $conf, $langs;
+ $db = $dbInstance;
+ if (empty($db) && !empty($GLOBALS['db'])) {
+ $db = $GLOBALS['db'];
+ }
+
+ if (empty($db)) {
+ dol_syslog($langs->transnoentitiesnoconv('ErrorNoDatabase'), LOG_ERR);
+ return -1;
+ }
+
$langs->loadLangs(array('timesheetweek@timesheetweek'));
dol_syslog(__METHOD__, LOG_DEBUG);
From b8d064059061eff22cf78453c6262c5e3e1f53f7 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 00:51:34 +0100
Subject: [PATCH 54/96] Fix reminder globals and cron activation
---
class/timesheetweek_reminder.class.php | 20 ++--
core/modules/modTimesheetWeek.class.php | 144 +++++++++++++-----------
2 files changed, 88 insertions(+), 76 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index ca3b1c3..efd6b66 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -44,14 +44,12 @@
dol_include_once('/timesheetweek/class/timesheetweek.class.php');
/**
- * EN: Cron helper used to send weekly reminders.
- * FR: Assistant cron utilisé pour envoyer les rappels hebdomadaires.
+ * Cron helper used to send weekly reminders.
*/
class TimesheetweekReminder
{
- /**
- * EN: Run cron job to send weekly reminder emails.
- * FR: Exécuter la tâche planifiée pour envoyer les rappels hebdomadaires par email.
+/**
+ * Run cron job to send weekly reminder emails.
*
* @param DoliDB $db Database handler
* @param int $limit Optional limit for recipients
@@ -77,29 +75,25 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
dol_syslog(__METHOD__, LOG_DEBUG);
- $reminderEnabledConst = dolibarr_get_const($db, 'TIMESHEETWEEK_REMINDER_ENABLED', $conf->entity);
- $reminderEnabled = !empty($reminderEnabledConst) ? (int) $reminderEnabledConst : 0;
+ $reminderEnabled = getDolGlobalInt('TIMESHEETWEEK_REMINDER_ENABLED', 0, $conf->entity);
if (empty($reminderEnabled) && empty($forcerun)) {
dol_syslog('TimesheetweekReminder: reminder disabled', LOG_INFO);
return 0;
}
- $reminderWeekdayConst = dolibarr_get_const($db, 'TIMESHEETWEEK_REMINDER_WEEKDAY', $conf->entity);
- $reminderWeekday = !empty($reminderWeekdayConst) ? (int) $reminderWeekdayConst : 1;
+ $reminderWeekday = getDolGlobalInt('TIMESHEETWEEK_REMINDER_WEEKDAY', 1, $conf->entity);
if ($reminderWeekday < 1 || $reminderWeekday > 7) {
dol_syslog($langs->trans('TimesheetWeekReminderWeekdayInvalid'), LOG_ERR);
return -1;
}
- $reminderHourConst = dolibarr_get_const($db, 'TIMESHEETWEEK_REMINDER_HOUR', $conf->entity);
- $reminderHour = !empty($reminderHourConst) ? $reminderHourConst : '18:00';
+ $reminderHour = getDolGlobalString('TIMESHEETWEEK_REMINDER_HOUR', '18:00', $conf->entity);
if (!preg_match('/^(?:[01]\\d|2[0-3]):[0-5]\\d$/', $reminderHour)) {
dol_syslog($langs->trans('TimesheetWeekReminderHourInvalid'), LOG_ERR);
return -1;
}
- $templateIdConst = dolibarr_get_const($db, 'TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE', $conf->entity);
- $templateId = !empty($templateIdConst) ? (int) $templateIdConst : 0;
+ $templateId = getDolGlobalInt('TIMESHEETWEEK_REMINDER_EMAIL_TEMPLATE', 0, $conf->entity);
if (empty($templateId)) {
dol_syslog($langs->trans('TimesheetWeekReminderTemplateMissing'), LOG_WARNING);
return 0;
diff --git a/core/modules/modTimesheetWeek.class.php b/core/modules/modTimesheetWeek.class.php
index 0417782..d446e60 100644
--- a/core/modules/modTimesheetWeek.class.php
+++ b/core/modules/modTimesheetWeek.class.php
@@ -319,7 +319,7 @@ public function __construct($db)
'comment' => 'TimesheetWeekReminderCronComment',
'frequency' => 1,
'unitfrequency' => 86400,
- 'status' => 0,
+ 'status' => 1,
'test' => 'isModEnabled("timesheetweek")',
'priority' => 50,
),
@@ -879,88 +879,106 @@ public function init($options = '')
dolibarr_set_const($this->db, 'TIMESHEETWEEK_ADDON_PDF', 'standard_timesheetweek', 'chaine', 0, '', $conf->entity);
}
- // EN: Register Multicompany sharing metadata when the module is enabled.
- // FR: Enregistrer les métadonnées de partage Multicompany lors de l'activation du module.
- dol_include_once('/timesheetweek/class/actions_timesheetweek.class.php');
-
- // EN: Start from the current external module sharing configuration or an empty set.
- // FR: Partir de la configuration de partage des modules externes actuelle ou d'un ensemble vide.
- $externalmodule = json_decode((string) ($conf->global->MULTICOMPANY_EXTERNAL_MODULES_SHARING ?? ''), true);
- if (!is_array($externalmodule)) {
- // EN: Guarantee an array structure even when the constant is missing or invalid.
- // FR: Garantir une structure de tableau même lorsque la constante est absente ou invalide.
- $externalmodule = array();
- }
+ // Register Multicompany sharing metadata when the module is enabled.
+ dol_include_once('/timesheetweek/class/actions_timesheetweek.class.php');
- // EN: Initialize the parameters container before filling it with sharing data.
- // FR: Initialiser le conteneur de paramètres avant de le remplir avec les données de partage.
- $params = array();
- if (class_exists('ActionsTimesheetweek')) {
- // EN: Reuse the hook helper to expose the sharing parameters to Multicompany.
- // FR: Réutiliser l'assistant de hook pour exposer les paramètres de partage à Multicompany.
- $params = ActionsTimesheetweek::getMulticompanySharingDefinition();
- }
+ // Start from the current external module sharing configuration or an empty set.
+ $externalmodule = json_decode((string) ($conf->global->MULTICOMPANY_EXTERNAL_MODULES_SHARING ?? ''), true);
+ if (!is_array($externalmodule)) {
+ // Guarantee an array structure even when the constant is missing or invalid.
+ $externalmodule = array();
+ }
+
+ // Initialize the parameters container before filling it with sharing data.
+ $params = array();
+ if (class_exists('ActionsTimesheetweek')) {
+ // Reuse the hook helper to expose the sharing parameters to Multicompany.
+ $params = ActionsTimesheetweek::getMulticompanySharingDefinition();
+ }
if (!empty($params)) {
- // EN: Merge TimesheetWeek definitions with any existing external module configuration.
- // FR: Fusionner les définitions TimesheetWeek avec toute configuration de module externe existante.
+ // Merge TimesheetWeek definitions with any existing external module configuration.
$externalmodule = array_merge($externalmodule, $params);
-
- // EN: Persist the refreshed configuration in the Dolibarr constants table.
- // FR: Persister la configuration actualisée dans la table des constantes de Dolibarr.
+
+ // Persist the refreshed configuration in the Dolibarr constants table.
$jsonformat = json_encode($externalmodule);
- dolibarr_set_const($this->db, "MULTICOMPANY_EXTERNAL_MODULES_SHARING", $jsonformat, "chaine", 0, "", $conf->entity);
+ dolibarr_set_const($this->db, 'MULTICOMPANY_EXTERNAL_MODULES_SHARING', $jsonformat, 'chaine', 0, '', $conf->entity);
}
-
+
$resultInit = $this->_init($sql, $options);
if ($resultInit <= 0) {
return $resultInit;
}
-
+
+ $cronStatus = $this->setReminderCronStatus(1);
+ if ($cronStatus < 0) {
+ return $cronStatus;
+ }
+
return $resultInit;
}
/**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted
+ * Function called when module is disabled.
+ * Remove from database constants, boxes and permissions from Dolibarr database.
+ * Data directories are not deleted
*
- * @param string $options Options when enabling module ('', 'noboxes')
- * @return int<-1,1> 1 if OK, <=0 if KO
+ * @param string $options Options when enabling module ('', 'noboxes')
+ * @return int<-1,1> 1 if OK, <=0 if KO
*/
public function remove($options = '')
{
- // EN: Access the global configuration to manipulate stored constants.
- // FR: Accéder à la configuration globale pour manipuler les constantes stockées.
- global $conf;
-
- // EN: Load the hook helper to clean the sharing definition on deactivation.
- // FR: Charger l'assistant de hook pour nettoyer la définition de partage à la désactivation.
- dol_include_once('/timesheetweek/class/actions_timesheetweek.class.php');
-
- // EN: Decode the current external module sharing configuration safely.
- // FR: Décoder prudemment la configuration de partage des modules externes actuelle.
- $externalmodule = json_decode((string) ($conf->global->MULTICOMPANY_EXTERNAL_MODULES_SHARING ?? ''), true);
- if (!is_array($externalmodule)) {
- // EN: Fallback to an empty array when the stored value is not valid JSON.
- // FR: Revenir à un tableau vide lorsque la valeur stockée n'est pas un JSON valide.
- $externalmodule = array();
- }
+ // Access the global configuration to manipulate stored constants.
+ global $conf;
+
+ // Load the hook helper to clean the sharing definition on deactivation.
+ dol_include_once('/timesheetweek/class/actions_timesheetweek.class.php');
+
+ // Decode the current external module sharing configuration safely.
+ $externalmodule = json_decode((string) ($conf->global->MULTICOMPANY_EXTERNAL_MODULES_SHARING ?? ''), true);
+ if (!is_array($externalmodule)) {
+ // Fallback to an empty array when the stored value is not valid JSON.
+ $externalmodule = array();
+ }
- // EN: Determine the key used to store TimesheetWeek sharing data.
- // FR: Déterminer la clé utilisée pour stocker les données de partage TimesheetWeek.
- $sharingKey = class_exists('ActionsTimesheetweek') ? ActionsTimesheetweek::MULTICOMPANY_SHARING_ROOT_KEY : 'timesheetweek';
+ // Determine the key used to store TimesheetWeek sharing data.
+ $sharingKey = class_exists('ActionsTimesheetweek') ? ActionsTimesheetweek::MULTICOMPANY_SHARING_ROOT_KEY : 'timesheetweek';
- // EN: Remove the module definition so Multicompany forgets our sharing options.
- // FR: Retirer la définition du module pour que Multicompany oublie nos options de partage.
- unset($externalmodule[$sharingKey]);
+ // Remove the module definition so Multicompany forgets our sharing options.
+ unset($externalmodule[$sharingKey]);
- // EN: Persist the cleaned configuration back into Dolibarr constants.
- // FR: Persister la configuration nettoyée dans les constantes Dolibarr.
- $jsonformat = json_encode($externalmodule);
- dolibarr_set_const($this->db, 'MULTICOMPANY_EXTERNAL_MODULES_SHARING', $jsonformat, 'chaine', 0, '', $conf->entity);
+ // Persist the cleaned configuration back into Dolibarr constants.
+ $jsonformat = json_encode($externalmodule);
+ dolibarr_set_const($this->db, 'MULTICOMPANY_EXTERNAL_MODULES_SHARING', $jsonformat, 'chaine', 0, '', $conf->entity);
- $sql = array();
- return $this->_remove($sql, $options);
- }
+ $this->setReminderCronStatus(0);
+
+ $sql = array();
+ return $this->_remove($sql, $options);
+ }
+
+ /**
+ * Update the cron status for the reminder job.
+ *
+ * @param int $status Target status (1 enabled, 0 disabled)
+ * @return int 1 if OK, <0 if error
+ */
+ protected function setReminderCronStatus($status)
+ {
+ if (empty($this->db)) {
+ return -1;
+ }
+
+ $statusValue = ((int) $status === 1) ? 1 : 0;
+ $sql = 'UPDATE '.MAIN_DB_PREFIX."cronjob SET status = ".$statusValue;
+ $sql .= " WHERE jobtype = 'method' AND class = '/timesheetweek/class/timesheetweek_reminder.class.php' AND method = 'run'";
+
+ $resql = $this->db->query($sql);
+ if (!$resql) {
+ $this->error = $this->db->lasterror();
+ return -1;
+ }
+
+ return 1;
+ }
}
From 1460794a4485d3bc1f17aa597ef7ceea0f9d453f Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 00:56:45 +0100
Subject: [PATCH 55/96] Update modTimesheetWeek.class.php
---
core/modules/modTimesheetWeek.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/modules/modTimesheetWeek.class.php b/core/modules/modTimesheetWeek.class.php
index d446e60..9115b21 100644
--- a/core/modules/modTimesheetWeek.class.php
+++ b/core/modules/modTimesheetWeek.class.php
@@ -971,7 +971,7 @@ protected function setReminderCronStatus($status)
$statusValue = ((int) $status === 1) ? 1 : 0;
$sql = 'UPDATE '.MAIN_DB_PREFIX."cronjob SET status = ".$statusValue;
- $sql .= " WHERE jobtype = 'method' AND class = '/timesheetweek/class/timesheetweek_reminder.class.php' AND method = 'run'";
+ $sql .= " WHERE jobtype = 'method' AND classesname = '/timesheetweek/class/timesheetweek_reminder.class.php' AND method = 'run'";
$resql = $this->db->query($sql);
if (!$resql) {
From ab45046921197b0090ae3cf9fef9f139d8464674 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 00:59:08 +0100
Subject: [PATCH 56/96] Update modTimesheetWeek.class.php
---
core/modules/modTimesheetWeek.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/modules/modTimesheetWeek.class.php b/core/modules/modTimesheetWeek.class.php
index 9115b21..9ec4027 100644
--- a/core/modules/modTimesheetWeek.class.php
+++ b/core/modules/modTimesheetWeek.class.php
@@ -971,7 +971,7 @@ protected function setReminderCronStatus($status)
$statusValue = ((int) $status === 1) ? 1 : 0;
$sql = 'UPDATE '.MAIN_DB_PREFIX."cronjob SET status = ".$statusValue;
- $sql .= " WHERE jobtype = 'method' AND classesname = '/timesheetweek/class/timesheetweek_reminder.class.php' AND method = 'run'";
+ $sql .= " WHERE jobtype = 'method' AND classesname = '/timesheetweek/class/timesheetweek_reminder.class.php' AND methodename = 'run'";
$resql = $this->db->query($sql);
if (!$resql) {
From c351d4d59db939266855f0a1bb473e137a250cf7 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 00:59:32 +0100
Subject: [PATCH 57/96] Update modTimesheetWeek.class.php
---
core/modules/modTimesheetWeek.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/modules/modTimesheetWeek.class.php b/core/modules/modTimesheetWeek.class.php
index 9ec4027..23b699b 100644
--- a/core/modules/modTimesheetWeek.class.php
+++ b/core/modules/modTimesheetWeek.class.php
@@ -112,7 +112,7 @@ public function __construct($db)
}
// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated', 'experimental_deprecated' or a version string like 'x.y.z'
- $this->version = '1.5.0';
+ $this->version = '1.6.0';
// Url to the file with your last numberversion of this module
$this->url_last_version = 'https://moduleversion.lesmetiersdubatiment.fr/ver.php?m=timesheetweek';
From 94c328ed1097a454c219dfa022498e6da0b5683b Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 01:01:13 +0100
Subject: [PATCH 58/96] Update setup.php
---
admin/setup.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin/setup.php b/admin/setup.php
index e4b1ce3..159f73f 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -607,9 +607,9 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
print '';
print '';
-print ''.($langs->trans("Save")!='Save'?$langs->trans("Save"):'Enregistrer').' ';
+print ''.($langs->trans("Save")!='Save'?$langs->trans("Save"):'Enregistrer').' ';
print ' ';
-print ''.($langs->trans("TimesheetWeekReminderSendTest")!='Send a test e-mail'?$langs->trans("TimesheetWeekReminderSendTest"):'Envoyer un mail de test').' ';
+print ''.($langs->trans("TimesheetWeekReminderSendTest")!='Send a test e-mail'?$langs->trans("TimesheetWeekReminderSendTest"):'Envoyer un mail de test').' ';
print '
';
print '';
From 6a9aa6b903d41b7e2bc072dec4c1c28ec105fcde Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 01:06:41 +0100
Subject: [PATCH 59/96] Update modTimesheetWeek.class.php
---
core/modules/modTimesheetWeek.class.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/modules/modTimesheetWeek.class.php b/core/modules/modTimesheetWeek.class.php
index 23b699b..a3a4900 100644
--- a/core/modules/modTimesheetWeek.class.php
+++ b/core/modules/modTimesheetWeek.class.php
@@ -317,8 +317,8 @@ public function __construct($db)
'method' => 'run',
'parameters' => '',
'comment' => 'TimesheetWeekReminderCronComment',
- 'frequency' => 1,
- 'unitfrequency' => 86400,
+ 'frequency' => 5,
+ 'unitfrequency' => 60,
'status' => 1,
'test' => 'isModEnabled("timesheetweek")',
'priority' => 50,
From b7b366ee9bff6e806fc05d22a5ba3cc4c07f0971 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 01:12:39 +0100
Subject: [PATCH 60/96] Fix reminder cron email template loading
---
class/timesheetweek_reminder.class.php | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index efd6b66..2a38910 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -39,7 +39,6 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/cemailtemplate.class.php';
dol_include_once('/timesheetweek/class/timesheetweek.class.php');
@@ -73,6 +72,22 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
$langs->loadLangs(array('timesheetweek@timesheetweek'));
+ $emailTemplateClassFile = '';
+ if (is_readable(DOL_DOCUMENT_ROOT.'/core/class/cemailtemplate.class.php')) {
+ $emailTemplateClassFile = '/core/class/cemailtemplate.class.php';
+ } elseif (is_readable(DOL_DOCUMENT_ROOT.'/core/class/emailtemplate.class.php')) {
+ $emailTemplateClassFile = '/core/class/emailtemplate.class.php';
+ }
+
+ if (!empty($emailTemplateClassFile)) {
+ dol_include_once($emailTemplateClassFile);
+ }
+
+ if (!class_exists('CEmailTemplate') && !class_exists('EmailTemplate')) {
+ dol_syslog($langs->trans('ErrorFailedToLoadEmailTemplateClass'), LOG_ERR);
+ return -1;
+ }
+
dol_syslog(__METHOD__, LOG_DEBUG);
$reminderEnabled = getDolGlobalInt('TIMESHEETWEEK_REMINDER_ENABLED', 0, $conf->entity);
From bee5c7599270a3bcba7ec6a0434d6b5b37927763 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 01:28:19 +0100
Subject: [PATCH 61/96] Allow forced reminder cron execution
---
class/timesheetweek_reminder.class.php | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index 2a38910..d9eec08 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -72,6 +72,11 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
$langs->loadLangs(array('timesheetweek@timesheetweek'));
+ $forceExecution = !empty($forcerun);
+ if (!$forceExecution) {
+ $forceExecution = ((int) GETPOST('forcerun', 'int') > 0);
+ }
+
$emailTemplateClassFile = '';
if (is_readable(DOL_DOCUMENT_ROOT.'/core/class/cemailtemplate.class.php')) {
$emailTemplateClassFile = '/core/class/cemailtemplate.class.php';
@@ -91,7 +96,7 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
dol_syslog(__METHOD__, LOG_DEBUG);
$reminderEnabled = getDolGlobalInt('TIMESHEETWEEK_REMINDER_ENABLED', 0, $conf->entity);
- if (empty($reminderEnabled) && empty($forcerun)) {
+ if (empty($reminderEnabled) && empty($forceExecution)) {
dol_syslog('TimesheetweekReminder: reminder disabled', LOG_INFO);
return 0;
}
@@ -126,15 +131,15 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
$windowMinutes = 60;
$lowerBound = max(0, $targetMinutes - $windowMinutes);
$upperBound = min(1440, $targetMinutes + $windowMinutes);
-
- if (empty($forcerun)) {
+
+ if (empty($forceExecution)) {
if ($currentWeekdayIso !== $reminderWeekday) {
- dol_syslog('TimesheetweekReminder: not the configured day, skipping execution', LOG_DEBUG);
- return 0;
+ dol_syslog('TimesheetweekReminder: not the configured day, skipping execution', LOG_DEBUG);
+ return 0;
}
if ($currentMinutes < $lowerBound || $currentMinutes > $upperBound) {
- dol_syslog('TimesheetweekReminder: outside configured time window, skipping execution', LOG_DEBUG);
- return 0;
+ dol_syslog('TimesheetweekReminder: outside configured time window, skipping execution', LOG_DEBUG);
+ return 0;
}
}
@@ -177,7 +182,7 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
$substitutions = getCommonSubstitutionArray($langs, 0, null, null, null);
complete_substitutions_array($substitutions, $langs, null);
-
+
$eligibleRights = array(
45000301, // read own
45000302, // read child
@@ -192,7 +197,7 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
45000314, // seal
45000315, // unseal
);
-
+
$entityFilter = getEntity('user');
$sql = 'SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.email';
$sql .= ' FROM '.MAIN_DB_PREFIX."user AS u";
From 47030d04997f747c6204dda90e70e6898cebc42e Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 01:46:48 +0100
Subject: [PATCH 62/96] Handle forced reminder triggers and HTML content
---
class/timesheetweek_reminder.class.php | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index d9eec08..d680529 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -74,7 +74,14 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
$forceExecution = !empty($forcerun);
if (!$forceExecution) {
- $forceExecution = ((int) GETPOST('forcerun', 'int') > 0);
+ $forceExecution = ((int) GETPOST('forcerun', 'int') > 0);
+ }
+ if (!$forceExecution) {
+ $action = GETPOST('action', 'aZ09');
+ $confirm = GETPOST('confirm', 'alpha');
+ if ($action === 'confirm_execute' && $confirm === 'yes') {
+ $forceExecution = true;
+ }
}
$emailTemplateClassFile = '';
@@ -246,7 +253,12 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
$preparedSubject = make_substitutions($subject, $userSubstitutions);
$preparedBody = make_substitutions($body, $userSubstitutions);
- $mail = new CMailFile($preparedSubject, $recipient, $from, $preparedBody, array(), array(), array(), '', '', 0, 0, '', '', '', 'utf-8');
+ $preparedSubject = dol_string_nohtmltag(html_entity_decode($preparedSubject, ENT_QUOTES, 'UTF-8'));
+ $preparedBodyHtml = html_entity_decode($preparedBody, ENT_QUOTES, 'UTF-8');
+ $isHtmlBody = (!empty($preparedBodyHtml) && preg_match('/<[^>]+>/', $preparedBodyHtml)) ? 1 : 0;
+ $preparedBodyFinal = $isHtmlBody ? $preparedBodyHtml : dol_string_nohtmltag($preparedBodyHtml);
+
+ $mail = new CMailFile($preparedSubject, $recipient, $from, $preparedBodyFinal, array(), array(), array(), '', '', 0, $isHtmlBody, '', '', '', 'utf-8');
$resultSend = $mail->sendfile();
if ($resultSend) {
$emailsSent++;
From a83d48d157eef99c2f413d15ccfdaa90c47b8f64 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 08:28:36 +0100
Subject: [PATCH 63/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index d680529..1a6ae53 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -135,9 +135,9 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
list($targetHour, $targetMinute) = explode(':', $reminderHour);
$targetMinutes = ((int) $targetHour * 60) + (int) $targetMinute;
- $windowMinutes = 60;
+ $windowMinutes = 5;
$lowerBound = max(0, $targetMinutes - $windowMinutes);
- $upperBound = min(1440, $targetMinutes + $windowMinutes);
+ $upperBound = min(120, $targetMinutes + $windowMinutes);
if (empty($forceExecution)) {
if ($currentWeekdayIso !== $reminderWeekday) {
From f8b637051fd2aee78db4395f51aad3294a1f1862 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 08:39:35 +0100
Subject: [PATCH 64/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index 1a6ae53..b09e18e 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -271,11 +271,21 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
$db->free($resql);
- if ($errors > 0) {
+/* if ($errors > 0) {
return -$errors;
- }
-
- return $emailsSent;
+ }*/
+
+// return $emailsSent;
+
+ if ($errors) {
+ $this->error = $langs->trans('TimesheetWeekReminderSendFailed').' '.$errors;
+ dol_syslog(__METHOD__." end - ".$this->error, LOG_ERR);
+ return 1;
+ }else{
+ $this->output = $langs->trans('TimesheetWeekReminderSendSuccess')." ".$emailsSent.".";
+ dol_syslog(__METHOD__." end - ".$this->output, LOG_INFO);
+ return 0;
+ }
}
/**
From 0f9e92b102184aafdcf7625a28c1e5ca24d2a492 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 08:42:37 +0100
Subject: [PATCH 65/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index b09e18e..facfde7 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -278,12 +278,12 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
// return $emailsSent;
if ($errors) {
- $this->error = $langs->trans('TimesheetWeekReminderSendFailed').' '.$errors;
- dol_syslog(__METHOD__." end - ".$this->error, LOG_ERR);
+ $cron_error = $langs->trans('TimesheetWeekReminderSendFailed').' '.$errors;
+ dol_syslog(__METHOD__." end - ".$cron_error, LOG_ERR);
return 1;
}else{
- $this->output = $langs->trans('TimesheetWeekReminderSendSuccess')." ".$emailsSent.".";
- dol_syslog(__METHOD__." end - ".$this->output, LOG_INFO);
+ $cron_output = $langs->trans('TimesheetWeekReminderSendSuccess')." ".$emailsSent.".";
+ dol_syslog(__METHOD__." end - ".$cron_output, LOG_INFO);
return 0;
}
}
From 703a81f5748eb74cffcad44f50c5713657e0e30e Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 08:46:58 +0100
Subject: [PATCH 66/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index facfde7..13840a4 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -42,6 +42,20 @@
dol_include_once('/timesheetweek/class/timesheetweek.class.php');
+/**
+ * Constructor
+ *
+ * @param DoliDB $db Database handler
+ */
+public function __construct(DoliDB $db)
+{
+ global $conf, $langs ;
+ $this->db = $db;
+ //var_dump($db);
+ $this->ismultientitymanaged = 1;
+ $this->isextrafieldmanaged = 1;
+}
+
/**
* Cron helper used to send weekly reminders.
*/
@@ -278,12 +292,12 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
// return $emailsSent;
if ($errors) {
- $cron_error = $langs->trans('TimesheetWeekReminderSendFailed').' '.$errors;
- dol_syslog(__METHOD__." end - ".$cron_error, LOG_ERR);
+ $this->error = $langs->trans('TimesheetWeekReminderSendFailed').' '.$errors;
+ dol_syslog(__METHOD__." end - ".$this->error, LOG_ERR);
return 1;
}else{
- $cron_output = $langs->trans('TimesheetWeekReminderSendSuccess')." ".$emailsSent.".";
- dol_syslog(__METHOD__." end - ".$cron_output, LOG_INFO);
+ $this->output = $langs->trans('TimesheetWeekReminderSendSuccess')." ".$emailsSent.".";
+ dol_syslog(__METHOD__." end - ".$this->output, LOG_INFO);
return 0;
}
}
From aa5927f01cf7a0110d228d19d6f3ac52511261ab Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 08:48:04 +0100
Subject: [PATCH 67/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 27 +++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index 13840a4..420bcd4 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -42,25 +42,26 @@
dol_include_once('/timesheetweek/class/timesheetweek.class.php');
-/**
- * Constructor
- *
- * @param DoliDB $db Database handler
- */
-public function __construct(DoliDB $db)
-{
- global $conf, $langs ;
- $this->db = $db;
- //var_dump($db);
- $this->ismultientitymanaged = 1;
- $this->isextrafieldmanaged = 1;
-}
/**
* Cron helper used to send weekly reminders.
*/
class TimesheetweekReminder
{
+ /**
+ * Constructor
+ *
+ * @param DoliDB $db Database handler
+ */
+ public function __construct(DoliDB $db)
+ {
+ global $conf, $langs ;
+ $this->db = $db;
+ //var_dump($db);
+ $this->ismultientitymanaged = 1;
+ $this->isextrafieldmanaged = 1;
+ }
+
/**
* Run cron job to send weekly reminder emails.
*
From 285d839ebbcdcfc6c781ac05204e6461eeed5e70 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 08:51:02 +0100
Subject: [PATCH 68/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index 420bcd4..a62d254 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -73,18 +73,19 @@ public function __construct(DoliDB $db)
*/
public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array $targetUserIds = array())
{
- global $conf, $langs;
+ global $db, $conf, $langs;
$db = $dbInstance;
+ /*
if (empty($db) && !empty($GLOBALS['db'])) {
$db = $GLOBALS['db'];
}
-
+
if (empty($db)) {
dol_syslog($langs->transnoentitiesnoconv('ErrorNoDatabase'), LOG_ERR);
return -1;
}
-
+ */
$langs->loadLangs(array('timesheetweek@timesheetweek'));
$forceExecution = !empty($forcerun);
From 46fd9ada2737dd74d80388f756aaf26948441906 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 08:52:02 +0100
Subject: [PATCH 69/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index a62d254..12e4671 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -75,8 +75,8 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
{
global $db, $conf, $langs;
- $db = $dbInstance;
/*
+ $db = $dbInstance;
if (empty($db) && !empty($GLOBALS['db'])) {
$db = $GLOBALS['db'];
}
From 53c38601fb665f714c9f1bf70142351ae7953bff Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 08:53:20 +0100
Subject: [PATCH 70/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index 12e4671..c641b44 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -48,19 +48,6 @@
*/
class TimesheetweekReminder
{
- /**
- * Constructor
- *
- * @param DoliDB $db Database handler
- */
- public function __construct(DoliDB $db)
- {
- global $conf, $langs ;
- $this->db = $db;
- //var_dump($db);
- $this->ismultientitymanaged = 1;
- $this->isextrafieldmanaged = 1;
- }
/**
* Run cron job to send weekly reminder emails.
@@ -73,9 +60,8 @@ public function __construct(DoliDB $db)
*/
public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array $targetUserIds = array())
{
- global $db, $conf, $langs;
+ global $conf, $langs;
- /*
$db = $dbInstance;
if (empty($db) && !empty($GLOBALS['db'])) {
$db = $GLOBALS['db'];
@@ -85,7 +71,7 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
dol_syslog($langs->transnoentitiesnoconv('ErrorNoDatabase'), LOG_ERR);
return -1;
}
- */
+
$langs->loadLangs(array('timesheetweek@timesheetweek'));
$forceExecution = !empty($forcerun);
From 78e8e2acb99f4968566f63856e076667230dd83b Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 09:00:54 +0100
Subject: [PATCH 71/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index c641b44..a5fc457 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -280,13 +280,15 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
// return $emailsSent;
if ($errors) {
- $this->error = $langs->trans('TimesheetWeekReminderSendFailed').' '.$errors;
- dol_syslog(__METHOD__." end - ".$this->error, LOG_ERR);
- return 1;
+ $result = 1;
+ $result->error = $langs->trans('TimesheetWeekReminderSendFailed').' '.$errors;
+ dol_syslog(__METHOD__." end - ".$result->error, LOG_ERR);
+ return $result;
}else{
- $this->output = $langs->trans('TimesheetWeekReminderSendSuccess')." ".$emailsSent.".";
- dol_syslog(__METHOD__." end - ".$this->output, LOG_INFO);
- return 0;
+ $result = 0;
+ $result->output = $langs->trans('TimesheetWeekReminderSendSuccess')." ".$emailsSent.".";
+ dol_syslog(__METHOD__." end - ".$result->output, LOG_INFO);
+ return $result;
}
}
From 8e66ac118653ed370ff2deee607ef0d2e09473c9 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 09:09:18 +0100
Subject: [PATCH 72/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 30 ++++++++++++++++----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index a5fc457..fda3db4 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -48,9 +48,17 @@
*/
class TimesheetweekReminder
{
-
-/**
- * Run cron job to send weekly reminder emails.
+ public $db;
+ public $error;
+ public $errors = array();
+ public $output;
+
+ public function __construct(DoliDB $db)
+ {
+ $this->db = $db;
+ }
+ /**
+ * Run cron job to send weekly reminder emails.
*
* @param DoliDB $db Database handler
* @param int $limit Optional limit for recipients
@@ -58,9 +66,9 @@ class TimesheetweekReminder
* @param array $targetUserIds Limit execution to specific user ids when provided
* @return int <0 if KO, >=0 if OK (number of emails sent)
*/
- public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array $targetUserIds = array())
+ public function run($dbInstance = null, $limit = 0, $forcerun = 0, array $targetUserIds = array())
{
- global $conf, $langs;
+ global $db, $conf, $user, $langs;
$db = $dbInstance;
if (empty($db) && !empty($GLOBALS['db'])) {
@@ -280,14 +288,14 @@ public static function run($dbInstance = null, $limit = 0, $forcerun = 0, array
// return $emailsSent;
if ($errors) {
- $result = 1;
- $result->error = $langs->trans('TimesheetWeekReminderSendFailed').' '.$errors;
- dol_syslog(__METHOD__." end - ".$result->error, LOG_ERR);
+ //$result = 1;
+ $this->error = $langs->trans('TimesheetWeekReminderSendFailed').' '.$errors;
+ dol_syslog(__METHOD__." end - ".$this->error, LOG_ERR);
return $result;
}else{
- $result = 0;
- $result->output = $langs->trans('TimesheetWeekReminderSendSuccess')." ".$emailsSent.".";
- dol_syslog(__METHOD__." end - ".$result->output, LOG_INFO);
+ //$result = 0;
+ $this->output = $langs->trans('TimesheetWeekReminderSendSuccess')." ".$emailsSent.".";
+ dol_syslog(__METHOD__." end - ".$this->output, LOG_INFO);
return $result;
}
}
From afcef97b657b2846eb1fc0b59fa67d102e4d9377 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 09:12:21 +0100
Subject: [PATCH 73/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index fda3db4..085e633 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -69,12 +69,12 @@ public function __construct(DoliDB $db)
public function run($dbInstance = null, $limit = 0, $forcerun = 0, array $targetUserIds = array())
{
global $db, $conf, $user, $langs;
-
+ /*
$db = $dbInstance;
if (empty($db) && !empty($GLOBALS['db'])) {
$db = $GLOBALS['db'];
}
-
+ */
if (empty($db)) {
dol_syslog($langs->transnoentitiesnoconv('ErrorNoDatabase'), LOG_ERR);
return -1;
From 550ab23c2f78cfc4b5ad477aa5d53715d974412a Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 09:13:56 +0100
Subject: [PATCH 74/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index 085e633..c0311da 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -309,6 +309,6 @@ public function run($dbInstance = null, $limit = 0, $forcerun = 0, array $target
*/
public static function sendTest($db, User $user)
{
- return self::run($db, 1, 1, array((int) $user->id));
+ return self:run($db, 1, 1, array((int) $user->id));
}
}
From b5aee602deebb3acdd1c75d522e7204f9dbd065a Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 09:45:09 +0100
Subject: [PATCH 75/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index c0311da..4866fbc 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -46,7 +46,7 @@
/**
* Cron helper used to send weekly reminders.
*/
-class TimesheetweekReminder
+class TimesheetweekReminder extends CommonObject
{
public $db;
public $error;
@@ -309,6 +309,6 @@ public function run($dbInstance = null, $limit = 0, $forcerun = 0, array $target
*/
public static function sendTest($db, User $user)
{
- return self:run($db, 1, 1, array((int) $user->id));
+ return self::run($db, 1, 1, array((int) $user->id));
}
}
From 0729a02d9c5a32120b54c3206832987abe39dbe8 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 09:46:16 +0100
Subject: [PATCH 76/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index 4866fbc..7a92832 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -309,6 +309,6 @@ public function run($dbInstance = null, $limit = 0, $forcerun = 0, array $target
*/
public static function sendTest($db, User $user)
{
- return self::run($db, 1, 1, array((int) $user->id));
+ return run($db, 1, 1, array((int) $user->id));
}
}
From 3f3e3bef33b22273fbf7fe9bf046a5b2d0d0f227 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 09:47:09 +0100
Subject: [PATCH 77/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index 7a92832..6748512 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -307,8 +307,8 @@ public function run($dbInstance = null, $limit = 0, $forcerun = 0, array $target
* @param User $user Current user
* @return int <0 if KO, >=0 if OK (number of emails sent)
*/
- public static function sendTest($db, User $user)
+ public function sendTest($db, User $user)
{
- return run($db, 1, 1, array((int) $user->id));
+ return self::run($db, 1, 1, array((int) $user->id));
}
}
From ccab5b550838f01b1bb07082c863af34a73ca62a Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 10:50:12 +0100
Subject: [PATCH 78/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index 6748512..e0ae3dd 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -291,12 +291,12 @@ public function run($dbInstance = null, $limit = 0, $forcerun = 0, array $target
//$result = 1;
$this->error = $langs->trans('TimesheetWeekReminderSendFailed').' '.$errors;
dol_syslog(__METHOD__." end - ".$this->error, LOG_ERR);
- return $result;
+ return 1;
}else{
//$result = 0;
$this->output = $langs->trans('TimesheetWeekReminderSendSuccess')." ".$emailsSent.".";
dol_syslog(__METHOD__." end - ".$this->output, LOG_INFO);
- return $result;
+ return 0;
}
}
From 000d05bb406590f371bca36cba6b1bcc3f2934b1 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 10:52:31 +0100
Subject: [PATCH 79/96] Update setup.php
---
admin/setup.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/setup.php b/admin/setup.php
index 159f73f..6e3507e 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -390,7 +390,7 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
if ($action === 'testreminder') {
- $resultTest = TimesheetweekReminder::sendTest($db, $user);
+ $resultTest = sendTest($db, $user); //$resultTest = TimesheetweekReminder::sendTest($db, $user);
if ($resultTest > 0) {
setEventMessages($langs->trans('TimesheetWeekReminderTestSuccess', $resultTest), null, 'mesgs');
} else {
From 55c4d7b080f5f9e70d4a500f7d10e07c166c1b21 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:00:02 +0100
Subject: [PATCH 80/96] Update setup.php
---
admin/setup.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/admin/setup.php b/admin/setup.php
index 6e3507e..80f8a8d 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -390,7 +390,8 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
}
if ($action === 'testreminder') {
- $resultTest = sendTest($db, $user); //$resultTest = TimesheetweekReminder::sendTest($db, $user);
+ $reminder = new TimesheetweekReminder($db);
+ $resultTest = $reminder->sendTest($db, $user); //$resultTest = TimesheetweekReminder::sendTest($db, $user);
if ($resultTest > 0) {
setEventMessages($langs->trans('TimesheetWeekReminderTestSuccess', $resultTest), null, 'mesgs');
} else {
From 402f2ec17915fd13c4cf039ca19bf928f0bc5bc7 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:05:27 +0100
Subject: [PATCH 81/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index e0ae3dd..fac77aa 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -309,6 +309,6 @@ public function run($dbInstance = null, $limit = 0, $forcerun = 0, array $target
*/
public function sendTest($db, User $user)
{
- return self::run($db, 1, 1, array((int) $user->id));
+ return $this->run($db, 1, 1, array((int) $user->id));
}
}
From edad7993a45cff17754e6bf2ae15757e48b916d1 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:07:26 +0100
Subject: [PATCH 82/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index fac77aa..caafe5d 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -69,12 +69,14 @@ public function __construct(DoliDB $db)
public function run($dbInstance = null, $limit = 0, $forcerun = 0, array $targetUserIds = array())
{
global $db, $conf, $user, $langs;
- /*
- $db = $dbInstance;
- if (empty($db) && !empty($GLOBALS['db'])) {
- $db = $GLOBALS['db'];
+
+ if($dbInstance) {
+ $db = $dbInstance;
+ if (empty($db) && !empty($GLOBALS['db'])) {
+ $db = $GLOBALS['db'];
+ }
}
- */
+
if (empty($db)) {
dol_syslog($langs->transnoentitiesnoconv('ErrorNoDatabase'), LOG_ERR);
return -1;
From 3c015617afc6988e1c81ff274caec5736f09dd81 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:08:20 +0100
Subject: [PATCH 83/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index caafe5d..c70dfbb 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -69,14 +69,13 @@ public function __construct(DoliDB $db)
public function run($dbInstance = null, $limit = 0, $forcerun = 0, array $targetUserIds = array())
{
global $db, $conf, $user, $langs;
-
- if($dbInstance) {
+
+ /*
$db = $dbInstance;
if (empty($db) && !empty($GLOBALS['db'])) {
$db = $GLOBALS['db'];
}
- }
-
+ */
if (empty($db)) {
dol_syslog($langs->transnoentitiesnoconv('ErrorNoDatabase'), LOG_ERR);
return -1;
From afbef8e3501808fe1bce6bbaccfb529fb5217b90 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:12:17 +0100
Subject: [PATCH 84/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 2 --
1 file changed, 2 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index c70dfbb..a9d7b74 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -289,12 +289,10 @@ public function run($dbInstance = null, $limit = 0, $forcerun = 0, array $target
// return $emailsSent;
if ($errors) {
- //$result = 1;
$this->error = $langs->trans('TimesheetWeekReminderSendFailed').' '.$errors;
dol_syslog(__METHOD__." end - ".$this->error, LOG_ERR);
return 1;
}else{
- //$result = 0;
$this->output = $langs->trans('TimesheetWeekReminderSendSuccess')." ".$emailsSent.".";
dol_syslog(__METHOD__." end - ".$this->output, LOG_INFO);
return 0;
From 89bf6afb4d219dc431521c23446bde15a43121bb Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:13:33 +0100
Subject: [PATCH 85/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index a9d7b74..d5bab8d 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -66,7 +66,7 @@ public function __construct(DoliDB $db)
* @param array $targetUserIds Limit execution to specific user ids when provided
* @return int <0 if KO, >=0 if OK (number of emails sent)
*/
- public function run($dbInstance = null, $limit = 0, $forcerun = 0, array $targetUserIds = array())
+ public function run($limit = 0, $forcerun = 0, array $targetUserIds = array()) //$dbInstance = null,
{
global $db, $conf, $user, $langs;
From 588295ab99ce6cd23d95119e85432deb037b7ebb Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:18:25 +0100
Subject: [PATCH 86/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index d5bab8d..73671a0 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -308,6 +308,6 @@ public function run($limit = 0, $forcerun = 0, array $targetUserIds = array()) /
*/
public function sendTest($db, User $user)
{
- return $this->run($db, 1, 1, array((int) $user->id));
+ return self::run($db, 1, 1, array((int) $user->id));
}
}
From 03570c7adbbf4610d30ac872a74ad2f76cf02f3a Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:19:31 +0100
Subject: [PATCH 87/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index 73671a0..9b2c8e4 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -66,7 +66,7 @@ public function __construct(DoliDB $db)
* @param array $targetUserIds Limit execution to specific user ids when provided
* @return int <0 if KO, >=0 if OK (number of emails sent)
*/
- public function run($limit = 0, $forcerun = 0, array $targetUserIds = array()) //$dbInstance = null,
+ public function run($dbInstance = null, $limit = 0, $forcerun = 0, array $targetUserIds = array()) //$dbInstance = null,
{
global $db, $conf, $user, $langs;
From f6f082f88725965cfa2813582522f58b2bd9f591 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:22:32 +0100
Subject: [PATCH 88/96] Update setup.php
---
admin/setup.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/admin/setup.php b/admin/setup.php
index 80f8a8d..35a39d4 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -392,6 +392,7 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
if ($action === 'testreminder') {
$reminder = new TimesheetweekReminder($db);
$resultTest = $reminder->sendTest($db, $user); //$resultTest = TimesheetweekReminder::sendTest($db, $user);
+ var_dump($resultTest);
if ($resultTest > 0) {
setEventMessages($langs->trans('TimesheetWeekReminderTestSuccess', $resultTest), null, 'mesgs');
} else {
From 4c7df2f9860a0377202b96f52c50a1b661d99b78 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:28:41 +0100
Subject: [PATCH 89/96] Update setup.php
---
admin/setup.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/setup.php b/admin/setup.php
index 35a39d4..17363ee 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -393,7 +393,7 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
$reminder = new TimesheetweekReminder($db);
$resultTest = $reminder->sendTest($db, $user); //$resultTest = TimesheetweekReminder::sendTest($db, $user);
var_dump($resultTest);
- if ($resultTest > 0) {
+ if ($resultTest == 0) {
setEventMessages($langs->trans('TimesheetWeekReminderTestSuccess', $resultTest), null, 'mesgs');
} else {
setEventMessages($langs->trans('TimesheetWeekReminderTestError'), null, 'errors');
From db79e2c6e3027d7ef1c959b7fd38ef5b60793b46 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:30:25 +0100
Subject: [PATCH 90/96] Update setup.php
---
admin/setup.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin/setup.php b/admin/setup.php
index 17363ee..ca49120 100644
--- a/admin/setup.php
+++ b/admin/setup.php
@@ -392,9 +392,9 @@ function timesheetweekListDocumentModels(array $directories, Translate $langs, a
if ($action === 'testreminder') {
$reminder = new TimesheetweekReminder($db);
$resultTest = $reminder->sendTest($db, $user); //$resultTest = TimesheetweekReminder::sendTest($db, $user);
- var_dump($resultTest);
+ //var_dump($resultTest);
if ($resultTest == 0) {
- setEventMessages($langs->trans('TimesheetWeekReminderTestSuccess', $resultTest), null, 'mesgs');
+ setEventMessages($langs->trans('TimesheetWeekReminderTestSuccess'), null, 'mesgs');
} else {
setEventMessages($langs->trans('TimesheetWeekReminderTestError'), null, 'errors');
}
From 66efcdac4ee2f81a583e413e54cf4273b1e54b31 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:30:42 +0100
Subject: [PATCH 91/96] Update timesheetweek.lang
---
langs/fr_FR/timesheetweek.lang | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/langs/fr_FR/timesheetweek.lang b/langs/fr_FR/timesheetweek.lang
index 3c992fa..d5aa9f3 100644
--- a/langs/fr_FR/timesheetweek.lang
+++ b/langs/fr_FR/timesheetweek.lang
@@ -45,7 +45,7 @@ TimesheetWeekReminderTemplateMissing = Le modèle d'email de rappel n'est pas co
TimesheetWeekReminderSendFailed = Échec de l'envoi du rappel à %s.
TimesheetWeekReminderSendSuccess = Rappel envoyé avec succès à %s.
TimesheetWeekReminderSendTest = Envoyer un mail de test
-TimesheetWeekReminderTestSuccess = Mail de test envoyé (%s)
+TimesheetWeekReminderTestSuccess = Mail de test envoyé
TimesheetWeekReminderTestError = Échec de l'envoi du mail de test.
TimesheetWeekReminderTemplateLabel = Timesheetweek - Rappel des feuilles d'heures
TimesheetWeekReminderTemplateSubject = Rappel d'envoi des feuilles d'heures
From 950028457120c7cb7f3a18bf86acb65a310c87ec Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:30:59 +0100
Subject: [PATCH 92/96] Update timesheetweek.lang
---
langs/en_US/timesheetweek.lang | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/langs/en_US/timesheetweek.lang b/langs/en_US/timesheetweek.lang
index fb26c68..7c0ea4b 100644
--- a/langs/en_US/timesheetweek.lang
+++ b/langs/en_US/timesheetweek.lang
@@ -45,7 +45,7 @@ TimesheetWeekReminderTemplateMissing = Reminder email template is not configured
TimesheetWeekReminderSendFailed = Failed to send the reminder email to %s.
TimesheetWeekReminderSendSuccess = Reminder email successfully sent to %s.
TimesheetWeekReminderSendTest = Send test email
-TimesheetWeekReminderTestSuccess = Test reminder email sent (%s)
+TimesheetWeekReminderTestSuccess = Test reminder email sent
TimesheetWeekReminderTestError = Unable to send the test reminder email.
TimesheetWeekReminderTemplateLabel = Timesheetweek - Timesheet reminder
TimesheetWeekReminderTemplateSubject = Timesheet submission reminder
From 0fb144119187e721e344dff91cc659062ef89137 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:40:35 +0100
Subject: [PATCH 93/96] Update data.sql
---
sql/data.sql | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sql/data.sql b/sql/data.sql
index 8d51ab8..de5725e 100644
--- a/sql/data.sql
+++ b/sql/data.sql
@@ -7,4 +7,5 @@ INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_u
'isModEnabled(\"timesheetweek\")',
NULL,
"Rappel Feuilles d\'heures hebodmadaires",
- "Bonjour,
+;
From 0c63a1f28dc3ed6f45511d27deac78ba4b27dbb3 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:41:06 +0100
Subject: [PATCH 94/96] Avoid overriding global user during reminder run
---
class/timesheetweek_reminder.class.php | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index 9b2c8e4..11ed7f0 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -246,20 +246,20 @@ public function run($dbInstance = null, $limit = 0, $forcerun = 0, array $target
continue;
}
- $user = new User($db);
- $fetchUser = $user->fetch($obj->rowid);
+ $recipientUser = new User($db);
+ $fetchUser = $recipientUser->fetch($obj->rowid);
if ($fetchUser < 0) {
- dol_syslog($user->error, LOG_ERR);
+ dol_syslog($recipientUser->error, LOG_ERR);
$errors++;
continue;
}
$userSubstitutions = $substitutions;
- $userSubstitutions['__USER_FIRSTNAME__'] = $user->firstname;
- $userSubstitutions['__USER_LASTNAME__'] = $user->lastname;
- $userSubstitutions['__USER_FULLNAME__'] = dolGetFirstLastname($user->firstname, $user->lastname);
+ $userSubstitutions['__USER_FIRSTNAME__'] = $recipientUser->firstname;
+ $userSubstitutions['__USER_LASTNAME__'] = $recipientUser->lastname;
+ $userSubstitutions['__USER_FULLNAME__'] = dolGetFirstLastname($recipientUser->firstname, $recipientUser->lastname);
$userSubstitutions['__USER_EMAIL__'] = $recipient;
- complete_substitutions_array($userSubstitutions, $langs, null, $user);
+ complete_substitutions_array($userSubstitutions, $langs, null, $recipientUser);
$preparedSubject = make_substitutions($subject, $userSubstitutions);
$preparedBody = make_substitutions($body, $userSubstitutions);
From d29f8f1a2dd73882ea62dc6d9f9a07e7fdc647eb Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:46:41 +0100
Subject: [PATCH 95/96] Update timesheetweek_reminder.class.php
---
class/timesheetweek_reminder.class.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/class/timesheetweek_reminder.class.php b/class/timesheetweek_reminder.class.php
index 9b2c8e4..e65d605 100644
--- a/class/timesheetweek_reminder.class.php
+++ b/class/timesheetweek_reminder.class.php
@@ -289,11 +289,11 @@ public function run($dbInstance = null, $limit = 0, $forcerun = 0, array $target
// return $emailsSent;
if ($errors) {
- $this->error = $langs->trans('TimesheetWeekReminderSendFailed').' '.$errors;
+ $this->error = $langs->trans('TimesheetWeekReminderSendFailed', $errors);
dol_syslog(__METHOD__." end - ".$this->error, LOG_ERR);
return 1;
}else{
- $this->output = $langs->trans('TimesheetWeekReminderSendSuccess')." ".$emailsSent.".";
+ $this->output = $langs->trans('TimesheetWeekReminderSendSuccess', $emailsSent);
dol_syslog(__METHOD__." end - ".$this->output, LOG_INFO);
return 0;
}
From 0b1ba51316c773ea8fca716ee0e5ee0aa2aec7bc Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:50:59 +0100
Subject: [PATCH 96/96] Update data.sql
---
sql/data.sql | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sql/data.sql b/sql/data.sql
index de5725e..3df3103 100644
--- a/sql/data.sql
+++ b/sql/data.sql
@@ -7,5 +7,5 @@ INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_u
'isModEnabled(\"timesheetweek\")',
NULL,
"Rappel Feuilles d\'heures hebodmadaires",
- "Bonjour,
-;
+ "Bonjour,
"
+ );