Merge branch 'develop' into feature_zozirova_erp-102_adjustment

diff --cc erp24/actions/motivation/IndexAction.php
index e9d8ddfde62fe5a9d3180a327cd374a0b4a1a67f,65c516374ee655a096e96a5cf30c8e9f5e3711b5..d85f5c4cbf10d0b08c479a14603d242345823c99
--- 1/erp24/actions/motivation/IndexAction.php
--- 2/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

diff --cc erp24/services/MotivationService.php
Simple merge