From: Alexander Smirnov <fredeom@mail.ru>
Date: Wed, 18 Dec 2024 10:17:51 +0000 (+0300)
Subject: Merge branch 'develop' into feature_smirnov_erp-261_waybill_incoming
X-Git-Tag: 1.7~149^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=8278b4a29f8f80ee52529d10c3066ba37b307912;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_smirnov_erp-261_waybill_incoming

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

8278b4a29f8f80ee52529d10c3066ba37b307912
diff --cc erp24/api2/controllers/DataController.php
index 602467a8,49ed92ac..558cee44
--- a/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;
              }
  
+             $replacementInvoiceArray = $this->getResortingDoc();
+             $replacementInvoice = $replacementInvoiceArray['replacementInvoice'];
+             $replacementInvoiceResult = $replacementInvoiceArray['replacementInvoiceResult'];
+             $replacementInvoiceIds = $replacementInvoiceArray['replacementInvoiceIds'];
+ 
+             if (!empty($replacementInvoiceResult)) {
 -                $mess['create_write_ons'] = $replacementInvoiceResult;
++                $mess['create_resortings'] = $replacementInvoiceResult;
+             }
+ 
  //            $mess['delete_employee'] = [
  //                ['id' => '06202309-2808-0427-d4c9-100030128795'],
  //                ['id' => '06202309-2855-0215-4f5d-100043236389']