From 3c225ac5c36b24be3e09bf34ca6b3c7befecb929 Mon Sep 17 00:00:00 2001
From: Henri Queneau <henri.queneau@maarch.org>
Date: Fri, 30 Mar 2018 15:15:55 +0200
Subject: [PATCH] FIX #7477 resolve calculate error of the date when it is
calendar
---
apps/maarch_entreprise/indexing_searching/change_doctype.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/apps/maarch_entreprise/indexing_searching/change_doctype.php b/apps/maarch_entreprise/indexing_searching/change_doctype.php
index 1b5bee6c737..1d0941b6f66 100755
--- a/apps/maarch_entreprise/indexing_searching/change_doctype.php
+++ b/apps/maarch_entreprise/indexing_searching/change_doctype.php
@@ -76,6 +76,7 @@ if (isset($_REQUEST['admission_date'])
$priorityId = $_SESSION['process_mode_priority'][$_SESSION['process_mode']];
$_SESSION['process_mode'] = NULL;
+$priorityWDay = $_SESSION['mail_priorities_wdays'][$priorityId] == 'true' ? 'workingDay' : 'calendar';
foreach ($_SESSION['mail_priorities_id'] as $key => $value) {
if ($value == $priorityId) {
$fakeId = $key;
@@ -265,7 +266,7 @@ if (isset($delay) && $delay > 0) {
$alert_engine = new alert_engine();
if (isset($admissionDate) && !empty($admissionDate)) {
$convertedDate = $alert_engine->dateFR2Time(str_replace("-", "/", $admissionDate));
- $date = $alert_engine->WhenOpenDay($convertedDate, $delay);
+ $date = $alert_engine->WhenOpenDay($convertedDate, $delay, false, $priorityWDay);
//$date = $alert_engine->date_max_treatment($delay, false);
} else {
$date = $alert_engine->date_max_treatment($delay, false);
--
GitLab