From: marina <m.zozirova@gmail.com>
Date: Wed, 26 Feb 2025 07:10:07 +0000 (+0300)
Subject: Merge branch 'develop' into feature_zozirova_erp-302_bouquets_tz
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=9829765b13be4c65da64525b3f09e2fe94140ecc;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_zozirova_erp-302_bouquets_tz

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

9829765b13be4c65da64525b3f09e2fe94140ecc
diff --cc erp24/records/Products1c.php
index 64de0abf,01f71915..21ad21a1
--- a/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'];
  
 +    public const TYPE_PRODUCTS = 'products';
 +    public const IS_VISIBLE = 1;
 +
-     const PRODUCT1C_FIELDS = ['id', 'parent_id', 'tip', 'code', 'name', 'articule', 'view', 'components', 'AdditionCharacteristics'];
- 
      /**
       * {@inheritdoc}
       */