Merge branch 'refs/heads/develop' into feature_fomichev_erp-419_calculate_cleared_spe...

# Conflicts:
#	erp24/services/AutoPlannogrammaService.php

diff --cc erp24/services/AutoPlannogrammaService.php
index a84b3ef5b79cb78f09ac7031ee7e8830b3f98dff,3481cf596de7a72190b9d654d2cd2642f3d944b6..5ca42a255a5b7bbf7fd7bd503bbb0643a4f5ea00
--- 1/erp24/services/AutoPlannogrammaService.php
--- 2/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([