From: marina Date: Mon, 16 Dec 2024 10:12:13 +0000 (+0300) Subject: ERP-259 Доработка второго шага передачи смен X-Git-Tag: 1.7~160^2~5 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=a7965c825702f30e69b58bf58d682c5984702316;p=erp24_rep%2Fyii-erp24%2F.git ERP-259 Доработка второго шага передачи смен --- diff --git a/erp24/views/shift-transfer/_replacement.php b/erp24/views/shift-transfer/_replacement.php index 85dc6a42..8bad3806 100644 --- a/erp24/views/shift-transfer/_replacement.php +++ b/erp24/views/shift-transfer/_replacement.php @@ -261,7 +261,8 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO echo GridView::widget([ 'dataProvider' => new \yii\data\ActiveDataProvider([ 'query' => \yii_app\records\WaybillWriteOffsProducts::find() - ->andWhere(['waybill_write_offs_id' => \yii_app\records\WaybillWriteOffs::findOne(['shift_transfer_id' => $shiftTransfer->id])->id ?? null]) + ->andWhere(['waybill_write_offs_id' => \yii_app\records\WaybillWriteOffs::findOne(['shift_transfer_id' => $shiftTransfer->id])->id ?? null]), + 'pagination' => false, ]), 'showFooter' => true, 'columns' => [ @@ -300,7 +301,8 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO echo GridView::widget([ 'dataProvider' => new \yii\data\ActiveDataProvider([ 'query' => \yii_app\records\WaybillIncomingProducts::find() - ->andWhere(['waybill_incoming_id' => \yii_app\records\WaybillIncoming::findOne(['shift_transfer_id' => $shiftTransfer->id])->id ?? null]) + ->andWhere(['waybill_incoming_id' => \yii_app\records\WaybillIncoming::findOne(['shift_transfer_id' => $shiftTransfer->id])->id ?? null]), + 'pagination' => false, ]), 'showFooter' => true, 'columns' => [