From: Aleksey Filippov <aleksey.filippov@erp-flowers.ru>
Date: Fri, 13 Dec 2024 12:25:29 +0000 (+0000)
Subject: Merge branch 'feature_smirnov_2024_12_13_plashka' into 'develop'
X-Git-Tag: 1.7~168
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=7cc39c562c5a980d08b4bfbe602f9cd135c07004;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'feature_smirnov_2024_12_13_plashka' into 'develop'

Feature smirnov 2024 12 13 plashka

See merge request gitlab-instance/yii-erp24!503
---

7cc39c562c5a980d08b4bfbe602f9cd135c07004
diff --cc erp24/records/ShiftTransfer.php
index 41df4bbb,db1261e6..9a3eece7
--- a/erp24/records/ShiftTransfer.php
+++ b/erp24/records/ShiftTransfer.php
@@@ -39,9 -39,9 +39,9 @@@ class ShiftTransfer extends \yii\db\Act
          return [
              self::STATUS_ID_INPUT_FACT_REMAINS => 'Ввод фактических остатков',
              self::STATUS_ID_TRANSFER_ACTIONS => 'Действия по замене',
-             self::STATUS_ID_READY_TO_ACCEPT => 'Готова к принятию',
+             self::STATUS_ID_READY_TO_ACCEPT => 'Готов к принятию',
              self::STATUS_ID_ACCEPTED => 'Принято',
 -            self::STATUS_OF_THE_FORMATION_OF_SURPLUSES_AND_SHORTAGES => 'Cтатус формирования излишков и недостачи',
 +            self::STATUS_OF_THE_FORMATION_OF_SURPLUSES_AND_SHORTAGES => 'Формирования излишков и недостачи',
          ];
      }