From: marina <m.zozirova@gmail.com>
Date: Tue, 17 Dec 2024 07:23:26 +0000 (+0300)
Subject: Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c
X-Git-Tag: 1.7~160^2~1
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=536d6d0ce266890f01af389917467132359c6251;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c

# Conflicts:
#	erp24/records/WaybillIncoming.php
#	erp24/views/shift-transfer/_transfer.php
---

536d6d0ce266890f01af389917467132359c6251
diff --cc erp24/views/shift-transfer/_transfer.php
index 94140b34,f69332c2..2c2e7c44
--- a/erp24/views/shift-transfer/_transfer.php
+++ b/erp24/views/shift-transfer/_transfer.php
@@@ -64,12 -63,18 +63,15 @@@ echo \kartik\grid\GridView::widget(
              'attribute'  => 'remains_summ',
              'label' => 'Сумма остатков (недостача или излишек), руб',
              'pageSummary' => true,
 -            'value' => function($data) {
 -                return number_format($data['remains_summ'] ?? '', 2, '.', ' ');
 -            },
          ],
-         [
-             'attribute'  => 'self_cost',
-             'label' => 'Себестоимость, руб',
-             'pageSummary' => true,
-         ],
+ //        [
+ //            'attribute'  => 'self_cost',
+ //            'label' => 'Себестоимость, руб',
+ //            'pageSummary' => true,
+ //            'value' => function($data) {
+ //                return number_format($data['self_cost'] ?? '', 2, '.', ' ');
+ //            },
+ //        ],
      ],
      'layout' => '{items}',
      'showPageSummary' => true,