Merge branch 'refs/heads/develop' into feature_fomichev_ERP-325J_category_manager_catalog

# Conflicts:
#	erp24/records/Products1cNomenclature.php

diff --cc erp24/records/AdminGroup.php
index cbe966a42c17860864532341f68e9020ba28e87b,7ce6e93f617eb6791cfb4d994724cd15b402c049..104245f9062103329ba0ae05852d18042a655624
--- 1/erp24/records/AdminGroup.php
--- 2/erp24/records/AdminGroup.php
+++ b/erp24/records/AdminGroup.php
@@@ -37,8 -37,8 +37,9 @@@ class AdminGroup extends ActiveRecor
      const GROUP_BUSH_DIRECTOR = 7;
      const GROUP_OPERATIONAL_DIRECTOR = 51;
      const GROUP_IT = 81;
+     const GROUP_KIK_MANAGER = 82; // Менеджер контроля качества
      const GROUP_FINANCE_DIRECTOR = 9;
 +    const GROUP_CATMANAGER = 82; // ERP-337: Category Manager (КМ) — полный доступ к каталогу
  
      /**
       * Возвращает список специальных групп работников (нужно для JS и логики грейдов)

diff --cc erp24/records/Products1cNomenclature.php
index 016e5a8a6093d32513a129378dfa05f2083ed15e,bc524e2923b4295c0b3e10c655674012359cd03e..8b787dd803a1afe3889f8fe2c65f8ae218d148e5
--- 1/erp24/records/Products1cNomenclature.php
--- 2/erp24/records/Products1cNomenclature.php
+++ b/erp24/records/Products1cNomenclature.php
@@@ -17,13 -17,9 +17,13 @@@ use yii\db\ActiveQuery
   * @property string|null $species Вид
   * @property string|null $sort Сорт
   * @property string|null $type Тип
-  * @property int|null $size Размер
+  * @property float|null $size Размер
   * @property string|null $measure Единица измерения
   * @property string|null $color Цвет
 + * @property string $classification_status not_needed|unclassified|pending|approved
 + * @property int|null $confidence Уверенность ML 0-100 %
 + * @property int|null $classified_by ID пользователя
 + * @property string|null $classified_at Дата подтверждения
   */
  class Products1cNomenclature extends \yii\db\ActiveRecord
  {