From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Fri, 8 May 2026 09:31:20 +0000 (+0300)
Subject: Merge branch 'refs/heads/develop' into feature_fomichev_ERP-325J_category_manager_catalog
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=ff96295b9b16dbabb2b35e7e5899175a332d649c;p=erp24_rep%2Fyii-erp24%2F.git

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

# Conflicts:
#	erp24/records/Products1cNomenclature.php
---

ff96295b9b16dbabb2b35e7e5899175a332d649c
diff --cc erp24/records/AdminGroup.php
index cbe966a4,7ce6e93f..104245f9
--- a/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 016e5a8a,bc524e29..8b787dd8
--- a/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
  {