uzaharova

diff --git a/addons/helpdesk/core/fn.licenses.php b/addons/helpdesk/core/fn.licenses.php
index d117627..f4ee8a2 100644
--- a/addons/helpdesk/core/fn.licenses.php
+++ b/addons/helpdesk/core/fn.licenses.php
@@ -906,6 +906,8 @@ function fn_add_license_message($license_id, $num_new_stores = 0)
 
     $hd_product_type = fn_get_hd_product_type($license_data['product_id']);
 
+    $hd_product_data = fn_get_product_edition($license_data['product_id'], true);
+

uzaharova

diff --git a/app/addons/product_variations/func.php b/app/addons/product_variations/func.php
index d9b3f58..f78f6b8 100644
--- a/app/addons/product_variations/func.php
+++ b/app/addons/product_variations/func.php
@@ -547,16 +547,6 @@ function fn_product_variations_get_product_data_post(&$product_data, $auth, $pre
 }
 
 /**
- * Hook handler: on clone product.
- */

uzaharova

diff --git a/_tools/migration/migrations/20180417111159_core_add_new_log_type.php b/_tools/migration/migrations/20180417111159_core_add_new_log_type.php
index 7608219..9888ea4 100644
--- a/_tools/migration/migrations/20180417111159_core_add_new_log_type.php
+++ b/_tools/migration/migrations/20180417111159_core_add_new_log_type.php
@@ -39,7 +39,7 @@ class CoreAddNewLogType extends AbstractMigration
             foreach ($languages as $lang) {
                 $this->execute("
                     INSERT INTO {$pr}settings_descriptions (object_id, object_type, lang_code, value, tooltip)
-                    VALUES (" . $variant['variant_id'] . ", 'V', '" . $lang['lang_code'] . "', 'Shipping', '');
+                    VALUES (" . $variant['variant_id'] . ", 'V', '" . $lang['lang_code'] . "', 'Realtime shipping errors', '');

uzaharova

diff --git a/var/tools/migration/migrations/20180411075710_delete_companies_spammers.php b/var/tools/migration/migrations/20180411075710_delete_companies_spammers.php
new file mode 100644
index 0000000..7ae30f3
--- /dev/null
+++ b/var/tools/migration/migrations/20180411075710_delete_companies_spammers.php
@@ -0,0 +1,199 @@
+<?php
+
+use Migration\MigrationHelper;
+

uzaharova

diff --git a/app/addons/yml_export/Tygh/Ym/Yml2.php b/app/addons/yml_export/Tygh/Ym/Yml2.php
index 81c8782..4607989 100644
--- a/app/addons/yml_export/Tygh/Ym/Yml2.php
+++ b/app/addons/yml_export/Tygh/Ym/Yml2.php
@@ -49,6 +49,7 @@ class Yml2 implements IYml2
     protected $exclude_category_ids = array();
     protected $hidden_category_ids = array();
     protected $export_category_ids = array();
+    protected $yml_product_categories = array();
 

uzaharova

diff --git a/app/addons/yml_export/Tygh/Ym/Yml2.php b/app/addons/yml_export/Tygh/Ym/Yml2.php
index 81c8782..7fc4afe 100644
--- a/app/addons/yml_export/Tygh/Ym/Yml2.php
+++ b/app/addons/yml_export/Tygh/Ym/Yml2.php
@@ -49,6 +49,7 @@ class Yml2 implements IYml2
     protected $exclude_category_ids = array();
     protected $hidden_category_ids = array();
     protected $export_category_ids = array();
+    protected $yml_product_categories = array();
 

uzaharova

diff --git a/design/themes/responsive/templates/addons/rus_yandex_metrika/hooks/checkout/order_confirmation.post.tpl b/design/themes/responsive/templates/addons/rus_yandex_metrika/hooks/checkout/order_confirmation.post.tpl
index dadc1d4..f94eaec 100644
--- a/design/themes/responsive/templates/addons/rus_yandex_metrika/hooks/checkout/order_confirmation.post.tpl
+++ b/design/themes/responsive/templates/addons/rus_yandex_metrika/hooks/checkout/order_confirmation.post.tpl
@@ -1,21 +1,24 @@
 {if $order_info}
     <script type="text/javascript">
     var yaParams = {
-        order_id: "{$order_info.order_id}",
-        order_price: {$order_info.total},

uzaharova

diff --git a/app/addons/store_import/Tygh/StoreImport/Ult/F462T463.php b/app/addons/store_import/Tygh/StoreImport/Ult/F462T463.php
new file mode 100644
index 0000000..6031616
--- /dev/null
+++ b/app/addons/store_import/Tygh/StoreImport/Ult/F462T463.php
@@ -0,0 +1,453 @@
+<?php
+/***************************************************************************
+*                                                                          *
+*   (c) 2004 Vladimir V. Kalynyak, Alexey V. Vinokurov, Ilya M. Shalnev    *

uzaharova

diff --git a/app/addons/store_import/Tygh/StoreImport/Ult/F462T463.php b/app/addons/store_import/Tygh/StoreImport/Ult/F462T463.php
new file mode 100644
index 0000000..6031616
--- /dev/null
+++ b/app/addons/store_import/Tygh/StoreImport/Ult/F462T463.php
@@ -0,0 +1,453 @@
+<?php
+/***************************************************************************
+*                                                                          *
+*   (c) 2004 Vladimir V. Kalynyak, Alexey V. Vinokurov, Ilya M. Shalnev    *

uzaharova

diff --git a/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php b/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
index ed939f1..a6fd142 100644
--- a/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
+++ b/app/addons/rus_exim_1c/Tygh/Commerceml/RusEximCommerceml.php
@@ -2622,9 +2622,9 @@ class RusEximCommerceml
      *
      * @return string The product status.
      */
-    public function getProductStatusByAmount($amount)
+    public function getProductStatusByAmount($amount, $product_status)