vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY

Browse source
This commit is contained in:
ldestailleur 2025-08-05 12:19:53 +02:00
parent af615ec603
commit 8cfc3d1306
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
htdocs/core/class/conf.class.php
View file

@ -1083,7 +1083,7 @@ class Conf extends stdClass
$this->global->MAIN_MAX_DECIMALS_SHOWN = 8;
}
// Non working days
// Non working days by default if not set in setup
if (!isset($this->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY)) {
$this->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY = 1;
}

26
htdocs/projet/class/project.class.php
View file

@ -2644,11 +2644,12 @@ class Project extends CommonObject
/**
* Method for calculating weekly hours worked and generating a report
*
* @return int 0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
*/
public function createWeeklyReport()
{
global $mysoc, $user;
global $mysoc, $user, $langs;
$now = dol_now();
$nowDate = dol_getdate($now, true);
@ -2689,19 +2690,32 @@ class Project extends CommonObject
} else {
$reportContent = "<span>Weekly time report from $startDate to $endDate </span><br><br>";
$reportContent .= '<table border="1" style="border-collapse: collapse;">';
$reportContent .= '<tr><th>Nom d\'utilisateur</th><th>Temps saisi (heures)</th><th>Temps travaillé par semaine (heures)</th></tr>';
$reportContent .= '<tr><th>'.$langs->trans("User").'</th><th>Temps saisi (heures)</th><th>Temps travaillé par semaine (heures)</th></tr>';
$weekendEnabled = 0;
$to = '';
$nbMailSend = 0;
$error = 0;
$errors_to = '';
while ($obj = $this->db->fetch_object($resql)) {
$to = $obj->email;
$weekendEnabled = 0;
$numHolidays = num_public_holiday($lastWeekStartTS, $lastWeekEndTS, $mysoc->country_code, 1);
if (getDolGlobalString('MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY') && getDolGlobalString('MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY')) {
$numHolidays -= 2;
$weekendEnabled = 2;
if (getDolGlobalString('MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY')) {
$numHolidays -= 1;
$weekendEnabled += 1;
}
if (getDolGlobalString('MAIN_NON_WORKING_DAYS_INCLUDE_TUESDAY')) {
$numHolidays -= 1;
$weekendEnabled += 1;
}
if (getDolGlobalString('MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY')) {
$numHolidays -= 1;
$weekendEnabled += 1;
}
if (getDolGlobalString('MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY')) {
$numHolidays -= 1;
$weekendEnabled += 1;
}
$dailyHours = $obj->weeklyhours / (7 - $weekendEnabled);