From c41522ab6745eea02c3da292e027b62b44f1f35e Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Wed, 29 Sep 2021 14:03:37 +0300
Subject: [PATCH] fix fiscal quarter

---
 application/Espo/ORM/QueryComposer/BaseQueryComposer.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
index a03fb9e5a6..6db48c925a 100644
--- a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
+++ b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
@@ -892,7 +892,9 @@ abstract class BaseQueryComposer implements QueryComposer
             if (is_numeric($fiscalShift)) {
                 $fiscalShift = (int) $fiscalShift;
                 $fiscalFirstMonth = $fiscalShift + 1;
-                $fiscalDistractedMonth = 12 - $fiscalFirstMonth;
+                $fiscalDistractedMonth = $fiscalFirstMonth < 4 ?
+                    12 - $fiscalFirstMonth :
+                    12 - $fiscalFirstMonth + 1;
 
                 return
                     "CASE WHEN MONTH({$part}) >= {$fiscalFirstMonth} THEN ".