MAGETWO-53428: Product catalog Import/export - Date & Timezone issue

Author: oshmyheliuk

app/code/Magento/CatalogImportExport/Model/Export/Product.php

@@ -254,6 +254,16 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
         'tax_class_id' => 'tax_class_name',
     ];
 
+    /**
+     * Attributes codes which shows as date
+     *
+     * @var array
+     */
+    protected $dateAttrCodes = [
+        'special_from_date',
+        'special_to_date'
+    ];
+
     /**
      * Attributes codes which are appropriate for export and not the part of additional_attributes.
      *
@@ -897,7 +907,15 @@ protected function collectRawData()
                     }
                     $fieldName = isset($this->_fieldsMap[$code]) ? $this->_fieldsMap[$code] : $code;
 
-                    if ($this->_attributeTypes[$code] === 'datetime') {
+                    if (in_array($code, $this->dateAttrCodes)) {
+                        $attrValue = $this->_localeDate->formatDateTime(
+                            new \DateTime($attrValue),
+                            \IntlDateFormatter::SHORT,
+                            \IntlDateFormatter::NONE,
+                            null,
+                            date_default_timezone_get()
+                        );
+                    } else if ($this->_attributeTypes[$code] === 'datetime') {
                         $attrValue = $this->_localeDate->formatDateTime(
                             new \DateTime($attrValue),
                             \IntlDateFormatter::SHORT,

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -209,6 +209,16 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         '_upsell_' => \Magento\Catalog\Model\Product\Link::LINK_TYPE_UPSELL,
     ];
 
+    /**
+     * Attributes codes which shows as date
+     *
+     * @var array
+     */
+    protected $dateAttrCodes = [
+        'special_from_date',
+        'special_to_date'
+    ];
+
     /**
      * Need to log in import history
      *
@@ -1642,7 +1652,12 @@ protected function _saveProducts()
                     $attrTable = $attribute->getBackend()->getTable();
                     $storeIds = [0];
 
-                    if ('datetime' == $attribute->getBackendType() && strtotime($attrValue)) {
+                    if (
+                        'datetime' == $attribute->getBackendType()
+                        && in_array($attribute->getAttributeCode(), $this->dateAttrCodes)
+                    ) {
+                        $attrValue = $this->dateTime->formatDate($attrValue, false);
+                    } else if ('datetime' == $attribute->getBackendType() && strtotime($attrValue)) {
                         $attrValue = $this->dateTime->gmDate(
                             'Y-m-d H:i:s',
                             $this->_localeDate->date($attrValue)->getTimestamp()