From: marina <m.zozirova@gmail.com>
Date: Thu, 19 Dec 2024 10:59:47 +0000 (+0300)
Subject: Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c
X-Git-Tag: 1.7~128^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=574fd620a9cf4dfe722946eac56787099518f344;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c

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

574fd620a9cf4dfe722946eac56787099518f344
diff --cc erp24/api2/controllers/DataController.php
index 2244b928,19e37ec3..ed350ba1
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@@ -1103,8 -1102,8 +1110,8 @@@ class DataController extends BaseContro
                                      LogService::apiErrorLog(
                                          json_encode(
                                              [
-                                                 "error_id" => 11,
+                                                 "error_id" => 11.3,
 -                                            "error" => $writeOffsErp->getErrors()
 +                                                "error" => $writeOffsErp->getErrors()
                                              ],
                                              JSON_UNESCAPED_UNICODE
                                          )