From 2bdbba0eff6629dccc7ef8c8e95124becc17e71d Mon Sep 17 00:00:00 2001 From: yuri Date: Mon, 5 Feb 2018 15:42:56 +0200 Subject: [PATCH] fix sales chart --- application/Espo/Modules/Crm/Services/Opportunity.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/application/Espo/Modules/Crm/Services/Opportunity.php b/application/Espo/Modules/Crm/Services/Opportunity.php index 05b201e410..1b4a0c5c36 100644 --- a/application/Espo/Modules/Crm/Services/Opportunity.php +++ b/application/Espo/Modules/Crm/Services/Opportunity.php @@ -207,7 +207,14 @@ class Opportunity extends \Espo\Services\Record $dt = new \DateTime($dateFrom); $dtTo = new \DateTime($dateTo); - $dtTo->setDate($dtTo->format('Y'), $dtTo->format('m'), 1); + + if (intval($dtTo->format('d')) !== 1) { + $dtTo->setDate($dtTo->format('Y'), $dtTo->format('m'), 1); + $dtTo->modify('+ 1 month'); + } else { + $dtTo->setDate($dtTo->format('Y'), $dtTo->format('m'), 1); + } + if ($dt && $dtTo) { $interval = new \DateInterval('P1M'); while ($dt->getTimestamp() <= $dtTo->getTimestamp()) {