Merge branch 'refs/heads/develop' into feature_fomichev_erp-472_add_feed_activity_to_...

# Conflicts:
#	erp24/controllers/MatrixErpController.php
#	erp24/views/matrix_erp/index.php

diff --cc erp24/controllers/MatrixErpController.php
index fb3e5fa742cf649db1f967fc99c501facd8a06ea,00785677a1a994825e9cfd76b15c271933a68652..8b27a87e1f59521d13c5d2deed0a1ca3855761ed
--- 1/erp24/controllers/MatrixErpController.php
--- 2/erp24/controllers/MatrixErpController.php
+++ b/erp24/controllers/MatrixErpController.php
@@@ -104,9 -104,9 +104,10 @@@ class MatrixErpController extends Contr
  
          $filterModel = DynamicModel::validateData([
              'activeFilter' => 1,
 +            'feedActiveFilter',
              'nameFilter',
              'groupNameFilter',
+             'articuleFilter',
  
          ], [
              [

diff --cc erp24/services/MarketplaceService.php
Simple merge

diff --cc erp24/views/matrix_erp/index.php
index ef64a629db15296729460655d5c7054222a552f2,14493c17665e3cc2673c219483f0775ae69e3fde..25cea82ca907b26afa3bd8f1f43bdc703c96ef72
--- 1/erp24/views/matrix_erp/index.php
--- 2/erp24/views/matrix_erp/index.php
+++ b/erp24/views/matrix_erp/index.php
@@@ -121,18 -126,10 +127,18 @@@ $this->params['breadcrumbs'][] = $this-
                                  ['class' => 'form-control', 'onchange' => 'this.form.submit();'])->label('Активность');
                              ?>
                          </div>
 +                        <div class="col-sm-3 col-md-3">
 +                            <?php
 +                            echo $form->field($filterModel, 'feedActiveFilter')->dropDownList(
 +                                ['' => 'Все', 1 => 'Активен в фиде', 0 => 'Не активен в фиде'],
 +                                ['class' => 'form-control', 'onchange' => 'this.form.submit();'])->label('Активность в фиде');
 +                            ?>
 +                        </div>
                      </div>
 +
                      <div class="row">
-                         <div class="col-sm-4 col-md-4">
-                             <?= Html::submitButton('Фильтр', ['class' => 'btn btn-primary  mt-4 mb-0']) ?>
+                         <div class="col-sm-12 col-md-12">
+                             <?= Html::submitButton('Фильтр', ['class' => 'btn btn-primary mt-4 mb-0']) ?>
                          </div>
                      </div>
                      <?php ActiveForm::end() ?>