Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c

# Conflicts:
#	erp24/controllers/ShiftTransferController.php
#	erp24/records/EqualizationRemains.php
#	erp24/views/shift-transfer/_replacement.php

diff --cc erp24/controllers/ShiftTransferController.php
index 13825e813d95b96af4e48ac154dc20f92d6382f0,fc130e81ffca1a7da5c793626e631c1a3d783e14..413c643d0e469c58cef2b9b90beaa75884c315cb
--- 1/erp24/controllers/ShiftTransferController.php
--- 2/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@@ -186,11 -252,11 +252,14 @@@ class ShiftTransferController extends C
              } elseif ($action === 'save') {
                  $model->updateAttributes(['status_id' => ShiftTransfer::STATUS_ID_READY_TO_ACCEPT]);
                  EqualizationRemains::updateData(Yii::$app->request->post()['ShiftTransfer']['equalizationRemains'], $id);
 -            } elseif ($action === 'rejection') {
+             } elseif ($action == 'recalculate') {
+                 EqualizationRemains::setData($model);
+                 Yii::$app->session->setFlash('success', 'Таблица замен успешно перерасчитана');
 +            } elseif ($action === 'rejection' || $action === 'back') {
                  $model->updateAttributes(['status_id' => ShiftTransfer::STATUS_ID_TRANSFER_ACTIONS]);
 +                //удаление данных из табличек с плюсом и минусом
 +            } elseif ($action === 'resume') {
 +                //формирование табличек с минусом и плюсом
              }
  
              $this->redirect(Yii::$app->request->referrer);

diff --cc erp24/records/EqualizationRemains.php
index 3762ea0f9495f0e9c93ef797090356baefa5eba2,8b31613b1cc2aaa9077391cb8cbfdcf874c57de6..9fb60da67684ffbb9b2fa0c7e303e0432c3960a1
--- 1/erp24/records/EqualizationRemains.php
--- 2/erp24/records/EqualizationRemains.php
+++ b/erp24/records/EqualizationRemains.php
@@@ -95,8 -96,9 +96,9 @@@ class EqualizationRemains extends \yii\
          ];
      }
  
-     public static function updateData($equalizationRemains, int $shift_transfer_id) {
 -    public static function updateData($equalizationRemains, int $shift_id)
++    public static function updateData($equalizationRemains, int $shift_transfer_id)
+     {
 -        self::deleteAll(['shift_id' => $shift_id]);
 +        self::deleteAll(['shift_transfer_id' => $shift_transfer_id]);
  
          if (!is_array($equalizationRemains) || empty($equalizationRemains)) {
              return;

diff --cc erp24/records/ShiftTransfer.php
index 1ab7ece76e86fb5176f2328c21b21f5cce317c08,99691660a7f73b7623b10904453e690a7aa7de77..a9eade5675adb1e8856abddddd4c1d2d7cf31bc0
--- 1/erp24/records/ShiftTransfer.php
--- 2/erp24/records/ShiftTransfer.php
+++ b/erp24/records/ShiftTransfer.php
@@@ -98,6 -102,15 +104,15 @@@ class ShiftTransfer extends \yii\db\Act
       */
      public function getEqualizationRemains()
      {
 -        return $this->hasMany(EqualizationRemains::class, ['shift_id' => 'id']);
 +        return $this->hasMany(EqualizationRemains::class, ['shift_transfer_id' => 'id']);
      }
+ 
+     public function setGroups() {
+         $this->groups1 = array_filter(explode(',', $this->product_groups ?? ''), function ($a) { return $a != 'other_items'; });
+         $this->groups2 = array_filter(explode(',', $this->product_groups ?? ''), function ($a) { return $a == 'other_items'; });
+     }
+ 
+     public function setProductGroups() {
+         $this->product_groups = implode(',', array_merge(empty($this->groups1) ? [] : $this->groups1, empty($this->groups2) ? [] : $this->groups2));
+     }
  }

diff --cc erp24/views/shift-transfer/_replacement.php
index 2813c96119d79070b92835222293e343025ed81a,e878622ddebdbc9a56d2c45231caeeb7ab8e5ab8..57d87c63f005901cb6ddb4358c8e7a6f55b6fe99
--- 1/erp24/views/shift-transfer/_replacement.php
--- 2/erp24/views/shift-transfer/_replacement.php
+++ b/erp24/views/shift-transfer/_replacement.php
@@@ -139,16 -165,20 +165,20 @@@ if (in_array($shiftTransfer->status_id
              'class' => 'btn btn-danger visible',
          ],
          'iconSource' => 'fa',
-     ])->label('Таблица возможных замен');
+     ])->label(false);
  
 -    echo $btn = Html::submitButton('СоÑ\85Ñ\80анить', [
 +    echo $btn = Html::submitButton('Ð\9fÑ\80одолжить', [
          'class' => 'btn btn-primary float-right',
          'name' => 'action',
 -        'value' => 'save'
 +        'value' => 'resume'
      ]);
- 
+     ?>
+     <?php
  } else {
-     echo Html::label('Таблица возможных замен');
+     ?>
+     </div>
+     </div>
+     <?php
      echo GridView::widget([
          'dataProvider' => new ArrayDataProvider([
              'allModels' => $shiftTransfer->equalizationRemains,

diff --cc erp24/views/store-balance/index.php
Simple merge