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

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

diff --cc erp24/api2/controllers/DataController.php
index 2244b9287806f54b77621091c0add46fce8543da,19e37ec328009618b43b3a15ac8ad92a2ead8cc1..ed350ba19e654e04aa9674a68936625082122e4f
--- 1/erp24/api2/controllers/DataController.php
--- 2/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
                                          )