From: marina <m.zozirova@gmail.com>
Date: Mon, 2 Dec 2024 08:09:18 +0000 (+0300)
Subject: Merge branch 'develop' into feature_zozirova_erp-243_replacment_actions_2
X-Git-Tag: 1.7~216^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=b2e1249e59e6ba49f335ccad7923177efead46e7;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_zozirova_erp-243_replacment_actions_2

# Conflicts:
#	erp24/controllers/ShiftTransferController.php
---

b2e1249e59e6ba49f335ccad7923177efead46e7
diff --cc erp24/controllers/ShiftTransferController.php
index 0a108835,c73f661b..adae4373
--- a/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;