Skip to content

EspoCRM – Open Source CRM Application

date time range last second fix

Yuri Kuznetsovb8ee2b934b8a
diff --git a/application/Espo/Core/Select/Where/DefaultDateTimeItemTransformer.php b/application/Espo/Core/Select/Where/DefaultDateTimeItemTransformer.php
index f9f83ccd51..31fb2745d7 100644
--- a/application/Espo/Core/Select/Where/DefaultDateTimeItemTransformer.php
+++ b/application/Espo/Core/Select/Where/DefaultDateTimeItemTransformer.php
@@ -327,11 +327,12 @@ class DefaultDateTimeItemTransformer implements DateTimeItemTransformer
}
$dtTo = clone $dtFrom;
- $dtTo->modify('+1 month');
+ $dtTo->modify('+1 month')->modify('-1 second');
$dtFrom->setTimezone(new DateTimeZone('UTC'));
$dtTo->setTimezone(new DateTimeZone('UTC'));
+
$where['value'] = [$dtFrom->format($format), $dtTo->format($format)];
break;
@@ -367,7 +368,7 @@ class DefaultDateTimeItemTransformer implements DateTimeItemTransformer
}
$dtTo = clone $dtFrom;
- $dtTo->add(new DateInterval('P3M'));
+ $dtTo->add(new DateInterval('P3M'))->modify('-1 second');
$dtFrom->setTimezone(new DateTimeZone('UTC'));
$dtTo->setTimezone(new DateTimeZone('UTC'));
@@ -395,7 +396,7 @@ class DefaultDateTimeItemTransformer implements DateTimeItemTransformer
}
$dtTo = clone $dtFrom;
- $dtTo = $dtTo->modify('+1 year');
+ $dtTo = $dtTo->modify('+1 year')->modify('-1 second');
$dtFrom->setTimezone(new DateTimeZone('UTC'));
$dtTo->setTimezone(new DateTimeZone('UTC'));
@@ -434,7 +435,7 @@ class DefaultDateTimeItemTransformer implements DateTimeItemTransformer
$dtFrom = clone $dt;
$dtTo = clone $dt;
- $dtTo = $dtTo->modify('+1 year');
+ $dtTo = $dtTo->modify('+1 year')->modify('-1 second');
$dtFrom->setTimezone(new DateTimeZone('UTC'));
$dtTo->setTimezone(new DateTimeZone('UTC'));
@@ -493,7 +494,7 @@ class DefaultDateTimeItemTransformer implements DateTimeItemTransformer
$dtFrom = clone $dt;
$dtTo = clone $dt;
- $dtTo = $dtTo->modify('+3 months');
+ $dtTo = $dtTo->modify('+3 months')->modify('-1 second');
$dtFrom->setTimezone(new DateTimeZone('UTC'));
$dtTo->setTimezone(new DateTimeZone('UTC'));