Skip to content

1.6.0 #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mapiolca merged 12 commits into from
Dec 5, 2025
Merged

1.6.0 #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8ae334e
Add email template backport for pre-23 Dolibarr
mapiolca Dec 5, 2025
563e0c3
Update setup.php
mapiolca Dec 5, 2025
1e73f58
Update timesheetweek_reminder.class.php
mapiolca Dec 5, 2025
9c37bad
Update interface_99_modTimesheetWeek_TimesheetWeekTriggers.class.php
mapiolca Dec 5, 2025
d6e4634
Update setup.php
mapiolca Dec 5, 2025
1a98a0a
Update interface_99_modTimesheetWeek_TimesheetWeekTriggers.class.php
mapiolca Dec 5, 2025
282ce79
Update timesheetweek_reminder.class.php
mapiolca Dec 5, 2025
00478b0
Update cemailtemplate.class.php
mapiolca Dec 5, 2025
8f67b65
Update setup.php
mapiolca Dec 5, 2025
8b98626
Update setup.php
mapiolca Dec 5, 2025
25682e2
Update timesheetweek_reminder.class.php
mapiolca Dec 5, 2025
aac9f7f
Merge pull request #106 from mapiolca/2025-12-05-troubleshoot-error-5…
mapiolca Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions admin/setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,20 @@
$res = require_once __DIR__.'/../../../main.inc.php';
}
if (!$res) {
die('Include of main fails');
die('Include of main fails');
}

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';
require_once DOL_DOCUMENT_ROOT.'/core/class/cemailtemplate.class.php';
// EN: Load document helper functions required for model toggles.
// EN: Load email template class with backward compatibility for older Dolibarr versions.

if (floatval(DOL_VERSION) < 23) {
dol_include_once('/timesheetweek/core/class/cemailtemplate.class.php');
} else {
require_once DOL_DOCUMENT_ROOT.'/core/class/cemailtemplate.class.php';
}

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');
Expand Down
13 changes: 4 additions & 9 deletions class/timesheetweek_reminder.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,10 @@ public function run($dbInstance = null, $limit = 0, $forcerun = 0, array $target
}
}

$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 (floatval(DOL_VERSION) < 23) {
dol_include_once('/timesheetweek/core/class/cemailtemplate.class.php');
} else {
require_once DOL_DOCUMENT_ROOT.'/core/class/cemailtemplate.class.php';
}

if (!class_exists('CEmailTemplate') && !class_exists('EmailTemplate')) {
Expand Down
Loading