Merge branch 'develop' into feature_zozirova_erp-243_replacment_actions_2

# Conflicts:
#	erp24/controllers/ShiftTransferController.php

diff --cc erp24/controllers/ShiftTransferController.php
index 0a1088355a114b2f39601ace7887422e673d607e,c73f661bc4b06a8ae59502d454424a1d9c4031cc..adae43732b3da8e74b00709850635c47f8c41632
--- 1/erp24/controllers/ShiftTransferController.php
--- 2/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@@ -14,9 -11,10 +14,11 @@@ use yii_app\records\EqualizationRemains
  use yii_app\records\ExportImportTable;
  use yii_app\records\MultipleModel;
  use yii_app\records\Prices;
 +use yii_app\records\Product1cReplacement;
  use yii_app\records\Products1c;
  use yii_app\records\ProductsClass;
+ use yii_app\records\ReplacementInvoice;
+ use yii_app\records\ReplacementInvoiceProducts;
  use yii_app\records\SelfCostProduct;
  use yii_app\records\ShiftRemains;
  use yii_app\records\ShiftTransfer;