]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
ERP-259 Доработка второго шага передачи смен feature-zozirova-erp_256-send_doc_on_1c
authormarina <m.zozirova@gmail.com>
Fri, 13 Dec 2024 13:59:44 +0000 (16:59 +0300)
committermarina <m.zozirova@gmail.com>
Fri, 13 Dec 2024 13:59:44 +0000 (16:59 +0300)
erp24/records/EqualizationRemains.php
erp24/views/shift-transfer/_replacement.php

index 39c490d34e364bb86cac2e26f9231b09536cf5cc..b3d8f3c2b511846aca9ce9c404e16d057ac8659c 100644 (file)
@@ -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,
index abb0ed9ac76f88daac94dfd93f8b0cd30fdc7dd5..85dc6a42001e37f5bedcb51ce5f37f3c42f8c3a5 100644 (file)
@@ -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',