From ff9f83e7a30cbe5130c9e6fde23f2712fd64faa2 Mon Sep 17 00:00:00 2001 From: marina Date: Fri, 13 Dec 2024 16:59:44 +0300 Subject: [PATCH] =?utf8?q?ERP-259=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?utf8?q?=D1=82=D0=BA=D0=B0=20=D0=B2=D1=82=D0=BE=D1=80=D0=BE=D0=B3=D0=BE?= =?utf8?q?=20=D1=88=D0=B0=D0=B3=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4?= =?utf8?q?=D0=B0=D1=87=D0=B8=20=D1=81=D0=BC=D0=B5=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/records/EqualizationRemains.php | 2 +- erp24/views/shift-transfer/_replacement.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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', -- 2.39.5