From: marina <m.zozirova@gmail.com>
Date: Fri, 6 Jun 2025 12:17:11 +0000 (+0300)
Subject: Merge branch 'develop' into feature_zozirova_erp-360_autoplannogramma_build
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=d105def19c52f407476e82fdf9f1200660f5d052;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_zozirova_erp-360_autoplannogramma_build

# Conflicts:
#	erp24/controllers/AutoPlannogrammaController.php
---

d105def19c52f407476e82fdf9f1200660f5d052
diff --cc erp24/controllers/AutoPlannogrammaController.php
index 36b69d77,62b2c833..b684aafb
--- a/erp24/controllers/AutoPlannogrammaController.php
+++ b/erp24/controllers/AutoPlannogrammaController.php
@@@ -7,11 -7,13 +7,16 @@@ use yii\data\ArrayDataProvider
  use yii\db\Expression;
  use yii\db\Query;
  use yii\helpers\ArrayHelper;
 +use yii_app\records\Autoplannogramma;
  use yii_app\records\CityStore;
+ use yii_app\records\MatrixBouquetForecast;
+ use yii_app\records\PricesDynamic;
+ use yii_app\records\Products1c;
+ use yii_app\records\Products1cNomenclature;
 +use yii_app\records\CityStoreParams;
 +use yii_app\records\StoreDynamic;
  use yii_app\services\AutoPlannogrammaService;
+ use yii_app\services\StorePlanService;
  
  class AutoPlannogrammaController extends BaseController
  {