Merge branch 'develop' into feature_zozirova_erp-302_bouquets_tz

# Conflicts:
#	erp24/records/Products1c.php

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

diff --cc erp24/records/Products1c.php
index 64de0abf41a1b66634937251cade6769952c5878,01f71915a2c62b316ea074adb15af1005553a719..21ad21a16c5301d084aacd5b2b07fd2b1802cde9
--- 1/erp24/records/Products1c.php
--- 2/erp24/records/Products1c.php
+++ b/erp24/records/Products1c.php
@@@ -20,12 -20,8 +20,11 @@@ use yii\helpers\ArrayHelper
   */
  class Products1c extends \yii\db\ActiveRecord
  {
+     const PRODUCT1C_FIELDS = ['id', 'parent_id', 'tip', 'type', 'code', 'name', 'articule', 'view', 'components', 'AdditionCharacteristics'];
  
-     const PRODUCT1C_FIELDS = ['id', 'parent_id', 'tip', 'code', 'name', 'articule', 'view', 'components', 'AdditionCharacteristics'];
- 
 +    public const TYPE_PRODUCTS = 'products';
 +    public const IS_VISIBLE = 1;
 +
      /**
       * {@inheritdoc}
       */