fix conflicts

intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php

@@ -974,6 +974,10 @@ class RetailCrmHistory
                 $orders[$change['order']['id']] = $change['order'];
             }
 
+            if ($change['field'] == 'number') {
+                $orders[$change['order']['id']]['number'] = $change['newValue'];
+            }
+
             if ($change['item']) {
                 if ($orders[$change['order']['id']]['items'][$change['item']['id']]) {
                     $orders[$change['order']['id']]['items'][$change['item']['id']] = array_merge($orders[$change['order']['id']]['items'][$change['item']['id']], $change['item']);

intaro.retailcrm/description.ru

@@ -1 +1 @@
-- При обработке истории сбор по дублирующим товарам заменен на "externalId"
+- Добавлена обработка изменения номера заказа по истории

intaro.retailcrm/install/version.php

@@ -1,5 +1,5 @@
 <?
 $arModuleVersion = array(
-    "VERSION" => "2.5.3",
-    "VERSION_DATE" => "2019-11-1  15:10:00"
+    "VERSION" => "5.2.4",
+    "VERSION_DATE" => "2019-12-10  15:03:00"
 );