Merge remote-tracking branch 'remotes/dev/2.0' into 2.0

Author: rgrebenchuk

Diff for: src/Oro/Bundle/SalesBundle/Autocomplete/CustomerSearchHandler.php

@@ -13,6 +13,7 @@
 use Oro\Bundle\SalesBundle\Provider\Customer\AccountAutocomplete\ChainAccountAutocompleteProvider;
 use Oro\Bundle\SalesBundle\Provider\Customer\ConfigProvider;
 use Oro\Bundle\SalesBundle\Provider\Customer\CustomerIconProviderInterface;
+use Oro\Bundle\SearchBundle\Event\PrepareResultItemEvent;
 use Oro\Bundle\SearchBundle\Query\Result\Item;
 
 class CustomerSearchHandler extends ContextSearchHandler
@@ -376,8 +377,8 @@ public function convertItem($item)
         if (!empty($item['searchItem'])) {
             /** @var Item $searchItem */
             $searchItem = $item['searchItem'];
+            $this->dispatcher->dispatch(PrepareResultItemEvent::EVENT_NAME, new PrepareResultItemEvent($searchItem));
 
-            /** @var Item $item */
             $text = $searchItem->getRecordTitle();
             $className = $searchItem->getEntityName();
             $identifier = $searchItem->getRecordId();

Diff for: src/Oro/Bundle/SalesBundle/Migrations/Schema/v1_31/Query/MigrateB2bCustomersQuery.php

@@ -49,17 +49,17 @@ protected function doExecute(LoggerInterface $logger, $dryRun = false)
             'FROM orocrm_sales_b2bcustomer WHERE account_id IS NULL';
         $customersWithoutAccount = $this->connection->fetchAll($query);
         foreach ($customersWithoutAccount as $customer) {
-            $query = 'INSERT INTO orocrm_account SET user_owner_id = :user_owner_id, '.
-                'organization_id = :organization_id, name = :name, createdAt = :createdAt, '.
-                'updatedAt = :updatedAt, serialized_data = :serialized_data';
+            $query = 'INSERT INTO orocrm_account '.
+                '(user_owner_id, organization_id, name, createdAt, updatedAt, serialized_data) '.
+                'VALUES(:user_owner_id, :organization_id, :name, :createdAt, :updatedAt, :serialized_data)';
             $this->connection->executeQuery(
                 $query,
                 [
                     'user_owner_id' => $customer['user_owner_id'],
                     'organization_id' => $customer['organization_id'],
                     'name' => $customer['name'],
-                    'createdAt' => $customer['createdAt'],
-                    'updatedAt' => $customer['updatedAt'],
+                    'createdAt' => isset($customer['createdAt']) ? $customer['createdAt'] : $customer['createdat'],
+                    'updatedAt' => isset($customer['updatedAt']) ? $customer['updatedAt'] : $customer['updatedat'],
                     'serialized_data' => base64_encode(serialize(null)),
                 ],
                 [