From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Fri, 30 May 2025 11:51:09 +0000 (+0300)
Subject: Merge branch 'refs/heads/develop' into feature_fomichev_erp-419_calculate_cleared_spe... 
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=57d815c3032c6d105417ac7c3095a657b09f9939;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'refs/heads/develop' into feature_fomichev_erp-419_calculate_cleared_species_month_goal

# Conflicts:
#	erp24/services/AutoPlannogrammaService.php
---

57d815c3032c6d105417ac7c3095a657b09f9939
diff --cc erp24/services/AutoPlannogrammaService.php
index a84b3ef5,3481cf59..5ca42a25
--- a/erp24/services/AutoPlannogrammaService.php
+++ b/erp24/services/AutoPlannogrammaService.php
@@@ -107,8 -98,8 +110,8 @@@ class AutoPlannogrammaServic
                  ':month2' => $month2,
                  ':month3' => $month3,
              ]);
- 
          }
 -        
++
          // Основной запрос с CTE
          $query = (new Query())
              ->select([