Merge branch 'develop' into feature_zozirova_erp-282_stores_view_config

# Conflicts:
#	erp24/composer.json

diff --cc erp24/composer.json
index 7f026e537306afa26a76476220685cb2c1a36081,eb09e3253c5553a9115cd05cd45eac57bf07ace7..965f092c56797af321ea4e12a1aa3a5c222f5c26
--- 1/erp24/composer.json
--- 2/erp24/composer.json
+++ b/erp24/composer.json
@@@ -36,7 -36,8 +36,8 @@@
          "phpoffice/phpspreadsheet": "^2.2",
          "ext-xmlreader": "*",
          "enqueue/amqp-lib": "^0.10.19",
 -        "vlucas/phpdotenv": "^5.6"
 -
++        "vlucas/phpdotenv": "^5.6",
 +        "softark/yii2-dual-listbox": "^1.0"
      },
      "require-dev": {
          "yiisoft/yii2-debug": "~2.1.0",