From: marina <m.zozirova@gmail.com>
Date: Mon, 17 Jun 2024 09:23:37 +0000 (+0300)
Subject: правка для ерп5
X-Git-Tag: 1.3~55^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=eace765d915534ea565a8d593c46da99bb52b66a;p=erp24_rep%2Fyii-erp24%2F.git

правка для ерп5
---

diff --git a/erp24/controllers/TimetableFactController.php b/erp24/controllers/TimetableFactController.php
index 820302c5..40781e51 100644
--- a/erp24/controllers/TimetableFactController.php
+++ b/erp24/controllers/TimetableFactController.php
@@ -44,12 +44,13 @@ class TimetableFactController extends Controller
             'pagination' => [
                 'pageSize' => 50
             ],
+            */
             'sort' => [
                 'defaultOrder' => [
                     'id' => SORT_DESC,
                 ]
             ],
-            */
+
         ]);
 
         return $this->render('index', [
diff --git a/erp24/views/timetable-fact/index.php b/erp24/views/timetable-fact/index.php
index be6f0ced..62136097 100644
--- a/erp24/views/timetable-fact/index.php
+++ b/erp24/views/timetable-fact/index.php
@@ -49,7 +49,7 @@ $this->params['breadcrumbs'][] = $this->title;
                 'attribute' => 'work_time',
                 'format' => 'raw',
                 'value' => function ($model) {
-                    return abs(intval($model->work_time));
+                    return $model->work_time;
                 },
             ],
             [
diff --git a/erp24/views/timetable-fact/view.php b/erp24/views/timetable-fact/view.php
index 83437bc1..a553499a 100644
--- a/erp24/views/timetable-fact/view.php
+++ b/erp24/views/timetable-fact/view.php
@@ -95,7 +95,7 @@ $this->title = "Фактический табель #$model->id";
                 'attribute' => 'work_time',
                 'format' => 'raw',
                 'value' => function ($model) {
-                    return abs(intval($model->work_time));
+                    return $model->work_time;
                 },
             ],
             [