Merge branch 'MAGETWO-28012' of https://github.corp.ebay.com/magento-firedrakes/magento2ce into MAGETWO-28012

Author: Dmytro Voskoboinikov

app/code/Magento/CustomerImportExport/Model/Import/Address.php

@@ -539,7 +539,8 @@ protected function _prepareDataForUpdate(array $rowData)
             'entity_row_new' => $entityRowNew,
             'entity_row_update' => $entityRowUpdate,
             'attributes' => $attributes,
-            'defaults' => $defaults];
+            'defaults' => $defaults
+        ];
     }
 
     /**

app/code/Magento/CustomerImportExport/Model/Import/Customer.php

@@ -222,8 +222,6 @@ protected function _saveCustomerEntities(array $entitiesToCreate, array $entitie
             'suffix',
             'dob',
             'password_hash',
-            'default_billing',
-            'default_shipping',
             'taxvat',
             'confirmation',
             'gender',

app/code/Magento/ImportExport/Model/Export.php

@@ -12,6 +12,7 @@
  * Export model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Export extends \Magento\ImportExport\Model\AbstractModel
 {
@@ -213,16 +214,44 @@ public static function getAttributeFilterType(\Magento\Eav\Model\Entity\Attribut
             return self::FILTER_TYPE_DATE;
         } elseif ('decimal' == $attribute->getBackendType() || 'int' == $attribute->getBackendType()) {
             return self::FILTER_TYPE_NUMBER;
-        } elseif ($attribute->isStatic() ||
-            'varchar' == $attribute->getBackendType() ||
-            'text' == $attribute->getBackendType()
-        ) {
+        } elseif ('varchar' == $attribute->getBackendType() || 'text' == $attribute->getBackendType()) {
             return self::FILTER_TYPE_INPUT;
+        } elseif ($attribute->isStatic()) {
+            return self::getStaticAttributeFilterType($attribute);
         } else {
             throw new \Magento\Framework\Exception\LocalizedException(__('Cannot determine attribute filter type'));
         }
     }
 
+    /**
+     * Determine filter type for static attribute.
+     *
+     * @static
+     * @param \Magento\Eav\Model\Entity\Attribute $attribute
+     * @return string
+     */
+    public static function getStaticAttributeFilterType(\Magento\Eav\Model\Entity\Attribute $attribute)
+    {
+        if ($attribute->getAttributeCode() == 'category_ids') {
+            return self::FILTER_TYPE_INPUT;
+        }
+        $columns = $attribute->getFlatColumns();
+        switch ($columns[$attribute->getAttributeCode()]['type']) {
+            case \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER:
+            case \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT:
+                $type = self::FILTER_TYPE_NUMBER;
+                break;
+            case \Magento\Framework\DB\Ddl\Table::TYPE_DATE:
+            case \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME:
+            case \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP:
+                $type = self::FILTER_TYPE_DATE;
+                break;
+            default:
+                $type = self::FILTER_TYPE_INPUT;
+        }
+        return $type;
+    }
+
     /**
      * MIME-type for 'Content-Type' header.
      *