From: marina <m.zozirova@gmail.com>
Date: Fri, 13 Dec 2024 13:59:44 +0000 (+0300)
Subject: ERP-259 Доработка второго шага передачи смен
X-Git-Tag: 1.7~160^2~9
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=ff9f83e7a30cbe5130c9e6fde23f2712fd64faa2;p=erp24_rep%2Fyii-erp24%2F.git

ERP-259 Доработка второго шага передачи смен
---

diff --git a/erp24/records/EqualizationRemains.php b/erp24/records/EqualizationRemains.php
index 39c490d3..b3d8f3c2 100644
--- a/erp24/records/EqualizationRemains.php
+++ b/erp24/records/EqualizationRemains.php
@@ -199,7 +199,7 @@ class EqualizationRemains extends \yii\db\ActiveRecord
                 $model->setAttributes([
                     'shift_transfer_id' => $shiftTransfer->id,
                     'product_id' => $key,
-                    'product_count' => $diff,
+                    'product_count' => $item['fact_and_1c_diff'],
                     'product_price' => $item['retail_price'],
                     'product_self_cost' => $item['self_cost'],
                     'product_replacement_id' => $p->product_guid,
diff --git a/erp24/views/shift-transfer/_replacement.php b/erp24/views/shift-transfer/_replacement.php
index abb0ed9a..85dc6a42 100644
--- a/erp24/views/shift-transfer/_replacement.php
+++ b/erp24/views/shift-transfer/_replacement.php
@@ -209,7 +209,6 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO
                 'attribute' => 'product_count',
                 'label' => 'Количество товара',
                 'format' => 'raw',
-                'pageSummary' => true,
             ],
             [
                 'attribute' => 'product_replacement_id',