From 474cc79c77289c596466f8ab95422b94edc61786 Mon Sep 17 00:00:00 2001
From: Govind Sharma <govindpokhrelsharma@cedcoss.com>
Date: Tue, 8 Jan 2019 16:07:42 +0530
Subject: [PATCH] Fixed issue #19891

Fixed issue #19891 added check of attribute type_id
---
 .../Catalog/Controller/Adminhtml/Product/Attribute/Validate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
index 3a81b4633b2ff..b4bb7fd05f740 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
@@ -100,7 +100,7 @@ public function execute()
             $attributeCode
         );
 
-        if ($attribute->getId() && !$attributeId || $attributeCode === 'product_type') {
+        if ($attribute->getId() && !$attributeId || $attributeCode === 'product_type' || $attributeCode === 'type_id') {
             $message = strlen($this->getRequest()->getParam('attribute_code'))
                 ? __('An attribute with this code already exists.')
                 : __('An attribute with the same code (%1) already exists.', $attributeCode);