From: marina <m.zozirova@gmail.com>
Date: Tue, 20 Aug 2024 12:06:08 +0000 (+0300)
Subject: Merge branch 'develop' into feature_zozirova_erp-102_adjustment
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=caeb3cb5b02cea73d11f513492cdeaebc00a090d;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_zozirova_erp-102_adjustment
---

caeb3cb5b02cea73d11f513492cdeaebc00a090d
diff --cc erp24/actions/motivation/IndexAction.php
index e9d8ddfd,65c51637..d85f5c4c
--- a/erp24/actions/motivation/IndexAction.php
+++ b/erp24/actions/motivation/IndexAction.php
@@@ -9,10 -7,8 +7,9 @@@ use yii\base\Action
  use yii\base\DynamicModel;
  use yii\helpers\ArrayHelper;
  use yii\web\UploadedFile;
 +use yii_app\records\Admin;
  use yii_app\records\CityStore;
  use yii_app\records\Motivation;
- use yii_app\records\MotivationCostsItem;
  use yii_app\services\MotivationService;
  
  class IndexAction extends Action