Merge branch 'refs/heads/develop' into feature_fomichev_erp-457_nomenclature_actualit...

# Conflicts:
#	erp24/services/AutoPlannogrammaService.php

diff --cc erp24/services/AutoPlannogrammaService.php
index e5a6c946adc68b4459d934b3da2a75bcb9ec70c9,cd178acd71c51a5b91748186bfadfa1a8575ae52..1b59010a8dc55ca09c97caec4aac2ef1b95ee819
--- 1/erp24/services/AutoPlannogrammaService.php
--- 2/erp24/services/AutoPlannogrammaService.php
+++ b/erp24/services/AutoPlannogrammaService.php
@@@ -3133,13 -3236,13 +3247,17 @@@ private function buildCategoryGoals(arr
                  $salesShares[$storeId]['marketplace'] = round($market / $total, 4);
              }
          }
+ 
          foreach ($weeklyForecasts as $item) {
+             $groupsArr = explode('_', (string)$item['matrix_group']);
+             $baseGroup = $groupsArr[0];
              $storeItem = (int)$item['store_id'];
              $guid = (string)$item['product_guid'];
+             $group = $baseGroup;
 +            if (!in_array($guid, $actualProducts)) {
 +               continue;
 +            }
 +            $group = (string)$item['matrix_group'];
              $type = (string)$item['type'];
              $forecastValue = (float)$item['week_forecast'];
              if (isset($salesShares[$storeItem]) && isset($salesShares[$storeItem][$type])) {