Merge branch 'develop' into feature_smirnov_erp-261_waybill_incoming

# Conflicts:
#	erp24/api2/controllers/DataController.php

diff --cc erp24/api2/controllers/DataController.php
index 602467a8a340eaec6a5afd08801203fdfb30c9d4,49ed92acc41628574ee5df768f955ffa93986844..558cee446031e10a9dfff3707ed0fc0dc27af395
--- 1/erp24/api2/controllers/DataController.php
--- 2/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@@ -153,6 -159,15 +157,15 @@@ class DataController extends BaseContro
                  $mess['create_employee'] = $createEmployeeArray;
              }
  
 -                $mess['create_write_ons'] = $replacementInvoiceResult;
+             $replacementInvoiceArray = $this->getResortingDoc();
+             $replacementInvoice = $replacementInvoiceArray['replacementInvoice'];
+             $replacementInvoiceResult = $replacementInvoiceArray['replacementInvoiceResult'];
+             $replacementInvoiceIds = $replacementInvoiceArray['replacementInvoiceIds'];
+ 
+             if (!empty($replacementInvoiceResult)) {
++                $mess['create_resortings'] = $replacementInvoiceResult;
+             }
+ 
  //            $mess['delete_employee'] = [
  //                ['id' => '06202309-2808-0427-d4c9-100030128795'],
  //                ['id' => '06202309-2855-0215-4f5d-100043236389']