Merge branch 'develop' into feature_zozirova_erp-360_autoplannogramma_build

# Conflicts:
#	erp24/controllers/AutoPlannogrammaController.php

diff --cc erp24/controllers/AutoPlannogrammaController.php
index 36b69d77bc608c53e16b363f163785d7495e2a64,62b2c83311c7651035a5f7cf5bd05a521468aaf9..b684aafbca69ce51f4dd957c8131cccf83233efe
--- 1/erp24/controllers/AutoPlannogrammaController.php
--- 2/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
  {