Merge branch 'develop' into feature_zozirova_erp-282_stores_view_config

# Conflicts:
#	erp24/composer.json

diff --cc erp24/composer.json
index 6fc06647b64449ca3f160a2fdb43bbfa18a99fd6,aede880ef81d30fb83fcf5c3cada717e9a390e57..7f026e537306afa26a76476220685cb2c1a36081
--- 1/erp24/composer.json
--- 2/erp24/composer.json
+++ b/erp24/composer.json
@@@ -35,7 -35,8 +35,8 @@@
          "kartik-v/yii2-widget-datepicker": "dev-master",
          "phpoffice/phpspreadsheet": "^2.2",
          "ext-xmlreader": "*",
 -        "enqueue/amqp-lib": "^0.10.19"
 -
++        "enqueue/amqp-lib": "^0.10.19",
 +        "softark/yii2-dual-listbox": "^1.0"
      },
      "require-dev": {
          "yiisoft/yii2-debug": "~2.1.0",

diff --cc erp24/records/AdminGroup.php
Simple merge