From 30a57dbbdcd8b1ebd1bf285d650a375c983f0c8a Mon Sep 17 00:00:00 2001
From: Alexandr Parkhomenko <oparkhomenko@oroinc.com>
Date: Tue, 3 Jan 2017 21:16:39 +0200
Subject: [PATCH 01/29] CRM-6658: Widget "Average Lifetime Sales" is not
 working correctly with empty custom date

---
 .../Resources/public/js/widget/date-range.js  | 74 +++++++++++++------
 .../views/Js/default_templates.js.twig        |  2 +-
 2 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/js/widget/date-range.js b/src/Oro/Bundle/DashboardBundle/Resources/public/js/widget/date-range.js
index 09c29e33697..4091ecf4092 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/js/widget/date-range.js
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/js/widget/date-range.js
@@ -16,13 +16,21 @@ define(function(require) {
             value: -5
         },
 
+        fieldsDataName: {
+            datePart: 'date_part',
+            customPart: 'custom_part'
+        },
+
+        domCache: null,
+
         /**
          * @inheritDoc
          */
         events: {
+            'change select': 'skipOnChangeFilterTypeHandler',
             'change .date-visual-element': '_onClickUpdateCriteria',
             'change select[name=date_part], input[name$="[type]"]': 'onChangeFilterType',
-            'change select[name=""]': 'onChangeFilterTypeView'
+            'change select[data-name$="_part"]': 'onChangeFilterTypeView'
         },
 
         /**
@@ -35,22 +43,30 @@ define(function(require) {
             options.$form.on('submit' + this.eventNamespace(), _.bind(this.onSubmit, this));
         },
 
-        onSubmit: function(e) {
+        createDomCache: function() {
+            this.domCache = {
+                $datePart: this.$('select[data-name="' + this.fieldsDataName.datePart + '"]'),
+                $customPart: this.$('select[data-name="' + this.fieldsDataName.customPart + '"]'),
+                $dateTypeCriteriaValue: this.$(this.criteriaValueSelectors.date_type)
+            };
+        },
+
+        onSubmit: function() {
             var value = _.extend({}, this.emptyValue, this.getValue());
             if (_.values(this.typeValues).indexOf(parseInt(value.type)) !== -1 &&
                 !value.value.start && !value.value.end
             ) {
-                this.$('select[name=""]').eq(0).val(this.typeDefinedValues.all_time).change();
-                this.applyValue();
+                var defaultTypeValue = this.getDefaultTypeValue();
+                this.domCache.$datePart.val(defaultTypeValue).change();
             }
         },
 
         onChangeFilterTypeView: function(e) {
             var val = parseInt($(e.target).val());
             if (val === this.customChoice.value) {
-                val = this.$('select[name=""]').eq(1).val();
+                val = this.domCache.$customPart.val();
             }
-            this.$(this.criteriaValueSelectors.date_type).val(val).change();
+            this.domCache.$dateTypeCriteriaValue.val(val).change();
             this.applyValue();
         },
 
@@ -71,6 +87,7 @@ define(function(require) {
                 return;
             }
 
+            this.domCache = null;
             this.options.$form.off(this.eventNamespace());
             WidgetConfigDateRangeFilter.__super__.dispose.apply(this, arguments);
         },
@@ -80,31 +97,32 @@ define(function(require) {
 
             var type = parseInt(value, 10);
             if (!isNaN(type)) {
-                var $select = this.$('.selector:has(select[name=""]):eq(1), select[name=""]:eq(1)').eq(0);
-                if (_.values(this.typeDefinedValues).indexOf(type) > -1) {
-                    $select.hide();
+                if (_.values(this.typeDefinedValues).indexOf(type) === -1) {
+                    this.domCache.$customPart.show();
                 } else {
-                    // set correct width of uniform widget in case <select> was hidden before, since widget
-                    // wasn't initialized yet
-                    var $hiddenSelect = $('select[name=""]:eq(1)');
-                    if ($hiddenSelect.css('display') === 'none' &&
-                        $hiddenSelect.data('bound-input-widget') === 'uniform'
-                    ) {
-                        $hiddenSelect.css('display', '').data('input-widget').refresh();
-                    }
-
-                    $select.css('display', '');
+                    this.domCache.$customPart.hide();
+                }
+
+                // set correct width of uniform widget
+                if (this.domCache.$customPart.data('bound-input-widget') === 'uniform') {
+                    this.domCache.$customPart.data('input-widget').refresh();
                 }
             }
         },
 
+        getDefaultTypeValue: function() {
+            var choiceData = _.pluck(this.choices, 'data');
+            return choiceData.indexOf(this.typeDefinedValues.all_time) === -1 ?
+                this.emptyValue.type :
+                this.typeDefinedValues.all_time;
+        },
+
         _getParts: function() {
-            var parts = WidgetConfigDateRangeFilter.__super__._getParts.apply(this, arguments);
             if (!this.valueTypes) {
-                return parts;
+                return WidgetConfigDateRangeFilter.__super__._getParts.apply(this, arguments);
             }
 
-            parts.pop();
+            var parts = [];
             var value = _.extend({}, this.emptyValue, this.getValue());
             var selectedChoiceLabel = this._getSelectedChoiceLabel('choices', value);
             var datePartTemplate = this._getTemplate(this.fieldTemplateSelector);
@@ -117,6 +135,7 @@ define(function(require) {
             parts.push(
                 datePartTemplate({
                     name: '',
+                    dataName: this.fieldsDataName.datePart,
                     choices: typeDefinedValueChoices,
                     selectedChoice: typeDefinedValues.indexOf(value.type) !== -1 ? value.type : this.customChoice.value,
                     selectedChoiceLabel: selectedChoiceLabel,
@@ -131,6 +150,7 @@ define(function(require) {
             parts.push(
                 datePartTemplate({
                     name: '',
+                    dataName: this.fieldsDataName.customPart,
                     choices: typeValueChoices,
                     selectedChoice: value.type,
                     selectedChoiceLabel: selectedChoiceLabel
@@ -146,6 +166,11 @@ define(function(require) {
             return parts;
         },
 
+        _appendFilter: function($filter) {
+            WidgetConfigDateRangeFilter.__super__._appendFilter.call(this, $filter);
+            this.createDomCache();
+        },
+
         /**
          * @inheritDoc
          */
@@ -170,6 +195,11 @@ define(function(require) {
         _updateDOMValue: function() {
             return this._writeDOMValue(this._formatRawValue(this.getValue()));
         },
+
+        /**
+         * This method allow us to reset parent event observer
+         */
+        skipOnChangeFilterTypeHandler: function() {}
     });
 
     return WidgetConfigDateRangeFilter;
diff --git a/src/Oro/Bundle/FilterBundle/Resources/views/Js/default_templates.js.twig b/src/Oro/Bundle/FilterBundle/Resources/views/Js/default_templates.js.twig
index d768f8ec793..18f7e074282 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/views/Js/default_templates.js.twig
+++ b/src/Oro/Bundle/FilterBundle/Resources/views/Js/default_templates.js.twig
@@ -105,7 +105,7 @@
 <script type="text/template" id="select-field-template">
     <div class="horizontal clearfix">
         <span class="filter-select-oro-wrapper">
-            <select name="<%= name %>" class="filter-select-oro">
+            <select name="<%= name %>" <% if (typeof(dataName) !== "undefined") { %>data-name="<%= dataName %>"<% } %> class="filter-select-oro">
                 <% _.each(choices, function (option) { %>
                 <option value="<%= option.value %>"<% if (option.value == selectedChoice) { %> selected="selected"<% } %>><%- option.label %></option>
                 <% }); %>

From d0ff63410cf2717564e7bc77e8bb209c50e5d5d1 Mon Sep 17 00:00:00 2001
From: Mykhailo <mkudelia@oroinc.com>
Date: Wed, 4 Jan 2017 16:25:04 +0200
Subject: [PATCH 02/29] check cache only on master request - related to issue
 https://github.com/orocrm/platform/pull/603

---
 src/Oro/Bundle/SecurityBundle/Annotation/AclListener.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Oro/Bundle/SecurityBundle/Annotation/AclListener.php b/src/Oro/Bundle/SecurityBundle/Annotation/AclListener.php
index 96ea824d5e1..efb5a006773 100644
--- a/src/Oro/Bundle/SecurityBundle/Annotation/AclListener.php
+++ b/src/Oro/Bundle/SecurityBundle/Annotation/AclListener.php
@@ -39,6 +39,10 @@ public function __construct(
      */
     public function onKernelRequest(GetResponseEvent $event)
     {
+        if(!$event->isMasterRequest()) {
+            return;
+        }
+
         if (!$this->isFresh()) {
             $this->cacheProvider->warmUpCache();
             $this->dumper->dump();

From 4b4061395f1ca61d415c3e23068fcd5eaab77701 Mon Sep 17 00:00:00 2001
From: Mykhailo <mkudelia@oroinc.com>
Date: Wed, 4 Jan 2017 16:45:07 +0200
Subject: [PATCH 03/29] add space - related to issue
 https://github.com/orocrm/platform/pull/603

---
 src/Oro/Bundle/SecurityBundle/Annotation/AclListener.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/SecurityBundle/Annotation/AclListener.php b/src/Oro/Bundle/SecurityBundle/Annotation/AclListener.php
index efb5a006773..7a540aebd1d 100644
--- a/src/Oro/Bundle/SecurityBundle/Annotation/AclListener.php
+++ b/src/Oro/Bundle/SecurityBundle/Annotation/AclListener.php
@@ -39,7 +39,7 @@ public function __construct(
      */
     public function onKernelRequest(GetResponseEvent $event)
     {
-        if(!$event->isMasterRequest()) {
+        if (!$event->isMasterRequest()) {
             return;
         }
 

From 0e709126b84ac552f303e15b27deee1ee8f70e17 Mon Sep 17 00:00:00 2001
From: Andrey Agafonkin <aagafonkin@magecore.com>
Date: Wed, 4 Jan 2017 20:08:47 +0200
Subject: [PATCH 04/29] BAP-13246: Several data audit grids on the same page

---
 .../Resources/views/Audit/widget/history.html.twig           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DataAuditBundle/Resources/views/Audit/widget/history.html.twig b/src/Oro/Bundle/DataAuditBundle/Resources/views/Audit/widget/history.html.twig
index 272e7ffe45d..8caae68cbad 100644
--- a/src/Oro/Bundle/DataAuditBundle/Resources/views/Audit/widget/history.html.twig
+++ b/src/Oro/Bundle/DataAuditBundle/Resources/views/Audit/widget/history.html.twig
@@ -6,7 +6,10 @@
     <div class="container-fluid">
         {% block content %}
             {# gridName set from corresponding controllers #}
-            {{ dataGrid.renderGrid(gridName, {object_class: entityClass, object_id: entityId, field_name: fieldName}) }}
+            {{ dataGrid.renderGrid(
+                oro_datagrid_build_fullname(gridName, entityClass~entityId),
+                {object_class: entityClass, object_id: entityId, field_name: fieldName}
+            ) }}
         {% endblock %}
     </div>
 </div>

From 77def939a22988e205b27141e5a39c0bc2ee3687 Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Thu, 5 Jan 2017 18:17:22 +0200
Subject: [PATCH 05/29] BAP-13253: Invalid check of target fields in
 add*InverseRelation (#6175)

---
 .../Migration/Extension/ExtendExtension.php   | 131 +++++++++---------
 .../Resources/doc/relations.md                |  62 ++++-----
 2 files changed, 95 insertions(+), 98 deletions(-)

diff --git a/src/Oro/Bundle/EntityExtendBundle/Migration/Extension/ExtendExtension.php b/src/Oro/Bundle/EntityExtendBundle/Migration/Extension/ExtendExtension.php
index 9511b5c6053..5df4cdef653 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Migration/Extension/ExtendExtension.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Migration/Extension/ExtendExtension.php
@@ -342,14 +342,13 @@ public function addEnumField(
      * Adds one-to-many relation
      *
      * @param Schema       $schema
-     * @param Table|string $table                     A Table object or table name
+     * @param Table|string $table                     A Table object or table name of owning side entity
      * @param string       $associationName           The name of a relation field
-     * @param Table|string $targetTable               A Table object or table name
+     * @param Table|string $targetTable               A Table object or table name of inverse side entity
      * @param string[]     $targetTitleColumnNames    Column names are used to show a title of related entity
      * @param string[]     $targetDetailedColumnNames Column names are used to show detailed info about related entity
      * @param string[]     $targetGridColumnNames     Column names are used to show related entity in a grid
-     * @param array        $options                   Entity config values
-     *                                                format is [CONFIG_SCOPE => [CONFIG_KEY => CONFIG_VALUE]]
+     * @param array        $options                   Entity config options. [scope => [name => value, ...], ...]
      * @param string       $fieldType                 The field type. By default the field type is oneToMany,
      *                                                but you can specify another type if it is based on oneToMany.
      *                                                In this case this type should be registered
@@ -417,13 +416,12 @@ public function addOneToManyRelation(
      * Adds the inverse side of a one-to-many relation
      *
      * @param Schema       $schema
-     * @param Table|string $table                     A Table object or table name
-     * @param string       $associationName           The name of a relation field
-     * @param Table|string $targetTable               A Table object or table name
-     * @param string       $targetAssociationName     The name of a relation field on the inverse side
-     * @param string       $targetColumnName          A column name is used to show related entity
-     * @param array        $options                   Entity config values
-     *                                                format is [CONFIG_SCOPE => [CONFIG_KEY => CONFIG_VALUE]]
+     * @param Table|string $table                 A Table object or table name of owning side entity
+     * @param string       $associationName       The name of a relation field
+     * @param Table|string $targetTable           A Table object or table name of inverse side entity
+     * @param string       $targetAssociationName The name of a relation field on the inverse side
+     * @param string       $titleColumnName       A column name is used to show owning side entity
+     * @param array        $options               Entity config options. [scope => [name => value, ...], ...]
      */
     public function addOneToManyInverseRelation(
         Schema $schema,
@@ -431,12 +429,13 @@ public function addOneToManyInverseRelation(
         $associationName,
         $targetTable,
         $targetAssociationName,
-        $targetColumnName,
+        $titleColumnName,
         array $options = []
     ) {
         $this->ensureExtendFieldSet($options);
 
         $selfTableName = $this->getTableName($table);
+        $selfTable     = $this->getTable($selfTableName, $schema);
         $selfClassName = $this->getEntityClassByTableName($selfTableName);
 
         $targetTableName = $this->getTableName($targetTable);
@@ -448,7 +447,7 @@ public function addOneToManyInverseRelation(
             $associationName
         );
 
-        $this->checkColumnsExist($targetTable, [$targetColumnName]);
+        $this->checkColumnsExist($selfTable, [$titleColumnName]);
         $this->checkColumnsExist($targetTable, [$existingTargetColumnName]);
 
         $relationKey = ExtendHelper::buildRelationKey(
@@ -480,7 +479,7 @@ public function addOneToManyInverseRelation(
         $options[ExtendOptionsManager::TARGET_OPTION] = [
             'table_name'   => $selfTableName,
             'relation_key' => $relationKey,
-            'column'       => $targetColumnName,
+            'column'       => $titleColumnName,
         ];
         $options[ExtendOptionsManager::TYPE_OPTION]   = RelationType::MANY_TO_ONE;
         $options['extend']['column_name']             = $existingTargetColumnName;
@@ -495,13 +494,13 @@ public function addOneToManyInverseRelation(
      * Adds many-to-many relation
      *
      * @param Schema       $schema
-     * @param Table|string $table                     A Table object or table name
+     * @param Table|string $table                     A Table object or table name of owning side entity
      * @param string       $associationName           The name of a relation field
-     * @param Table|string $targetTable               A Table object or table name
+     * @param Table|string $targetTable               A Table object or table name of inverse side entity
      * @param string[]     $targetTitleColumnNames    Column names are used to show a title of related entity
      * @param string[]     $targetDetailedColumnNames Column names are used to show detailed info about related entity
      * @param string[]     $targetGridColumnNames     Column names are used to show related entity in a grid
-     * @param array        $options
+     * @param array        $options                   Entity config options. [scope => [name => value, ...], ...]
      * @param string       $fieldType                 The field type. By default the field type is manyToMany,
      *                                                but you can specify another type if it is based on manyToMany.
      *                                                In this case this type should be registered
@@ -587,15 +586,14 @@ public function addManyToManyRelation(
      * Adds the inverse side of a many-to-many relation
      *
      * @param Schema       $schema
-     * @param Table|string $table                     A Table object or table name
-     * @param string       $associationName           The name of a relation field
-     * @param Table|string $targetTable               A Table object or table name
-     * @param string       $targetAssociationName     The name of a relation field on the inverse side
-     * @param string[]     $targetTitleColumnNames    Column names are used to show a title of related entity
-     * @param string[]     $targetDetailedColumnNames Column names are used to show detailed info about related entity
-     * @param string[]     $targetGridColumnNames     Column names are used to show related entity in a grid
-     * @param array        $options                   Entity config values
-     *                                                format is [CONFIG_SCOPE => [CONFIG_KEY => CONFIG_VALUE]]
+     * @param Table|string $table                 A Table object or table name of owning side entity
+     * @param string       $associationName       The name of a relation field
+     * @param Table|string $targetTable           A Table object or table name of inverse side entity
+     * @param string       $targetAssociationName The name of a relation field on the inverse side
+     * @param string[]     $titleColumnNames      Column names are used to show a title of owning side entity
+     * @param string[]     $detailedColumnNames   Column names are used to show detailed info about owning side entity
+     * @param string[]     $gridColumnNames       Column names are used to show owning side entity in a grid
+     * @param array        $options               Entity config options. [scope => [name => value, ...], ...]
      */
     public function addManyToManyInverseRelation(
         Schema $schema,
@@ -603,23 +601,23 @@ public function addManyToManyInverseRelation(
         $associationName,
         $targetTable,
         $targetAssociationName,
-        array $targetTitleColumnNames,
-        array $targetDetailedColumnNames,
-        array $targetGridColumnNames,
+        array $titleColumnNames,
+        array $detailedColumnNames,
+        array $gridColumnNames,
         array $options = []
     ) {
         $this->ensureExtendFieldSet($options);
 
         $selfTableName = $this->getTableName($table);
+        $selfTable     = $this->getTable($selfTableName, $schema);
         $selfClassName = $this->getEntityClassByTableName($selfTableName);
 
         $targetTableName = $this->getTableName($targetTable);
-        $targetTable     = $this->getTable($targetTable, $schema);
         $targetClassName = $this->getEntityClassByTableName($targetTableName);
 
-        $this->checkColumnsExist($targetTable, $targetTitleColumnNames);
-        $this->checkColumnsExist($targetTable, $targetDetailedColumnNames);
-        $this->checkColumnsExist($targetTable, $targetGridColumnNames);
+        $this->checkColumnsExist($selfTable, $titleColumnNames);
+        $this->checkColumnsExist($selfTable, $detailedColumnNames);
+        $this->checkColumnsExist($selfTable, $gridColumnNames);
 
         $relationKey = ExtendHelper::buildRelationKey(
             $selfClassName,
@@ -651,9 +649,9 @@ public function addManyToManyInverseRelation(
             'table_name'   => $selfTableName,
             'relation_key' => $relationKey,
             'columns'      => [
-                'title'    => $targetTitleColumnNames,
-                'detailed' => $targetDetailedColumnNames,
-                'grid'     => $targetGridColumnNames,
+                'title'    => $titleColumnNames,
+                'detailed' => $detailedColumnNames,
+                'grid'     => $gridColumnNames,
             ],
         ];
         $options[ExtendOptionsManager::TYPE_OPTION]   = RelationType::MANY_TO_MANY;
@@ -668,22 +666,22 @@ public function addManyToManyInverseRelation(
      * Adds many-to-one relation
      *
      * @param Schema       $schema
-     * @param Table|string $table            A Table object or table name
-     * @param string       $associationName  The name of a relation field
-     * @param Table|string $targetTable      A Table object or table name
-     * @param string       $targetColumnName A column name is used to show related entity
-     * @param array        $options
-     * @param string       $fieldType        The field type. By default the field type is manyToOne,
-     *                                       but you can specify another type if it is based on manyToOne.
-     *                                       In this case this type should be registered
-     *                                       in entity_extend.yml under underlying_types section
+     * @param Table|string $table                 A Table object or table name of owning side entity
+     * @param string       $associationName       The name of a relation field
+     * @param Table|string $targetTable           A Table object or table name of inverse side entity
+     * @param string       $targetTitleColumnName A column name is used to show related entity
+     * @param array        $options               Entity config options. [scope => [name => value, ...], ...]
+     * @param string       $fieldType             The field type. By default the field type is manyToOne,
+     *                                            but you can specify another type if it is based on manyToOne.
+     *                                            In this case this type should be registered
+     *                                            in entity_extend.yml under underlying_types section
      */
     public function addManyToOneRelation(
         Schema $schema,
         $table,
         $associationName,
         $targetTable,
-        $targetColumnName,
+        $targetTitleColumnName,
         array $options = [],
         $fieldType = RelationType::MANY_TO_ONE
     ) {
@@ -699,7 +697,7 @@ public function addManyToOneRelation(
             '_' . $primaryKeyColumnName
         );
 
-        $this->checkColumnsExist($targetTable, [$targetColumnName]);
+        $this->checkColumnsExist($targetTable, [$targetTitleColumnName]);
 
         $this->addRelation(
             $selfTable,
@@ -711,7 +709,7 @@ public function addManyToOneRelation(
 
         $options[ExtendOptionsManager::TARGET_OPTION] = [
             'table_name' => $targetTableName,
-            'column'     => $targetColumnName,
+            'column'     => $targetTitleColumnName,
         ];
         $options[ExtendOptionsManager::TYPE_OPTION]   = $fieldType;
         $this->extendOptionsManager->setColumnOptions(
@@ -725,15 +723,14 @@ public function addManyToOneRelation(
      * Adds the inverse side of a many-to-one relation
      *
      * @param Schema       $schema
-     * @param Table|string $table                     A Table object or table name
-     * @param string       $associationName           The name of a relation field
-     * @param Table|string $targetTable               A Table object or table name
-     * @param string       $targetAssociationName     The name of a relation field on the inverse side
-     * @param string[]     $targetTitleColumnNames    Column names are used to show a title of related entity
-     * @param string[]     $targetDetailedColumnNames Column names are used to show detailed info about related entity
-     * @param string[]     $targetGridColumnNames     Column names are used to show related entity in a grid
-     * @param array        $options                   Entity config values
-     *                                                format is [CONFIG_SCOPE => [CONFIG_KEY => CONFIG_VALUE]]
+     * @param Table|string $table                 A Table object or table name of owning side entity
+     * @param string       $associationName       The name of a relation field
+     * @param Table|string $targetTable           A Table object or table name of inverse side entity
+     * @param string       $targetAssociationName The name of a relation field on the inverse side
+     * @param string[]     $titleColumnNames      Column names are used to show a title of owning side entity
+     * @param string[]     $detailedColumnNames   Column names are used to show detailed info about owning side entity
+     * @param string[]     $gridColumnNames       Column names are used to show owning side entity in a grid
+     * @param array        $options               Entity config options. [scope => [name => value, ...], ...]
      */
     public function addManyToOneInverseRelation(
         Schema $schema,
@@ -741,23 +738,23 @@ public function addManyToOneInverseRelation(
         $associationName,
         $targetTable,
         $targetAssociationName,
-        array $targetTitleColumnNames,
-        array $targetDetailedColumnNames,
-        array $targetGridColumnNames,
+        array $titleColumnNames,
+        array $detailedColumnNames,
+        array $gridColumnNames,
         array $options = []
     ) {
         $this->ensureExtendFieldSet($options);
 
         $selfTableName = $this->getTableName($table);
+        $selfTable     = $this->getTable($selfTableName, $schema);
         $selfClassName = $this->getEntityClassByTableName($selfTableName);
 
         $targetTableName = $this->getTableName($targetTable);
-        $targetTable     = $this->getTable($targetTable, $schema);
         $targetClassName = $this->getEntityClassByTableName($targetTableName);
 
-        $this->checkColumnsExist($targetTable, $targetTitleColumnNames);
-        $this->checkColumnsExist($targetTable, $targetDetailedColumnNames);
-        $this->checkColumnsExist($targetTable, $targetGridColumnNames);
+        $this->checkColumnsExist($selfTable, $titleColumnNames);
+        $this->checkColumnsExist($selfTable, $detailedColumnNames);
+        $this->checkColumnsExist($selfTable, $gridColumnNames);
 
         $relationKey = ExtendHelper::buildRelationKey(
             $selfClassName,
@@ -789,9 +786,9 @@ public function addManyToOneInverseRelation(
             'table_name'   => $selfTableName,
             'relation_key' => $relationKey,
             'columns'      => [
-                'title'    => $targetTitleColumnNames,
-                'detailed' => $targetDetailedColumnNames,
-                'grid'     => $targetGridColumnNames,
+                'title'    => $titleColumnNames,
+                'detailed' => $detailedColumnNames,
+                'grid'     => $gridColumnNames,
             ],
         ];
         $options[ExtendOptionsManager::TYPE_OPTION]   = RelationType::ONE_TO_MANY;
diff --git a/src/Oro/Bundle/EntityExtendBundle/Resources/doc/relations.md b/src/Oro/Bundle/EntityExtendBundle/Resources/doc/relations.md
index f10e4c818aa..f9714a47cc2 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Resources/doc/relations.md
+++ b/src/Oro/Bundle/EntityExtendBundle/Resources/doc/relations.md
@@ -33,7 +33,7 @@ class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
             $schema,
             'oro_user', // owning side table
             'room', // owning side field name
-            'acme_user_room', // target side table
+            'acme_user_room', // inverse side table
             'name', // column name is used to show related entity
             ['extend' => ['owner' => ExtendScope::OWNER_CUSTOM]]
         );
@@ -71,7 +71,7 @@ class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
             $schema,
             'oro_user', // owning side table
             'room', // owning side field name
-            'acme_user_room', // target side table
+            'acme_user_room', // inverse side table
             'name', // column name is used to show related entity
             ['extend' => ['owner' => ExtendScope::OWNER_CUSTOM]]
         );
@@ -79,11 +79,11 @@ class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
             $schema,
             'oro_user', // owning side table
             'room', // owning side field name
-            'acme_user_room', // target side table
-            'users', // target side field name
-            ['name'], // column names are used to show a title of related entity
-            ['name'], // column names are used to show detailed info about related entity
-            ['name'], // Column names are used to show related entity in a grid
+            'acme_user_room', // inverse side table
+            'users', // inverse side field name
+            ['name'], // column names are used to show a title of owning side entity
+            ['name'], // column names are used to show detailed info about owning side entity
+            ['name'], // Column names are used to show owning side entity in a grid
             ['extend' => ['owner' => ExtendScope::OWNER_CUSTOM]]
         );
     }
@@ -120,7 +120,7 @@ class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
             $schema,
             'oro_user', // owning side table
             'rooms', // owning side field name
-            'acme_user_room', // target side table
+            'acme_user_room', // inverse side table
             ['name'], // column names are used to show a title of related entity
             ['name'], // column names are used to show detailed info about related entity
             ['name'], // Column names are used to show related entity in a grid
@@ -160,7 +160,7 @@ class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
             $schema,
             'oro_user', // owning side table
             'rooms', // owning side field name
-            'acme_user_room', // target side table
+            'acme_user_room', // inverse side table
             ['name'], // column names are used to show a title of related entity
             ['name'], // column names are used to show detailed info about related entity
             ['name'], // Column names are used to show related entity in a grid
@@ -200,7 +200,7 @@ class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
             $schema,
             'oro_user', // owning side table
             'rooms', // owning side field name
-            'acme_user_room', // target side table
+            'acme_user_room', // inverse side table
             ['name'], // column names are used to show a title of related entity
             ['name'], // column names are used to show detailed info about related entity
             ['name'], // Column names are used to show related entity in a grid
@@ -210,11 +210,11 @@ class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
             $schema,
             'oro_user', // owning side table
             'rooms', // owning side field name
-            'acme_user_room', // target side table
-            'users', // target side field name
-            ['name'], // column names are used to show a title of related entity
-            ['name'], // column names are used to show detailed info about related entity
-            ['name'], // Column names are used to show related entity in a grid
+            'acme_user_room', // inverse side table
+            'users', // inverse side field name
+            ['name'], // column names are used to show a title of owning side entity
+            ['name'], // column names are used to show detailed info about owning side entity
+            ['name'], // Column names are used to show owning side entity in a grid
             ['extend' => ['owner' => ExtendScope::OWNER_CUSTOM]]
         );
     }
@@ -251,7 +251,7 @@ class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
             $schema,
             'oro_user', // owning side table
             'rooms', // owning side field name
-            'acme_user_room', // target side table
+            'acme_user_room', // inverse side table
             ['name'], // column names are used to show a title of related entity
             ['name'], // column names are used to show detailed info about related entity
             ['name'], // Column names are used to show related entity in a grid
@@ -261,11 +261,11 @@ class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
             $schema,
             'oro_user', // owning side table
             'rooms', // owning side field name
-            'acme_user_room', // target side table
-            'users', // target side field name
-            ['name'], // column names are used to show a title of related entity
-            ['name'], // column names are used to show detailed info about related entity
-            ['name'], // Column names are used to show related entity in a grid
+            'acme_user_room', // inverse side table
+            'users', // inverse side field name
+            ['name'], // column names are used to show a title of owning side entity
+            ['name'], // column names are used to show detailed info about owning side entity
+            ['name'], // Column names are used to show owning side entity in a grid
             ['extend' => ['owner' => ExtendScope::OWNER_CUSTOM]]
         );
     }
@@ -302,7 +302,7 @@ class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
             $schema,
             'oro_user', // owning side table
             'rooms', // owning side field name
-            'acme_user_room', // target side table
+            'acme_user_room', // inverse side table
             ['name'], // column names are used to show a title of related entity
             ['name'], // column names are used to show detailed info about related entity
             ['name'], // Column names are used to show related entity in a grid
@@ -342,7 +342,7 @@ class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
             $schema,
             'oro_user', // owning side table
             'rooms', // owning side field name
-            'acme_user_room', // target side table
+            'acme_user_room', // inverse side table
             ['name'], // column names are used to show a title of related entity
             ['name'], // column names are used to show detailed info about related entity
             ['name'], // Column names are used to show related entity in a grid
@@ -382,7 +382,7 @@ class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
             $schema,
             'oro_user', // owning side table
             'rooms', // owning side field name
-            'acme_user_room', // target side table
+            'acme_user_room', // inverse side table
             ['name'], // column names are used to show a title of related entity
             ['name'], // column names are used to show detailed info about related entity
             ['name'], // Column names are used to show related entity in a grid
@@ -392,9 +392,9 @@ class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
             $schema,
             'oro_user', // owning side table
             'rooms', // owning side field name
-            'acme_user_room', // target side table
-            'user', // target side field name
-            'name', // column name is used to show related entity
+            'acme_user_room', // inverse side table
+            'user', // inverse side field name
+            'name', // column name is used to show owning side entity
             ['extend' => ['owner' => ExtendScope::OWNER_CUSTOM]]
         );
     }
@@ -431,7 +431,7 @@ class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
             $schema,
             'oro_user', // owning side table
             'rooms', // owning side field name
-            'acme_user_room', // target side table
+            'acme_user_room', // inverse side table
             ['name'], // column names are used to show a title of related entity
             ['name'], // column names are used to show detailed info about related entity
             ['name'], // Column names are used to show related entity in a grid
@@ -441,9 +441,9 @@ class OroCRMSalesBundle implements Migration, ExtendExtensionAwareInterface
             $schema,
             'oro_user', // owning side table
             'rooms', // owning side field name
-            'acme_user_room', // target side table
-            'user', // target side field name
-            'name', // column name is used to show related entity
+            'acme_user_room', // inverse side table
+            'user', // inverse side field name
+            'name', // column name is used to show owning side entity
             ['extend' => ['owner' => ExtendScope::OWNER_CUSTOM]]
         );
     }

From e0a0bf25257219e0024dcbc53c36528351ec8caa Mon Sep 17 00:00:00 2001
From: Andrey Agafonkin <aagafonkin@magecore.com>
Date: Fri, 6 Jan 2017 15:45:02 +0200
Subject: [PATCH 06/29] BAP-13260: Show the fresh entity change history

---
 .../Resources/views/Audit/widget/history.html.twig             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DataAuditBundle/Resources/views/Audit/widget/history.html.twig b/src/Oro/Bundle/DataAuditBundle/Resources/views/Audit/widget/history.html.twig
index 8caae68cbad..838fb924be1 100644
--- a/src/Oro/Bundle/DataAuditBundle/Resources/views/Audit/widget/history.html.twig
+++ b/src/Oro/Bundle/DataAuditBundle/Resources/views/Audit/widget/history.html.twig
@@ -2,12 +2,13 @@
 
 <div class="widget-content">
     {% set fieldName = (fieldName is defined) ? fieldName : '' %}
+    {% set scope = entityClass~entityId~date().timestamp %}
 
     <div class="container-fluid">
         {% block content %}
             {# gridName set from corresponding controllers #}
             {{ dataGrid.renderGrid(
-                oro_datagrid_build_fullname(gridName, entityClass~entityId),
+                oro_datagrid_build_fullname(gridName, scope),
                 {object_class: entityClass, object_id: entityId, field_name: fieldName}
             ) }}
         {% endblock %}

From 45d34ee4130a66fa1f0f8c08dc44b96dedb48a67 Mon Sep 17 00:00:00 2001
From: Aleksey Solonenko <asolonenko@oroinc.com>
Date: Tue, 10 Jan 2017 19:52:44 +0200
Subject: [PATCH 07/29] =?UTF-8?q?CRM-6657:=20Widget=20"Opportunities=20By?=
 =?UTF-8?q?=20Status":=20the=20values=20are=20shown=20and=20counted=20inco?=
 =?UTF-8?q?rrectly=20for=20selected=20=E2=80=9CDate=20range=E2=80=9D=20(#6?=
 =?UTF-8?q?148)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fixed date filter with related join in widget "Opportunities By Status"
- Added functional test for widget "Opportunities By Status"
- Added new migration to fix label of opportunity status "In progress"
- Fixed DateTimeZone in date filter
---
 .../Filter/DateFilterProcessor.php            | 43 +++++++++++-
 .../Resources/config/services.yml             |  1 +
 .../Functional/AbstractWidgetTestCase.php     | 65 +++++++++++++++++++
 3 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 src/Oro/Bundle/DashboardBundle/Tests/Functional/AbstractWidgetTestCase.php

diff --git a/src/Oro/Bundle/DashboardBundle/Filter/DateFilterProcessor.php b/src/Oro/Bundle/DashboardBundle/Filter/DateFilterProcessor.php
index d8742e7fb89..1814e612a2d 100644
--- a/src/Oro/Bundle/DashboardBundle/Filter/DateFilterProcessor.php
+++ b/src/Oro/Bundle/DashboardBundle/Filter/DateFilterProcessor.php
@@ -6,7 +6,9 @@
 
 use Oro\Bundle\FilterBundle\Datasource\Orm\OrmFilterDatasourceAdapter;
 use Oro\Bundle\FilterBundle\Filter\FilterUtility;
+use Oro\Bundle\FilterBundle\Form\Type\Filter\AbstractDateFilterType;
 use Oro\Bundle\FilterBundle\Utils\DateFilterModifier;
+use Oro\Bundle\LocaleBundle\Model\LocaleSettings;
 
 class DateFilterProcessor
 {
@@ -20,10 +22,11 @@ class DateFilterProcessor
      * @param DateRangeFilter    $filter
      * @param DateFilterModifier $modifier
      */
-    public function __construct(DateRangeFilter $filter, DateFilterModifier $modifier)
+    public function __construct(DateRangeFilter $filter, DateFilterModifier $modifier, LocaleSettings $localeSettings)
     {
         $this->dateFilter = $filter;
         $this->modifier   = $modifier;
+        $this->localeSettings = $localeSettings;
     }
 
     /**
@@ -54,4 +57,42 @@ public function getModifiedDateData(array $dateData)
 
         return $this->modifier->modify($dateData, ['start', 'end'], false);
     }
+
+    /**
+     * @param mixed $date
+     *
+     * @return \DateTime
+     */
+    public function prepareDate($date)
+    {
+        return $date instanceof \DateTime
+            ? $date
+            : new \DateTime($date, new \DateTimeZone($this->localeSettings->getTimeZone()));
+    }
+    /**
+     * @param QueryBuilder $qb
+     * @param $dateRange
+     * @param $fieldAlias
+     */
+    public function applyDateRangeFilterToQuery(QueryBuilder $qb, $dateRange, $fieldAlias)
+    {
+        $dateRange = $this->getModifiedDateData($dateRange);
+        switch ($dateRange['type']) {
+            case AbstractDateFilterType::TYPE_MORE_THAN:
+                $start = $this->prepareDate($dateRange['value']['start']);
+                $qb->andWhere(sprintf('%s >= :start', $fieldAlias))->setParameter('start', $start);
+                break;
+            case AbstractDateFilterType::TYPE_LESS_THAN:
+                $end = $this->prepareDate($dateRange['value']['end']);
+                $qb->andWhere(sprintf('%s <= :end', $fieldAlias))->setParameter('end', $end);
+                break;
+            case AbstractDateFilterType::TYPE_ALL_TIME:
+                return;
+            default:
+                $start = $this->prepareDate($dateRange['value']['start']);
+                $end = $this->prepareDate($dateRange['value']['end']);
+                $qb->andWhere(sprintf('%s >= :start', $fieldAlias))->setParameter('start', $start);
+                $qb->andWhere(sprintf('%s <= :end', $fieldAlias))->setParameter('end', $end);
+        }
+    }
 }
diff --git a/src/Oro/Bundle/DashboardBundle/Resources/config/services.yml b/src/Oro/Bundle/DashboardBundle/Resources/config/services.yml
index 451be0bf24d..7acb8deba4b 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/DashboardBundle/Resources/config/services.yml
@@ -300,6 +300,7 @@ services:
         arguments:
             - '@oro_dashboard.filter.date_range'
             - '@oro_filter.utils.date_filter_modifier'
+            - '@oro_locale.settings'
 
     # Twig extension
     oro_dashboard.twig.extension:
diff --git a/src/Oro/Bundle/DashboardBundle/Tests/Functional/AbstractWidgetTestCase.php b/src/Oro/Bundle/DashboardBundle/Tests/Functional/AbstractWidgetTestCase.php
new file mode 100644
index 00000000000..2b8ce177e0e
--- /dev/null
+++ b/src/Oro/Bundle/DashboardBundle/Tests/Functional/AbstractWidgetTestCase.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Oro\Bundle\DashboardBundle\Tests\Functional;
+
+use Symfony\Component\DomCrawler\Crawler;
+use Symfony\Component\DomCrawler\Field\InputFormField;
+use Symfony\Component\DomCrawler\Form;
+
+use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase;
+use Oro\Bundle\DashboardBundle\Entity\Widget;
+
+class AbstractWidgetTestCase extends WebTestCase
+{
+    /**
+     * @param Form $form
+     * @param string $fieldName
+     * @param mixed $value
+     * @param string $fieldType
+     */
+    protected function setOrAdd(Form $form, $fieldName, $value, $fieldType = 'text')
+    {
+        if (!$form->has($fieldName)) {
+            $doc = new \DOMDocument("1.0");
+            $doc->loadHTML(sprintf('<input type="%s" name="%s" value="" />', $fieldType, $fieldName));
+            $dynamicField = new InputFormField($doc->getElementsByTagName('input')->item(0));
+            $form->set($dynamicField);
+        }
+
+        $form[$fieldName] = $value;
+    }
+
+    /**
+     * @param Widget $widget
+     * @param array $configFields
+     */
+    protected function configureWidget(Widget $widget, array $configFields)
+    {
+        $this->client->request(
+            'GET',
+            $this->getUrl(
+                'oro_dashboard_configure',
+                ['id' => $widget->getId(), '_widgetContainer' => 'dialog']
+            )
+        );
+        $response = $this->client->getResponse();
+        $this->assertEquals($response->getStatusCode(), 200, 'Failed in getting configure widget dialog window !');
+
+        /**
+         * @var $crawler Crawler
+         * @var $form Form
+         */
+        $crawler = $this->client->getCrawler();
+        /** @var Form $form */
+        $form = $crawler->selectButton('Save')->form();
+
+        foreach ($configFields as $fieldsName => $value) {
+            $this->setOrAdd($form, $fieldsName, $value);
+        }
+
+        $this->client->submit($form);
+
+        $response = $this->client->getResponse();
+        $this->assertEquals($response->getStatusCode(), 200, "Failed in submit widget configuration options !");
+    }
+}

From 59f10ee7469cd9ea0f44345bfa8c86669f038d9d Mon Sep 17 00:00:00 2001
From: Alexandr Parkhomenko <alexandr-parkhomenko@users.noreply.github.com>
Date: Wed, 11 Jan 2017 19:17:12 +0200
Subject: [PATCH 08/29] CRM-6660: Widget "Forecast": Opportunities with
 probabilities 0%, 100% are not used in calculations (#6318)

- Removed probability filtering
- Fixed query in report "Forecast"
- Fix backword compatibility of DataFilterProcessor
- Decrease visibility for methods which are used locally
---
 .../Filter/DateFilterProcessor.php            | 24 ++++++++++++++++---
 .../Resources/config/services.yml             |  3 ++-
 .../Functional/AbstractDatagridTestCase.php   | 10 ++++----
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/Oro/Bundle/DashboardBundle/Filter/DateFilterProcessor.php b/src/Oro/Bundle/DashboardBundle/Filter/DateFilterProcessor.php
index 1814e612a2d..a012a787c60 100644
--- a/src/Oro/Bundle/DashboardBundle/Filter/DateFilterProcessor.php
+++ b/src/Oro/Bundle/DashboardBundle/Filter/DateFilterProcessor.php
@@ -4,6 +4,7 @@
 
 use Doctrine\ORM\QueryBuilder;
 
+use Oro\Bundle\DashboardBundle\Exception\InvalidArgumentException;
 use Oro\Bundle\FilterBundle\Datasource\Orm\OrmFilterDatasourceAdapter;
 use Oro\Bundle\FilterBundle\Filter\FilterUtility;
 use Oro\Bundle\FilterBundle\Form\Type\Filter\AbstractDateFilterType;
@@ -18,15 +19,17 @@ class DateFilterProcessor
     /** @var DateFilterModifier */
     protected $modifier;
 
+    /** @var LocaleSettings */
+    protected $localeSettings;
+
     /**
      * @param DateRangeFilter    $filter
      * @param DateFilterModifier $modifier
      */
-    public function __construct(DateRangeFilter $filter, DateFilterModifier $modifier, LocaleSettings $localeSettings)
+    public function __construct(DateRangeFilter $filter, DateFilterModifier $modifier)
     {
         $this->dateFilter = $filter;
         $this->modifier   = $modifier;
-        $this->localeSettings = $localeSettings;
     }
 
     /**
@@ -58,13 +61,28 @@ public function getModifiedDateData(array $dateData)
         return $this->modifier->modify($dateData, ['start', 'end'], false);
     }
 
+    /**
+     * Initialize locale settings to be used in the class methods
+     *
+     * @param LocaleSettings $localeSettings
+     */
+    public function setLocaleSettings(LocaleSettings $localeSettings)
+    {
+        $this->localeSettings = $localeSettings;
+    }
+
     /**
      * @param mixed $date
      *
+     * @throws \Oro\Bundle\DashboardBundle\Exception\InvalidArgumentException in case localeSettings is not set
      * @return \DateTime
      */
-    public function prepareDate($date)
+    protected function prepareDate($date)
     {
+        if (!$this->localeSettings) {
+            throw new InvalidArgumentException('Processor should be initialized with LocaleSettings');
+        }
+
         return $date instanceof \DateTime
             ? $date
             : new \DateTime($date, new \DateTimeZone($this->localeSettings->getTimeZone()));
diff --git a/src/Oro/Bundle/DashboardBundle/Resources/config/services.yml b/src/Oro/Bundle/DashboardBundle/Resources/config/services.yml
index 7acb8deba4b..d2d659f6524 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/DashboardBundle/Resources/config/services.yml
@@ -300,7 +300,8 @@ services:
         arguments:
             - '@oro_dashboard.filter.date_range'
             - '@oro_filter.utils.date_filter_modifier'
-            - '@oro_locale.settings'
+        calls:
+            - ['setLocaleSettings', ['@oro_locale.settings']]
 
     # Twig extension
     oro_dashboard.twig.extension:
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Functional/AbstractDatagridTestCase.php b/src/Oro/Bundle/DataGridBundle/Tests/Functional/AbstractDatagridTestCase.php
index 3b95c9bdc88..e0858373530 100644
--- a/src/Oro/Bundle/DataGridBundle/Tests/Functional/AbstractDatagridTestCase.php
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Functional/AbstractDatagridTestCase.php
@@ -45,11 +45,13 @@ public function testGrid($requestData)
         );
         $result = $this->getJsonResponseContent($response, 200);
 
-        foreach ($result['data'] as $row) {
-            foreach ($requestData['assert'] as $fieldName => $value) {
-                $this->assertEquals($value, $row[$fieldName]);
+        if (!empty($requestData['assert'])) {
+            foreach ($result['data'] as $row) {
+                foreach ($requestData['assert'] as $fieldName => $value) {
+                    $this->assertEquals($value, $row[$fieldName]);
+                }
+                break;
             }
-            break;
         }
 
         $this->assertCount((int) $requestData['expectedResultCount'], $result['data']);

From e185334e2c3482388582d15e04ff02518e5d8038 Mon Sep 17 00:00:00 2001
From: Mykhailo <mkudelia@oroinc.com>
Date: Thu, 12 Jan 2017 12:42:09 +0200
Subject: [PATCH 09/29] correting documentation mistakes. - related to issue
 https://github.com/orocrm/platform/pull/608 (cherry picked from commit
 69c9666)

---
 .../SecurityBundle/Resources/doc/examples.md       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Oro/Bundle/SecurityBundle/Resources/doc/examples.md b/src/Oro/Bundle/SecurityBundle/Resources/doc/examples.md
index accdb235322..fa3138ea921 100644
--- a/src/Oro/Bundle/SecurityBundle/Resources/doc/examples.md
+++ b/src/Oro/Bundle/SecurityBundle/Resources/doc/examples.md
@@ -5,13 +5,13 @@ We have:
 
  - 2 organizations: **Main Organization** and the **Second Organization**;
  - Main Organization contains one **BU A**;
- - Senond Organization contains one **BU B**;
- - BU B contains one subordinate **BU C**;
- - user **John** was created in the Main Organization and BU A;
- - user **Mary** was created in the Main Organization and BU A;
- - user **Mike** was created in the Second Organization and BU C;
- - user **Robert** was created in the Second Organization and BU B;
- - user **Mark** was created in the Second Organization and BU B;
+ - Second Organization contains one **BU B**;
+ - **BU B** contains one subordinate **BU C**;
+ - user **John** was created in the Main Organization and **BU A**;
+ - user **Mary** was created in the Main Organization and **BU A**;
+ - user **Mike** was created in the Second Organization and **BU C**;
+ - user **Robert** was created in the Second Organization and **BU B**;
+ - user **Mark** was created in the Second Organization and **BU B**;
  
 Users was assigned:
 

From 317d8b8ba5c09bcd7f5cabed96ed500193f81723 Mon Sep 17 00:00:00 2001
From: Alexandr Parkhomenko <alexandr-parkhomenko@users.noreply.github.com>
Date: Thu, 12 Jan 2017 17:41:41 +0200
Subject: [PATCH 10/29] BAP-13281: "Is Empty" Datagrid filter doesn't work for
 Postgres (#6411)

- Remove additional expression wrapper
- Added functional test on `StringFilter`
---
 .../FilterBundle/Filter/StringFilter.php      |   9 +-
 .../Functional/Filter/StringFilterTest.php    | 120 ++++++++++++++++++
 .../Fixtures/FilterDatasourceAdapter.php      |  58 +++++++++
 3 files changed, 181 insertions(+), 6 deletions(-)
 create mode 100644 src/Oro/Bundle/FilterBundle/Tests/Functional/Filter/StringFilterTest.php
 create mode 100644 src/Oro/Bundle/FilterBundle/Tests/Functional/Fixtures/FilterDatasourceAdapter.php

diff --git a/src/Oro/Bundle/FilterBundle/Filter/StringFilter.php b/src/Oro/Bundle/FilterBundle/Filter/StringFilter.php
index eb072214e43..4e84ae932f0 100644
--- a/src/Oro/Bundle/FilterBundle/Filter/StringFilter.php
+++ b/src/Oro/Bundle/FilterBundle/Filter/StringFilter.php
@@ -102,12 +102,9 @@ protected function buildComparisonExpr(
                     $fieldName = $ds->expr()->trim($fieldName);
                 }
 
-                return $ds->expr()->andX(
-                    $ds->expr()->orX(
-                        $ds->expr()->isNull($fieldName),
-                        $ds->expr()->eq($fieldName, $emptyString)
-                    ),
-                    $ds->expr()->eq(true, true)
+                return $ds->expr()->orX(
+                    $ds->expr()->isNull($fieldName),
+                    $ds->expr()->eq($fieldName, $emptyString)
                 );
             case FilterUtility::TYPE_NOT_EMPTY:
                 $emptyString = $ds->expr()->literal('');
diff --git a/src/Oro/Bundle/FilterBundle/Tests/Functional/Filter/StringFilterTest.php b/src/Oro/Bundle/FilterBundle/Tests/Functional/Filter/StringFilterTest.php
new file mode 100644
index 00000000000..7a0efa33084
--- /dev/null
+++ b/src/Oro/Bundle/FilterBundle/Tests/Functional/Filter/StringFilterTest.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace Oro\Bundle\FilterBundle\Tests\Functional\Filter;
+
+use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase;
+use Oro\Bundle\FilterBundle\Tests\Functional\Fixtures\FilterDatasourceAdapter;
+use Oro\Bundle\FilterBundle\Filter\FilterUtility;
+use Oro\Bundle\FilterBundle\Form\Type\Filter\TextFilterType;
+
+/**
+ * @dbIsolationPerTest
+ */
+class StringFilterTest extends WebTestCase
+{
+    public function setUp()
+    {
+        $this->initClient();
+    }
+
+    /**
+     * @dataProvider filterProvider
+     *
+     * @param $filterName
+     * @param $filterFormData
+     * @param $expectedResult
+     */
+    public function testFilter($filterName, $filterFormData, $expectedResult)
+    {
+        $registry = $this->getContainer()->get('doctrine');
+        $filterDatasourceAdapter = new FilterDatasourceAdapter($registry);
+        $stringFilter = $this->getContainer()->get('oro_filter.string_filter');
+
+        $stringFilter->init($filterName, ['enabled' => true, 'type' => 'string', 'data_name' => $filterName]);
+        $filterForm = $stringFilter->getForm();
+        $filterForm->submit($filterFormData);
+        $this->assertTrue($filterForm->isValid(), 'Form shoul\'d be valid !');
+
+        $stringFilter->apply($filterDatasourceAdapter, $filterForm->getData());
+        $queryResult = $filterDatasourceAdapter->getQueryBuilder()->getQuery()->getResult();
+        $this->assertSame($expectedResult, $queryResult);
+    }
+
+    public function filterProvider()
+    {
+        return [
+            'Filter "not empty"' => [
+                'filterName' => 'u.username',
+                'filterFormData' => [
+                    'type' => FilterUtility::TYPE_NOT_EMPTY,
+                    'value' => FilterUtility::TYPE_NOT_EMPTY,
+                ],
+                'expectedResult' => [
+                    ['username' => 'u1'],
+                    ['username' => 'u2'],
+                    ['username' => 'u3']
+                ],
+            ],
+            'Filter "empty"' => [
+                'filterName' => 'u.username',
+                'filterFormData' => [
+                    'type' => FilterUtility::TYPE_EMPTY,
+                    'value' => FilterUtility::TYPE_EMPTY,
+                ],
+                'expectedResult' => [ ],
+            ],
+            'Filter "equal"' => [
+                'filterName' => 'u.username',
+                'filterFormData' => [
+                    'type' => TextFilterType::TYPE_EQUAL,
+                    'value' => 'u1',
+                ],
+                'expectedResult' => [
+                    ['username' => 'u1']
+                ],
+            ],
+            'Filter "contains"' => [
+                'filterName' => 'u.username',
+                'filterFormData' => [
+                    'type' => TextFilterType::TYPE_CONTAINS,
+                    'value' => 'u',
+                ],
+                'expectedResult' => [
+                    ['username' => 'u1'],
+                    ['username' => 'u2'],
+                    ['username' => 'u3']
+                ],
+            ],
+            'Filter "does not contain"' => [
+                'filterName' => 'u.username',
+                'filterFormData' => [
+                    'type' => TextFilterType::TYPE_NOT_CONTAINS,
+                    'value' => 'u',
+                ],
+                'expectedResult' => [],
+            ],
+            'Filter "starts with"' => [
+                'filterName' => 'u.username',
+                'filterFormData' => [
+                    'type' => TextFilterType::TYPE_STARTS_WITH,
+                    'value' => 'u',
+                ],
+                'expectedResult' => [
+                    ['username' => 'u1'],
+                    ['username' => 'u2'],
+                    ['username' => 'u3']
+                ],
+            ],
+            'Filter "ends with"' => [
+                'filterName' => 'u.username',
+                'filterFormData' => [
+                    'type' => TextFilterType::TYPE_ENDS_WITH,
+                    'value' => '3',
+                ],
+                'expectedResult' => [
+                    ['username' => 'u3']
+                ],
+            ]
+        ];
+    }
+}
diff --git a/src/Oro/Bundle/FilterBundle/Tests/Functional/Fixtures/FilterDatasourceAdapter.php b/src/Oro/Bundle/FilterBundle/Tests/Functional/Fixtures/FilterDatasourceAdapter.php
new file mode 100644
index 00000000000..ab4bd01ff34
--- /dev/null
+++ b/src/Oro/Bundle/FilterBundle/Tests/Functional/Fixtures/FilterDatasourceAdapter.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Oro\Bundle\FilterBundle\Tests\Functional\Fixtures;
+
+use Doctrine\ORM\EntityManager;
+use Doctrine\Common\Persistence\ManagerRegistry;
+
+use Oro\Bundle\UserBundle\Entity\User;
+use Oro\Bundle\FilterBundle\Datasource\Orm\OrmFilterDatasourceAdapter;
+
+class FilterDatasourceAdapter extends OrmFilterDatasourceAdapter
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        $em = $registry->getManagerForClass(User::class);
+        $this->loadData($em);
+        $qb = $this->getQB($em);
+        parent::__construct($qb);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function loadData(EntityManager $em)
+    {
+        $user1 = (new User())
+            ->setUsername('u1')
+            ->setEmail('u1@example.com')
+            ->setPassword('u1');
+        $user2 = (new User())
+            ->setUsername('u2')
+            ->setEmail('u2@example.com')
+            ->setPassword('u2');
+        $user3 = (new User())
+            ->setUsername('u3')
+            ->setEmail('u3@example.com')
+            ->setPassword('u3');
+
+        $em->persist($user1);
+        $em->persist($user2);
+        $em->persist($user3);
+        $em->flush();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getQB(EntityManager $em)
+    {
+        $qb = $em->getRepository(User::class)->createQueryBuilder('u');
+        $qb
+            ->select('u.username')
+            ->orderBy('u.username');
+        $qb->andWhere($qb->expr()->in('u.username', ['u1', 'u2', 'u3']));
+
+        return $qb;
+    }
+}

From 3affd30c9727844739bc37cc76331dd1846a6d0c Mon Sep 17 00:00:00 2001
From: Dmitry Naydenov <dnaidonov@oroinc.com>
Date: Wed, 11 Jan 2017 19:42:40 +0100
Subject: [PATCH 11/29] BAP-13165 Linked entety is not processed during the
 import, if the value is Null

Conflicts:
	documentation/_exts
---
 .../Converter/AbstractTableDataConverter.php  | 14 ++---
 .../AbstractTableDataConverterTest.php        | 52 +++++++++++++++++--
 2 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/src/Oro/Bundle/ImportExportBundle/Converter/AbstractTableDataConverter.php b/src/Oro/Bundle/ImportExportBundle/Converter/AbstractTableDataConverter.php
index bf0a9492bd3..aa6dee48e65 100644
--- a/src/Oro/Bundle/ImportExportBundle/Converter/AbstractTableDataConverter.php
+++ b/src/Oro/Bundle/ImportExportBundle/Converter/AbstractTableDataConverter.php
@@ -287,29 +287,31 @@ protected function replaceKeys(array $replacementKeys, array $data)
     }
 
     /**
-     * Remove all empty arrays and arrays with only null values
+     * Remove all empty sub-arrays and sub-arrays with only null values
+     *
+     * @param array   $data
+     * @param integer $deep
      *
-     * @param array $data
      * @return array|null
      */
-    protected function filterEmptyArrays(array $data)
+    protected function filterEmptyArrays(array $data, $deep = 0)
     {
         $hasValue = false;
 
         foreach ($data as $key => $value) {
             if (is_array($value)) {
-                $value = $this->filterEmptyArrays($value);
+                $value      = $this->filterEmptyArrays($value, $deep + 1);
                 $data[$key] = $value;
             }
 
-            if (array() === $value) {
+            if ([] === $value && 0 !== $deep) {
                 unset($data[$key]);
             } elseif (null !== $value) {
                 $hasValue = true;
             }
         }
 
-        return $hasValue ? $data : array();
+        return $hasValue ? $data : [];
     }
 
     /**
diff --git a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Converter/AbstractTableDataConverterTest.php b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Converter/AbstractTableDataConverterTest.php
index d0ec1f6cdd6..c3ef0858031 100644
--- a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Converter/AbstractTableDataConverterTest.php
+++ b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Converter/AbstractTableDataConverterTest.php
@@ -165,11 +165,12 @@ public function convertToImportDataProvider()
                     'Job Title'  => '',
                     'Email'      => '',
                 ),
-                'result' => array(
+                'result' => [
                     'firstName' => 'John',
                     'lastName'  => 'Doe',
-                    'jobTitle'  => ''
-                ),
+                    'jobTitle'  => null,
+                    'emails'    => [],
+                ],
                 'skipNull' => false
             ),
             'complex data' => array(
@@ -192,6 +193,51 @@ public function convertToImportDataProvider()
                     ),
                 )
             ),
+            'multi-level array data'           => [
+                'exportedRecord' => [
+                    'First Name'                    => 'John',
+                    'Last Name'                     => 'Doe',
+                    'Job Title'                     => 'Engineer',
+                    'address:0:name'                => 'John',
+                    'address:0:last'                => 'Doe',
+                    'address:0:city'                => 'City',
+                    'address:0:organization:0:name' => 'Main',
+                    'address:0:organization:1:name' => 'Default',
+                    'address:0:organization:2:name' => '',
+                    'address:1'                     => '',
+                ],
+                'result'         => [
+                    'firstName' => 'John',
+                    'lastName'  => 'Doe',
+                    'jobTitle'  => 'Engineer',
+                    'address'   => [
+                        [
+                            'name'         => 'John',
+                            'last'         => 'Doe',
+                            'city'         => 'City',
+                            'organization' => [
+                                ['name' => 'Main'],
+                                ['name' => 'Default'],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            'multi-level data with empty data' => [
+                'exportedRecord' => [
+                    'First Name' => 'John',
+                    'Last Name'  => 'Doe',
+                    'Job Title'  => 'Engineer',
+                    'address:0'  => [],
+                    'address:1'  => [],
+                ],
+                'result'         => [
+                    'firstName' => 'John',
+                    'lastName'  => 'Doe',
+                    'jobTitle'  => 'Engineer',
+                    'address'   => [],
+                ],
+            ],
             'no conversion rules' => array(
                 'exportedRecord' => array(
                     'First Name' => 'John',

From a190f8a27e5279365b56fab7f114cb76e673f190 Mon Sep 17 00:00:00 2001
From: Dmitry Naydenov <dnaidonov@oroinc.com>
Date: Thu, 12 Jan 2017 13:22:57 +0100
Subject: [PATCH 12/29] BAP-13165 Linked entety is not processed during the
 import, if the value is Null  - reduxe complexity

Conflicts:
	documentation/_exts
---
 .../Converter/AbstractTableDataConverter.php  | 40 +++-----------
 .../AbstractTableDataConverterTest.php        |  3 ++
 src/Oro/Component/PhpUtils/ArrayUtil.php      | 28 ++++++++++
 .../PhpUtils/Tests/Unit/ArrayUtilTest.php     | 52 +++++++++++++++++++
 4 files changed, 90 insertions(+), 33 deletions(-)

diff --git a/src/Oro/Bundle/ImportExportBundle/Converter/AbstractTableDataConverter.php b/src/Oro/Bundle/ImportExportBundle/Converter/AbstractTableDataConverter.php
index aa6dee48e65..546d024f189 100644
--- a/src/Oro/Bundle/ImportExportBundle/Converter/AbstractTableDataConverter.php
+++ b/src/Oro/Bundle/ImportExportBundle/Converter/AbstractTableDataConverter.php
@@ -4,6 +4,7 @@
 
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
+use Oro\Component\PhpUtils\ArrayUtil;
 use Oro\Bundle\ImportExportBundle\Event\Events;
 use Oro\Bundle\ImportExportBundle\Event\FormatConversionEvent;
 use Oro\Bundle\ImportExportBundle\Exception\LogicException;
@@ -61,21 +62,22 @@ public function convertToImportFormat(array $importedRecord, $skipNullValues = t
 
         $plainDataWithFrontendHeader = $this->removeEmptyColumns($importedRecord, $skipNullValues);
 
-        $frontendHeader = array_keys($plainDataWithFrontendHeader);
-        $frontendToBackendHeader = $this->convertHeaderToBackend($frontendHeader);
-        $plainDataWithBackendHeader = $this->replaceKeys(
+        $frontendHeader               = array_keys($plainDataWithFrontendHeader);
+        $frontendToBackendHeader      = $this->convertHeaderToBackend($frontendHeader);
+        $plainDataWithBackendHeader   = $this->replaceKeys(
             $frontendToBackendHeader,
             $plainDataWithFrontendHeader
         );
         $complexDataWithBackendHeader = parent::convertToImportFormat($plainDataWithBackendHeader, $skipNullValues);
-        $filteredComplexDataWithBackendHeader = $this->filterEmptyArrays($complexDataWithBackendHeader);
+
+        $filteredComplexDataWithBackendHeader = ArrayUtil::filterEmptyArrays($complexDataWithBackendHeader);
 
         return $this->dispatchFormatConversionEvent(
             Events::AFTER_IMPORT_FORMAT_CONVERSION,
             $importedRecord,
             $filteredComplexDataWithBackendHeader
         )
-        ->getResult();
+            ->getResult();
     }
 
     /**
@@ -286,34 +288,6 @@ protected function replaceKeys(array $replacementKeys, array $data)
         return $resultData;
     }
 
-    /**
-     * Remove all empty sub-arrays and sub-arrays with only null values
-     *
-     * @param array   $data
-     * @param integer $deep
-     *
-     * @return array|null
-     */
-    protected function filterEmptyArrays(array $data, $deep = 0)
-    {
-        $hasValue = false;
-
-        foreach ($data as $key => $value) {
-            if (is_array($value)) {
-                $value      = $this->filterEmptyArrays($value, $deep + 1);
-                $data[$key] = $value;
-            }
-
-            if ([] === $value && 0 !== $deep) {
-                unset($data[$key]);
-            } elseif (null !== $value) {
-                $hasValue = true;
-            }
-        }
-
-        return $hasValue ? $data : [];
-    }
-
     /**
      * Get list of rules that should be user to convert,
      *
diff --git a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Converter/AbstractTableDataConverterTest.php b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Converter/AbstractTableDataConverterTest.php
index c3ef0858031..4a75c3b1e41 100644
--- a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Converter/AbstractTableDataConverterTest.php
+++ b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Converter/AbstractTableDataConverterTest.php
@@ -4,6 +4,9 @@
 
 use Oro\Bundle\ImportExportBundle\Converter\AbstractTableDataConverter;
 
+/**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
 class AbstractTableDataConverterTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/src/Oro/Component/PhpUtils/ArrayUtil.php b/src/Oro/Component/PhpUtils/ArrayUtil.php
index 24bc08eec23..51b2ae89f37 100644
--- a/src/Oro/Component/PhpUtils/ArrayUtil.php
+++ b/src/Oro/Component/PhpUtils/ArrayUtil.php
@@ -430,4 +430,32 @@ function ($part) {
 
         return $propertyAccessor->getValue($array, $propertyPath);
     }
+
+    /**
+     * Remove all empty sub-arrays and sub-arrays with only null values
+     *
+     * @param array   $data
+     * @param integer $deep
+     *
+     * @return array|null
+     */
+    public static function filterEmptyArrays(array $data, $deep = 0)
+    {
+        $hasValue = false;
+
+        foreach ($data as $key => $value) {
+            if (is_array($value)) {
+                $value      = self::filterEmptyArrays($value, $deep + 1);
+                $data[$key] = $value;
+            }
+
+            if ([] === $value && 0 !== $deep) {
+                unset($data[$key]);
+            } elseif (null !== $value) {
+                $hasValue = true;
+            }
+        }
+
+        return $hasValue ? $data : [];
+    }
 }
diff --git a/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php b/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php
index 8b36e367652..90146f41fc4 100644
--- a/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php
+++ b/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php
@@ -952,4 +952,56 @@ protected function createObject($properties)
 
         return $obj;
     }
+
+    /**
+     * @dataProvider filterEmptyArraysDataProvider
+     *
+     * @param array $expected
+     * @param array $data
+     */
+    public function testFilterEmptyArrays(array $expected, array $data)
+    {
+        $this->assertEquals($expected, ArrayUtil::filterEmptyArrays($data));
+    }
+
+    /**
+     * @return array
+     */
+    public function filterEmptyArraysDataProvider()
+    {
+        return [
+            'One-level array data' => [
+                'expected' => [
+                    'One Level Array' => [
+                        'rowOne' => 'some value',
+                        'rowTwo' => 'some value',
+                    ],
+                    'Empty Array'     => [],
+                    'Empty SubArrays' => [
+                        'rowOne'  => 'some value',
+                        'rowTree' => [
+                            'subrowTwo'  => 'some value',
+                            'subrowTree' => null,
+                        ],
+                    ],
+                ],
+                'data'     => [
+                    'One Level Array' => [
+                        'rowOne' => 'some value',
+                        'rowTwo' => 'some value',
+                    ],
+                    'Empty Array'     => [],
+                    'Empty SubArrays' => [
+                        'rowOne'  => 'some value',
+                        'rowTwo'  => [],
+                        'rowTree' => [
+                            'subrowOne'  => [],
+                            'subrowTwo'  => 'some value',
+                            'subrowTree' => null,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
 }

From c997d91b4d0d843b8362d0e4f49ffa15ad3c698d Mon Sep 17 00:00:00 2001
From: Dmitry Naydenov <dnaidonov@oroinc.com>
Date: Fri, 13 Jan 2017 15:50:36 +0100
Subject: [PATCH 13/29] BAP-13165 Linked entety is not processed during the
 import, if the value is Null

Conflicts:
	documentation/_exts
---
 src/Oro/Component/PhpUtils/ArrayUtil.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Oro/Component/PhpUtils/ArrayUtil.php b/src/Oro/Component/PhpUtils/ArrayUtil.php
index 51b2ae89f37..46c891c34a8 100644
--- a/src/Oro/Component/PhpUtils/ArrayUtil.php
+++ b/src/Oro/Component/PhpUtils/ArrayUtil.php
@@ -432,24 +432,26 @@ function ($part) {
     }
 
     /**
-     * Remove all empty sub-arrays and sub-arrays with only null values
+     * Remove all empty sub-arrays and leave first level empty arrays
      *
      * @param array   $data
-     * @param integer $deep
+     * @param integer $depth This variable reflects the depth of entering into an array. Please be careful with
+     *                       this variable if you set $depth it will change current function logic. If you don`t know
+     *                       do not set $depth
      *
-     * @return array|null
+     * @return array
      */
-    public static function filterEmptyArrays(array $data, $deep = 0)
+    public static function filterEmptyArrays(array $data, $depth = 0)
     {
         $hasValue = false;
 
         foreach ($data as $key => $value) {
             if (is_array($value)) {
-                $value      = self::filterEmptyArrays($value, $deep + 1);
+                $value      = self::filterEmptyArrays($value, $depth + 1);
                 $data[$key] = $value;
             }
 
-            if ([] === $value && 0 !== $deep) {
+            if ([] === $value && 0 !== $depth) {
                 unset($data[$key]);
             } elseif (null !== $value) {
                 $hasValue = true;

From ca0429f8bd8b731daa3bee881ee720c4dddf5e78 Mon Sep 17 00:00:00 2001
From: Dmitry Naydenov <dnaidonov@magecore.com>
Date: Fri, 13 Jan 2017 18:07:17 +0100
Subject: [PATCH 14/29] BAP-13165 Linked entety is not processed during the
 import, if the value is Null

---
 src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php b/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php
index 90146f41fc4..ae78a1382d0 100644
--- a/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php
+++ b/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php
@@ -4,6 +4,9 @@
 
 use Oro\Component\PhpUtils\ArrayUtil;
 
+/**
+ * @SuppressWarnings(PHPMD.ExcessiveClassLength)
+ */
 class ArrayUtilTest extends \PHPUnit_Framework_TestCase
 {
     public function testCreateOrderedComparator()

From 1d51488a594ab8d4c17903a61a461a86ceaa1541 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@oroinc.com>
Date: Fri, 13 Jan 2017 20:00:10 +0200
Subject: [PATCH 15/29] BAP-12994: On Activity List "Add Context" button
 doesn't work after widget was expanded (#6428)

---
 .../Resources/public/js/app/views/activity-view.js           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/ActivityListBundle/Resources/public/js/app/views/activity-view.js b/src/Oro/Bundle/ActivityListBundle/Resources/public/js/app/views/activity-view.js
index def1cba7e7c..97dc151c4c4 100644
--- a/src/Oro/Bundle/ActivityListBundle/Resources/public/js/app/views/activity-view.js
+++ b/src/Oro/Bundle/ActivityListBundle/Resources/public/js/app/views/activity-view.js
@@ -147,8 +147,9 @@ define(function(require) {
         },
 
         _onContentChange: function() {
-            this.disposePageComponents();
-            this.$(this.options.infoBlock).html(this.model.get('contentHTML'));
+            this.$(this.options.infoBlock)
+                .trigger('content:remove') // to dispose only components related to infoBlock
+                .html(this.model.get('contentHTML'));
             this.initLayout().done(_.bind(function() {
                 // if the activity has an EmailTreadView -- handle comment count change in own way
                 var emailTreadView = this.getEmailThreadView();

From 04612eda127cdc70a72d2d697f9d66a0f892df32 Mon Sep 17 00:00:00 2001
From: Aleksey Solonenko <asolonenko@oroinc.com>
Date: Fri, 13 Jan 2017 20:23:40 +0200
Subject: [PATCH 16/29] CRM-7382: Send email: autocomplete does not work
 (#6520)

-  fix get related emails
---
 .../Provider/RelatedEmailsProvider.php        | 30 +++++++++++++------
 .../EmailBundle/Resources/config/services.yml |  2 ++
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Provider/RelatedEmailsProvider.php b/src/Oro/Bundle/EmailBundle/Provider/RelatedEmailsProvider.php
index 7649fc9559c..1525fc85cc8 100644
--- a/src/Oro/Bundle/EmailBundle/Provider/RelatedEmailsProvider.php
+++ b/src/Oro/Bundle/EmailBundle/Provider/RelatedEmailsProvider.php
@@ -11,8 +11,11 @@
 
 use Oro\Bundle\EmailBundle\Entity\EmailInterface;
 use Oro\Bundle\EmailBundle\Model\EmailAttribute;
+use Oro\Bundle\EmailBundle\Model\EmailHolderInterface;
 use Oro\Bundle\EmailBundle\Model\Recipient;
+use Oro\Bundle\EntityBundle\Provider\EntityFieldProvider;
 use Oro\Bundle\EntityConfigBundle\Config\ConfigManager;
+use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper;
 use Oro\Bundle\SecurityBundle\SecurityFacade;
 use Oro\Bundle\LocaleBundle\Formatter\NameFormatter;
 use Oro\Bundle\EmailBundle\Tools\EmailAddressHelper;
@@ -41,6 +44,9 @@ class RelatedEmailsProvider
     /** @var EmailRecipientsHelper */
     protected $emailRecipientsHelper;
 
+    /** @var EntityFieldProvider  */
+    protected $entityFieldProvider;
+
     /**
      * @param Registry $registry
      * @param ConfigManager $configManager
@@ -65,6 +71,14 @@ public function __construct(
         $this->emailRecipientsHelper = $emailRecipientsHelper;
     }
 
+    /**
+     * @param EntityFieldProvider $entityFieldProvider
+     */
+    public function setEntityFieldProvider(EntityFieldProvider $entityFieldProvider)
+    {
+        $this->entityFieldProvider = $entityFieldProvider;
+    }
+
     /**
      * @param object $object
      * @param int $depth
@@ -91,16 +105,14 @@ public function getRecipients($object, $depth = 1, $ignoreAcl = false, Organizat
         $metadata = $this->getMetadata($className);
         $attributes = $this->initAttributes($className, $metadata);
 
-        foreach ($metadata->associationMappings as $name => $assoc) {
-            if (in_array(
-                'Oro\Bundle\EmailBundle\Entity\EmailInterface',
-                class_implements($assoc['targetEntity']),
-                true
-            )) {
-                $attributes[] = new EmailAttribute($name, true);
+        $relations = $this->entityFieldProvider->getRelations($className);
+
+        foreach ($relations as $relation) {
+            if (is_a($relation['related_entity_name'], EmailInterface::class, true)) {
+                $attributes[] = new EmailAttribute($relation['name'], true);
             } else {
                 if ($depth > 1) {
-                    $assocObject = $this->getPropertyAccessor()->getValue($object, $name);
+                    $assocObject = $this->getPropertyAccessor()->getValue($object, $relation['name']);
                     if (!$assocObject instanceof \Traversable && !is_array($assocObject)) {
                         if ($assocObject) {
                             $assocObject = [$assocObject];
@@ -278,7 +290,7 @@ protected function getMetadata($className)
     protected function initAttributes($className, $metadata)
     {
         $attributes = [];
-        if (in_array('Oro\Bundle\EmailBundle\Model\EmailHolderInterface', class_implements($className), true)) {
+        if (is_a($className, EmailHolderInterface::class, true)) {
             $attributes[] = new EmailAttribute('email');
         }
         $attributes = array_merge($attributes, $this->getFieldAttributes($metadata));
diff --git a/src/Oro/Bundle/EmailBundle/Resources/config/services.yml b/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
index 1e6d4e3d3d1..2c6b8b88243 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
@@ -699,6 +699,8 @@ services:
             - '@oro_locale.formatter.name'
             - '@oro_email.email.address.helper'
             - '@oro_email.provider.email_recipients.helper'
+        calls:
+            - [setEntityFieldProvider, ['@oro_entity.entity_field_provider']]
 
     oro_email.email_recipients.provider:
         class: %oro_email.email_recipients.provider.class%

From 403e4d449298ab9c0962371186c11beff620ecbe Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Sat, 14 Jan 2017 01:19:45 +0200
Subject: [PATCH 17/29] BAP-8103: Report/Segment builder add unexpected Order
 by to final query (#6548)

---
 .../Extension/Sorter/OrmSorterExtension.php   |  39 +++-
 .../Sorter/OrmSorterExtensionTest.php         | 173 +++++++++++++++++-
 2 files changed, 199 insertions(+), 13 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Sorter/OrmSorterExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Sorter/OrmSorterExtension.php
index 6685764a894..69007f504f2 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/Sorter/OrmSorterExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/Sorter/OrmSorterExtension.php
@@ -2,6 +2,8 @@
 
 namespace Oro\Bundle\DataGridBundle\Extension\Sorter;
 
+use Doctrine\ORM\Query\Expr;
+
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject;
 use Oro\Bundle\DataGridBundle\Datagrid\ParameterBag;
@@ -69,6 +71,36 @@ public function visitDatasource(DatagridConfiguration $config, DatasourceInterfa
                 $datasource->getQueryBuilder()->addOrderBy($sortKey, $direction);
             }
         }
+
+        // ensure that ORDER BY is specified explicitly, in case if sorting was not requested
+        // use sorting by
+        // - the primary key of the root table if the query does not have GROUP BY
+        // - the first column of GROUP BY if this clause exists
+        // if ORDER BY is not given, the order of rows is not predictable and they are returned
+        // in whatever order SQL server finds fastest to produce.
+        /** @var OrmDatasource $datasource */
+        $qb = $datasource->getQueryBuilder();
+        $orderBy = $qb->getDQLPart('orderBy');
+        if (empty($orderBy)) {
+            $groupBy = $qb->getDQLPart('groupBy');
+            if (empty($groupBy)) {
+                $rootEntities = $qb->getRootEntities();
+                $rootEntity = reset($rootEntities);
+                if ($rootEntity) {
+                    $rootAliases = $qb->getRootAliases();
+                    $rootAlias = reset($rootAliases);
+                    $rootIdFieldNames = $qb->getEntityManager()
+                        ->getClassMetadata($rootEntity)
+                        ->getIdentifierFieldNames();
+                    $qb->addOrderBy($rootAlias . '.' . reset($rootIdFieldNames));
+                }
+            } else {
+                /** @var Expr\GroupBy $firstExpr */
+                $firstExpr = reset($groupBy);
+                $exprParts = $firstExpr->getParts();
+                $qb->addOrderBy(reset($exprParts));
+            }
+        }
     }
 
     /**
@@ -219,13 +251,6 @@ protected function getSortersToApply(DatagridConfiguration $config, $readParamet
             $sortBy = $defaultSorters;
         }
 
-        // if default sorter was not specified, just take first sortable column
-        if (!$sortBy && $sorters) {
-            $names = array_keys($sorters);
-            $firstSorterName = reset($names);
-            $sortBy = [$firstSorterName => self::DIRECTION_ASC];
-        }
-
         foreach ($sortBy as $column => $direction) {
             $sorter = isset($sorters[$column]) ? $sorters[$column] : false;
 
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/Sorter/OrmSorterExtensionTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/Sorter/OrmSorterExtensionTest.php
index 64c9a34dbea..690bc437f58 100644
--- a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/Sorter/OrmSorterExtensionTest.php
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/Sorter/OrmSorterExtensionTest.php
@@ -2,7 +2,11 @@
 
 namespace Oro\Bundle\DataGridBundle\Tests\Unit\Extension\Sorter;
 
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\ORM\QueryBuilder;
 use Oro\Bundle\DataGridBundle\Datagrid\ParameterBag;
+use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource;
 use Oro\Bundle\DataGridBundle\Extension\Sorter\OrmSorterExtension;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject;
@@ -125,8 +129,8 @@ public function visitMetadataDataProvider()
                             'addSorting' => false,
                         ],
                     ],
-                    'initialState' => ['sorters' => ['name' => 'ASC',]],
-                    'state' => ['sorters' => ['name' => 'ASC',]],
+                    'initialState' => ['sorters' => []],
+                    'state' => ['sorters' => []],
                 ]
             ],
             'multiple' => [
@@ -154,8 +158,8 @@ public function visitMetadataDataProvider()
                             'addSorting' => false,
                         ],
                     ],
-                    'initialState' => ['sorters' => ['name' => 'ASC',]],
-                    'state' => ['sorters' => ['name' => 'ASC',]],
+                    'initialState' => ['sorters' => []],
+                    'state' => ['sorters' => []],
                 ]
             ],
             'toolbar' => [
@@ -190,8 +194,8 @@ public function visitMetadataDataProvider()
                             'addSorting' => true,
                         ],
                     ],
-                    'initialState' => ['sorters' => ['name' => 'ASC',]],
-                    'state' => ['sorters' => ['name' => 'ASC',]],
+                    'initialState' => ['sorters' => []],
+                    'state' => ['sorters' => []],
                 ]
             ]
         ];
@@ -246,4 +250,161 @@ public function visitMetadataUnknownColumnDataProvider()
             ],
         ];
     }
+
+    public function testVisitDatasourceWithoutDefaultSorting()
+    {
+        $em = $this->getMockBuilder(EntityManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $metadata = $this->getMockBuilder(ClassMetadata::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $em->expects(self::once())
+            ->method('getClassMetadata')
+            ->with('Test\Entity')
+            ->willReturn($metadata);
+        $metadata->expects(self::once())
+            ->method('getIdentifierFieldNames')
+            ->willReturn(['id']);
+
+        $qb = new QueryBuilder($em);
+        $qb->select('e.id')->from('Test\Entity', 'e');
+
+        $datasource = $this->getMockBuilder(OrmDatasource::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $datasource->expects(self::once())
+            ->method('getQueryBuilder')
+            ->willReturn($qb);
+
+        $this->extension->setParameters(new ParameterBag());
+        $this->extension->visitDatasource(
+            DatagridConfiguration::create(['sorters' => ['columns' => []]]),
+            $datasource
+        );
+
+        self::assertEquals(
+            'SELECT e.id FROM Test\Entity e ORDER BY e.id ASC',
+            $qb->getDQL()
+        );
+    }
+
+    public function testVisitDatasourceWhenQueryAlreadyHasOrderBy()
+    {
+        $em = $this->getMockBuilder(EntityManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $em->expects(self::never())
+            ->method('getClassMetadata');
+
+        $qb = new QueryBuilder($em);
+        $qb->select('e.id')->from('Test\Entity', 'e')->addOrderBy('e.name');
+
+        $datasource = $this->getMockBuilder(OrmDatasource::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $datasource->expects(self::once())
+            ->method('getQueryBuilder')
+            ->willReturn($qb);
+
+        $this->extension->setParameters(new ParameterBag());
+        $this->extension->visitDatasource(
+            DatagridConfiguration::create(['sorters' => ['columns' => []]]),
+            $datasource
+        );
+
+        self::assertEquals(
+            'SELECT e.id FROM Test\Entity e ORDER BY e.name ASC',
+            $qb->getDQL()
+        );
+    }
+
+    public function testVisitDatasourceWithoutDefaultSortingForEmptyQuery()
+    {
+        $em = $this->getMockBuilder(EntityManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $em->expects(self::never())
+            ->method('getClassMetadata');
+
+        $qb = new QueryBuilder($em);
+
+        $datasource = $this->getMockBuilder(OrmDatasource::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $datasource->expects(self::once())
+            ->method('getQueryBuilder')
+            ->willReturn($qb);
+
+        $this->extension->setParameters(new ParameterBag());
+        $this->extension->visitDatasource(
+            DatagridConfiguration::create(['sorters' => ['columns' => []]]),
+            $datasource
+        );
+
+        self::assertEquals(
+            [],
+            $qb->getDQLPart('orderBy')
+        );
+    }
+
+    public function testVisitDatasourceWithoutDefaultSortingAndGroupBy()
+    {
+        $em = $this->getMockBuilder(EntityManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $em->expects(self::never())
+            ->method('getClassMetadata');
+
+        $qb = new QueryBuilder($em);
+        $qb->select('e.id')->from('Test\Entity', 'e')->groupBy('e.name');
+
+        $datasource = $this->getMockBuilder(OrmDatasource::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $datasource->expects(self::once())
+            ->method('getQueryBuilder')
+            ->willReturn($qb);
+
+        $this->extension->setParameters(new ParameterBag());
+        $this->extension->visitDatasource(
+            DatagridConfiguration::create(['sorters' => ['columns' => []]]),
+            $datasource
+        );
+
+        self::assertEquals(
+            'SELECT e.id FROM Test\Entity e GROUP BY e.name ORDER BY e.name ASC',
+            $qb->getDQL()
+        );
+    }
+
+    public function testVisitDatasourceWithoutDefaultSortingAndMultipleGroupBy()
+    {
+        $em = $this->getMockBuilder(EntityManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $em->expects(self::never())
+            ->method('getClassMetadata');
+
+        $qb = new QueryBuilder($em);
+        $qb->select('e.id')->from('Test\Entity', 'e')->addGroupBy('e.id')->addGroupBy('e.name');
+
+        $datasource = $this->getMockBuilder(OrmDatasource::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $datasource->expects(self::once())
+            ->method('getQueryBuilder')
+            ->willReturn($qb);
+
+        $this->extension->setParameters(new ParameterBag());
+        $this->extension->visitDatasource(
+            DatagridConfiguration::create(['sorters' => ['columns' => []]]),
+            $datasource
+        );
+
+        self::assertEquals(
+            'SELECT e.id FROM Test\Entity e GROUP BY e.id, e.name ORDER BY e.id ASC',
+            $qb->getDQL()
+        );
+    }
 }

From 7cb0f8938a572d4d5d9028992d286eff8082a49d Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@oroinc.com>
Date: Mon, 16 Jan 2017 18:27:09 +0200
Subject: [PATCH 18/29] CRM-6558: Layout messes up under filter activation on
 "Select Contacts" form (#5626)

---
 .../Resources/public/css/less/oro.filter.less |  1 +
 .../public/js/filter/abstract-filter.js       |  2 +-
 .../public/js/filter/choice-filter.js         |  6 +----
 .../Resources/public/js/filter/text-filter.js | 26 +++++++++++++++----
 .../public/css/less/mobile/filter.less        |  5 ++--
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less b/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
index bc5344e77ee..b5223073d10 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
@@ -325,6 +325,7 @@ button.ui-multiselect.select-filter-widget.ui-state-hover{
       }
       .select2-container {
         border: 0 none;
+        background: transparent;
         .select2-choices {
           border-left: 0;
           border-right: 0;
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/abstract-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/abstract-filter.js
index dc8e71dc0d9..d732b37b728 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/abstract-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/abstract-filter.js
@@ -101,7 +101,7 @@ define([
          *
          * @property {Array.<string|jQuery|HTMLElement>}
          */
-        dropdownFitContainers: ['.ui-dialog-content', '#container', 'body'],
+        dropdownFitContainers: ['.ui-dialog-content>*:first-child', '#container', 'body'],
 
         /**
          * Initialize.
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-filter.js
index ff4af68371e..31247ee44ad 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-filter.js
@@ -134,12 +134,8 @@ define([
             if (!this._criteriaRenderd) {
                 this._renderCriteria();
             }
-            ChoiceFilter.__super__._showCriteria.apply(this, arguments);
-        },
-
-        _onClickCriteriaSelector: function() {
-            ChoiceFilter.__super__._onClickCriteriaSelector.apply(this, arguments);
             this._updateValueField();
+            ChoiceFilter.__super__._showCriteria.apply(this, arguments);
         },
 
         _onClickChoiceValue: function() {
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/text-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/text-filter.js
index 75c01e606d4..ff10c1cd31f 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/text-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/text-filter.js
@@ -2,8 +2,9 @@ define([
     'jquery',
     'underscore',
     'orotranslation/js/translator',
-    './empty-filter'
-], function($, _, __, EmptyFilter) {
+    './empty-filter',
+    'oroui/js/tools'
+], function($, _, __, EmptyFilter, tools) {
     'use strict';
 
     var TextFilter;
@@ -74,6 +75,10 @@ define([
             'click .disable-filter': '_onClickDisableFilter'
         },
 
+        listen: {
+            'layout:reposition mediator': '_onLayoutReposition'
+        },
+
         /**
          * Initialize.
          *
@@ -156,6 +161,12 @@ define([
             }
         },
 
+        _onLayoutReposition: function() {
+            if (this.popupCriteriaShowed) {
+                this._alignCriteria();
+            }
+        },
+
         /**
          * @protected
          */
@@ -217,14 +228,19 @@ define([
          * @private
          */
         _alignCriteria: function() {
-            var $container = this._findDropdownFitContainer();
-            if ($container === null) {
+            if (tools.isMobile()) {
+                // no need to align criteria on mobile version, it is aligned over CSS
+                return;
+            }
+            var $container = this.$el.closest('.filter-box');
+            if (!$container.length) {
                 return;
             }
             var $dropdown = this.$(this.criteriaSelector);
+            $dropdown.css('margin-left', 'auto');
             var rect = $dropdown.get(0).getBoundingClientRect();
             var containerRect = $container.get(0).getBoundingClientRect();
-            var shift = rect.right - (containerRect.left + $container.prop('clientWidth'));
+            var shift = rect.right - containerRect.right;
             if (shift > 0) {
                 /**
                  * reduce shift to avoid overlaping left edge of container
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/filter.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/filter.less
index b609b3985b2..ae2ac918d5d 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/filter.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/filter.less
@@ -145,8 +145,9 @@
       padding-right: 10px;
     }
     .value-field-frame {
-      input[type=text]{
-        width: 100%;
+      .select2-container,
+      input[type=text] {
+        width: 100% !important;
       }
     }
   }

From 35a6a6df1dead40e7975b16b4c2990625f7ecbee Mon Sep 17 00:00:00 2001
From: Alexandr Parkhomenko <alexandr-parkhomenko@users.noreply.github.com>
Date: Tue, 17 Jan 2017 15:05:12 +0200
Subject: [PATCH 19/29] BAP-9216: Opportunities "in progress" with empty, and
 100% probability aren`t shown in forecast widget and report (#6612)

- Removed query part resetting in `OrmTotalsExtension` because filtering should change Grand Total values
---
 .../DataGridBundle/Extension/Totals/OrmTotalsExtension.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Totals/OrmTotalsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Totals/OrmTotalsExtension.php
index d14c560ea81..b48cf7ce038 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/Totals/OrmTotalsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/Totals/OrmTotalsExtension.php
@@ -300,13 +300,6 @@ protected function getData(ResultsObject $pageData, $columnsConfig, $perPage = f
             ->select($totalQueries)
             ->resetDQLPart('groupBy');
 
-        $parameters = $queryBuilder->getParameters();
-        if ($parameters->count()) {
-            $queryBuilder->resetDQLPart('where')
-                ->resetDQLPart('having');
-            QueryUtils::removeUnusedParameters($queryBuilder);
-        }
-
         $this->addPageLimits($queryBuilder, $pageData, $perPage);
 
         $query = $queryBuilder->getQuery();

From f588cc3a1fd8e4185f0298e5bebabf63288b569b Mon Sep 17 00:00:00 2001
From: Makar Sichevoi <msichevoi@oroinc.com>
Date: Tue, 17 Jan 2017 20:26:39 +0200
Subject: [PATCH 20/29] BAP-13339: Impossible to send email via System Email
 Box

---
 .../Entity/Provider/EmailOwnerProvider.php    | 20 ++++++++
 .../EmailBundle/Mailer/DirectMailer.php       | 20 ++++++++
 .../Unit/Tools/EmailOriginHelperTest.php      |  4 +-
 .../EmailBundle/Tools/EmailOriginHelper.php   | 50 ++++++++++++++++---
 4 files changed, 85 insertions(+), 9 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Entity/Provider/EmailOwnerProvider.php b/src/Oro/Bundle/EmailBundle/Entity/Provider/EmailOwnerProvider.php
index aeb807f5d0e..7908b5cfd78 100644
--- a/src/Oro/Bundle/EmailBundle/Entity/Provider/EmailOwnerProvider.php
+++ b/src/Oro/Bundle/EmailBundle/Entity/Provider/EmailOwnerProvider.php
@@ -44,4 +44,24 @@ public function findEmailOwner(EntityManager $em, $email)
 
         return $emailOwner;
     }
+    /**
+     * Find an entity objects which is an owner of the given email address
+     *
+     * @param \Doctrine\ORM\EntityManager $em
+     * @param string $email
+     *
+     * @return EmailOwnerInterface[]
+     */
+    public function findEmailOwners(EntityManager $em, $email)
+    {
+        $emailOwners = [];
+        foreach ($this->emailOwnerProviderStorage->getProviders() as $provider) {
+            $emailOwner = $provider->findEmailOwner($em, $email);
+            if ($emailOwner !== null) {
+                $emailOwners[] = $emailOwner;
+            }
+        }
+
+        return $emailOwners;
+    }
 }
diff --git a/src/Oro/Bundle/EmailBundle/Mailer/DirectMailer.php b/src/Oro/Bundle/EmailBundle/Mailer/DirectMailer.php
index fb9a987da4f..761ff1e00c4 100644
--- a/src/Oro/Bundle/EmailBundle/Mailer/DirectMailer.php
+++ b/src/Oro/Bundle/EmailBundle/Mailer/DirectMailer.php
@@ -48,6 +48,10 @@ public function __construct(\Swift_Mailer $baseMailer, ContainerInterface $conta
             $this->addXOAuth2Authenticator($transport);
         }
 
+        if ($transport instanceof \Swift_Transport_AbstractSmtpTransport) {
+            $this->configureTransportLocalDomain($transport);
+        }
+
         parent::__construct($transport);
     }
 
@@ -66,6 +70,10 @@ public function prepareSmtpTransport($emailOrigin)
                 new SendEmailTransport($emailOrigin, $this->getTransport())
             );
             $this->smtpTransport = $event->getTransport();
+
+            if ($this->smtpTransport instanceof \Swift_Transport_AbstractSmtpTransport) {
+                $this->configureTransportLocalDomain($this->smtpTransport);
+            }
         }
     }
 
@@ -195,4 +203,16 @@ protected function addXOAuth2Authenticator($transport)
 
         return $this;
     }
+
+    /**
+     * @param  \Swift_Transport_AbstractSmtpTransport $transport
+     */
+    protected function configureTransportLocalDomain(\Swift_Transport_AbstractSmtpTransport $transport)
+    {
+        // fix local domain when wild-card vhost is used and auto-detection fails
+        if (0 === strpos($transport->getLocalDomain(), '*') && !empty($_SERVER['HTTP_HOST'])) {
+            $transport->setLocalDomain($_SERVER['HTTP_HOST']);
+        }
+//        $transport->setLocalDomain('magecore.onmicrosoft.com');
+    }
 }
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Tools/EmailOriginHelperTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Tools/EmailOriginHelperTest.php
index 64d5bb7db64..ce42b6b0e8b 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Tools/EmailOriginHelperTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Tools/EmailOriginHelperTest.php
@@ -100,7 +100,7 @@ public function testGetEmailOriginFromSecurity()
         $owner = new \stdClass();
 
         $this->emailOwnerProvider->expects($this->once())
-            ->method('findEmailOwner')
+            ->method('findEmailOwners')
             ->willReturn($owner);
         $entityRepository = $this->getMockBuilder('Doctrine\ORM\EntityRepository')
             ->disableOriginalConstructor()
@@ -128,7 +128,7 @@ public function testGetEmailOriginCache()
         $owner = new \stdClass();
 
         $this->emailOwnerProvider->expects($this->exactly(2))
-            ->method('findEmailOwner')
+            ->method('findEmailOwners')
             ->willReturn($owner);
         $entityRepository = $this->getMockBuilder('Doctrine\ORM\EntityRepository')
             ->disableOriginalConstructor()
diff --git a/src/Oro/Bundle/EmailBundle/Tools/EmailOriginHelper.php b/src/Oro/Bundle/EmailBundle/Tools/EmailOriginHelper.php
index c53fef12f61..1220b1652eb 100644
--- a/src/Oro/Bundle/EmailBundle/Tools/EmailOriginHelper.php
+++ b/src/Oro/Bundle/EmailBundle/Tools/EmailOriginHelper.php
@@ -95,7 +95,7 @@ public function findEmailOrigin($emailOwner, $organization, $originName, $enable
 
         return $origin;
     }
-    
+
     /**
      * Find existing email origin entity by email string or create and persist new one.
      *
@@ -117,14 +117,18 @@ public function getEmailOrigin(
             $organization = $this->securityFacade->getOrganization();
         }
         if (!array_key_exists($originKey, $this->origins)) {
-            $emailOwner = $this->emailOwnerProvider->findEmailOwner(
-                $this->getEntityManager(),
-                $this->emailAddressHelper->extractPureEmailAddress($email)
+            $emailOwners = $this->emailOwnerProvider
+                ->findEmailOwners(
+                    $this->getEntityManager(),
+                    $this->emailAddressHelper->extractPureEmailAddress($email)
+                );
+            $origin = $this->findEmailOrigin(
+                $this->chooseEmailOwner($emailOwners),
+                $organization,
+                $originName,
+                $enableUseUserEmailOrigin
             );
 
-            $origin = $this
-                ->findEmailOrigin($emailOwner, $organization, $originName, $enableUseUserEmailOrigin);
-
             $this->origins[$originKey] = $origin;
         }
 
@@ -246,4 +250,36 @@ protected function getEntityManager()
 
         return $this->em;
     }
+
+    /**
+     * If email owner is user check correct account is loggined
+     *
+     * @param $emailOwner
+     * @return bool
+     */
+    protected function hasOriginAccess($emailOwner)
+    {
+        return $emailOwner instanceof User
+            && $this->securityFacade->getLoggedUserId() !== $emailOwner->getId();
+    }
+
+    /**
+     * Get first accessible email owner
+     *
+     * @param $emailOwners
+     * @return null
+     */
+    protected function chooseEmailOwner($emailOwners)
+    {
+        $selectedEmailOwner = null;
+        foreach ($emailOwners as $emailOwner) {
+            if ($this->hasOriginAccess($emailOwner)) {
+                continue;
+            }
+            $selectedEmailOwner = $emailOwner;
+            break;
+        }
+
+        return $selectedEmailOwner;
+    }
 }

From c27cf15cb79058ec121863f0881bad5d69aecdb7 Mon Sep 17 00:00:00 2001
From: Makar Sichevoi <msichevoi@oroinc.com>
Date: Wed, 18 Jan 2017 09:40:05 +0200
Subject: [PATCH 21/29] BAP-13339: Impossible to send email via System Email
 Box

---
 .../Bundle/EmailBundle/Mailer/Processor.php    |  8 +++++++-
 .../EmailBundle/Tools/EmailOriginHelper.php    | 18 ++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Mailer/Processor.php b/src/Oro/Bundle/EmailBundle/Mailer/Processor.php
index c5115128a37..d4230f7f252 100644
--- a/src/Oro/Bundle/EmailBundle/Mailer/Processor.php
+++ b/src/Oro/Bundle/EmailBundle/Mailer/Processor.php
@@ -349,7 +349,13 @@ public function getEmailOrigin(
         $originName = InternalEmailOrigin::BAP,
         $enableUseUserEmailOrigin = true
     ) {
-        return $this->emailOriginHelper->getEmailOrigin($email, $organization, $originName, $enableUseUserEmailOrigin);
+        return $this->emailOriginHelper->getEmailOrigin(
+            $email,
+            $organization,
+            $originName,
+            $enableUseUserEmailOrigin,
+            true
+        );
     }
 
     /**
diff --git a/src/Oro/Bundle/EmailBundle/Tools/EmailOriginHelper.php b/src/Oro/Bundle/EmailBundle/Tools/EmailOriginHelper.php
index 1220b1652eb..cbe40ae61f7 100644
--- a/src/Oro/Bundle/EmailBundle/Tools/EmailOriginHelper.php
+++ b/src/Oro/Bundle/EmailBundle/Tools/EmailOriginHelper.php
@@ -8,6 +8,7 @@
 
 use Oro\Bundle\EmailBundle\Entity\EmailOrigin;
 use Oro\Bundle\EmailBundle\Entity\EmailFolder;
+use Oro\Bundle\EmailBundle\Entity\EmailOwnerInterface;
 use Oro\Bundle\EmailBundle\Entity\InternalEmailOrigin;
 use Oro\Bundle\EmailBundle\Entity\Mailbox;
 use Oro\Bundle\EmailBundle\Entity\Provider\EmailOwnerProvider;
@@ -103,6 +104,7 @@ public function findEmailOrigin($emailOwner, $organization, $originName, $enable
      * @param OrganizationInterface $organization
      * @param string                $originName
      * @param boolean               $enableUseUserEmailOrigin
+     * @param boolean               $secured Check origin can be used by current user
      *
      * @return EmailOrigin
      */
@@ -110,7 +112,8 @@ public function getEmailOrigin(
         $email,
         OrganizationInterface $organization = null,
         $originName = InternalEmailOrigin::BAP,
-        $enableUseUserEmailOrigin = true
+        $enableUseUserEmailOrigin = true,
+        $secured = false
     ) {
         $originKey = $originName . $email . $enableUseUserEmailOrigin;
         if (!$organization && $this->securityFacade !== null && $this->securityFacade->getOrganization()) {
@@ -123,7 +126,7 @@ public function getEmailOrigin(
                     $this->emailAddressHelper->extractPureEmailAddress($email)
                 );
             $origin = $this->findEmailOrigin(
-                $this->chooseEmailOwner($emailOwners),
+                $this->chooseEmailOwner($emailOwners, $secured),
                 $organization,
                 $originName,
                 $enableUseUserEmailOrigin
@@ -254,7 +257,8 @@ protected function getEntityManager()
     /**
      * If email owner is user check correct account is loggined
      *
-     * @param $emailOwner
+     * @param EmailOwnerInterface $emailOwner
+     *
      * @return bool
      */
     protected function hasOriginAccess($emailOwner)
@@ -266,14 +270,16 @@ protected function hasOriginAccess($emailOwner)
     /**
      * Get first accessible email owner
      *
-     * @param $emailOwners
+     * @param EmailOwnerInterface[] $emailOwners
+     * @param bool $secured
+     *
      * @return null
      */
-    protected function chooseEmailOwner($emailOwners)
+    protected function chooseEmailOwner($emailOwners, $secured)
     {
         $selectedEmailOwner = null;
         foreach ($emailOwners as $emailOwner) {
-            if ($this->hasOriginAccess($emailOwner)) {
+            if ($secured && $this->hasOriginAccess($emailOwner)) {
                 continue;
             }
             $selectedEmailOwner = $emailOwner;

From 95f8bc60fd4ea462faa05f93fef8f0881ac47663 Mon Sep 17 00:00:00 2001
From: Makar Sichevoi <msichevoi@oroinc.com>
Date: Wed, 18 Jan 2017 11:56:19 +0200
Subject: [PATCH 22/29] BAP-13339: Impossible to send email via System Email
 Box

---
 .../EmailBundle/Tools/EmailOriginHelper.php   | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Tools/EmailOriginHelper.php b/src/Oro/Bundle/EmailBundle/Tools/EmailOriginHelper.php
index cbe40ae61f7..baa8a2952db 100644
--- a/src/Oro/Bundle/EmailBundle/Tools/EmailOriginHelper.php
+++ b/src/Oro/Bundle/EmailBundle/Tools/EmailOriginHelper.php
@@ -255,7 +255,7 @@ protected function getEntityManager()
     }
 
     /**
-     * If email owner is user check correct account is loggined
+     * Check on access to email owner data by logged in user
      *
      * @param EmailOwnerInterface $emailOwner
      *
@@ -263,8 +263,34 @@ protected function getEntityManager()
      */
     protected function hasOriginAccess($emailOwner)
     {
-        return $emailOwner instanceof User
-            && $this->securityFacade->getLoggedUserId() !== $emailOwner->getId();
+        $access = false;
+        if ($emailOwner instanceof User
+            && $this->securityFacade->getLoggedUserId() === $emailOwner->getId()) {
+            $access = true;
+        } elseif ($emailOwner instanceof Mailbox) {
+            $ownerIds = [];
+            $authorizedUsers = $emailOwner->getAuthorizedUsers();
+            foreach ($authorizedUsers as $user) {
+                $ownerIds[] = $user->getId();
+            }
+
+            $authorizedRoles = $emailOwner->getAuthorizedRoles();
+            foreach ($authorizedRoles as $role) {
+                $users = $this->getEntityManager()->getRepository('OroUserBundle:Role')
+                    ->getUserQueryBuilder($role)
+                    ->getQuery()->getResult();
+
+                foreach ($users as $user) {
+                    $ownerIds[] = $user->getId();
+                }
+            }
+
+            if (in_array($this->securityFacade->getLoggedUserId(), $ownerIds, true)) {
+                $access = true;
+            }
+        }
+
+        return $access;
     }
 
     /**
@@ -279,7 +305,7 @@ protected function chooseEmailOwner($emailOwners, $secured)
     {
         $selectedEmailOwner = null;
         foreach ($emailOwners as $emailOwner) {
-            if ($secured && $this->hasOriginAccess($emailOwner)) {
+            if ($secured && !$this->hasOriginAccess($emailOwner)) {
                 continue;
             }
             $selectedEmailOwner = $emailOwner;

From 083d3acf3e3415ed3ff0b1c97bad531bf35008f9 Mon Sep 17 00:00:00 2001
From: Makar Sichevoi <msichevoi@oroinc.com>
Date: Wed, 18 Jan 2017 12:40:38 +0200
Subject: [PATCH 23/29] BAP-13339: Impossible to send email via System Email
 Box

---
 src/Oro/Bundle/EmailBundle/Mailer/DirectMailer.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Oro/Bundle/EmailBundle/Mailer/DirectMailer.php b/src/Oro/Bundle/EmailBundle/Mailer/DirectMailer.php
index 761ff1e00c4..86884a7e1ba 100644
--- a/src/Oro/Bundle/EmailBundle/Mailer/DirectMailer.php
+++ b/src/Oro/Bundle/EmailBundle/Mailer/DirectMailer.php
@@ -213,6 +213,5 @@ protected function configureTransportLocalDomain(\Swift_Transport_AbstractSmtpTr
         if (0 === strpos($transport->getLocalDomain(), '*') && !empty($_SERVER['HTTP_HOST'])) {
             $transport->setLocalDomain($_SERVER['HTTP_HOST']);
         }
-//        $transport->setLocalDomain('magecore.onmicrosoft.com');
     }
 }

From 28137cb642a25b4ddb647d4cd4770fd852a69c77 Mon Sep 17 00:00:00 2001
From: Makar Sichevoi <msichevoi@oroinc.com>
Date: Wed, 18 Jan 2017 13:05:37 +0200
Subject: [PATCH 24/29] BAP-13339: Impossible to send email via System Email
 Box

---
 .../EmailBundle/Tools/EmailOriginHelper.php   | 122 +++++++++---------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Tools/EmailOriginHelper.php b/src/Oro/Bundle/EmailBundle/Tools/EmailOriginHelper.php
index baa8a2952db..107c2db0620 100644
--- a/src/Oro/Bundle/EmailBundle/Tools/EmailOriginHelper.php
+++ b/src/Oro/Bundle/EmailBundle/Tools/EmailOriginHelper.php
@@ -138,6 +138,67 @@ public function getEmailOrigin(
         return $this->origins[$originKey];
     }
 
+    /**
+     * Get first accessible email owner
+     *
+     * @param EmailOwnerInterface[] $emailOwners
+     * @param bool $secured
+     *
+     * @return null
+     */
+    protected function chooseEmailOwner($emailOwners, $secured)
+    {
+        $selectedEmailOwner = null;
+        foreach ($emailOwners as $emailOwner) {
+            if ($secured && !$this->hasOriginAccess($emailOwner)) {
+                continue;
+            }
+            $selectedEmailOwner = $emailOwner;
+            break;
+        }
+
+        return $selectedEmailOwner;
+    }
+
+    /**
+     * Check on access to email owner data by logged in user
+     *
+     * @param EmailOwnerInterface $emailOwner
+     *
+     * @return bool
+     */
+    protected function hasOriginAccess($emailOwner)
+    {
+        $access = false;
+        if ($emailOwner instanceof User
+            && $this->securityFacade->getLoggedUserId() === $emailOwner->getId()) {
+            $access = true;
+        } elseif ($emailOwner instanceof Mailbox) {
+            $ownerIds = [];
+            $authorizedUsers = $emailOwner->getAuthorizedUsers();
+            foreach ($authorizedUsers as $user) {
+                $ownerIds[] = $user->getId();
+            }
+
+            $authorizedRoles = $emailOwner->getAuthorizedRoles();
+            foreach ($authorizedRoles as $role) {
+                $users = $this->getEntityManager()->getRepository('OroUserBundle:Role')
+                    ->getUserQueryBuilder($role)
+                    ->getQuery()->getResult();
+
+                foreach ($users as $user) {
+                    $ownerIds[] = $user->getId();
+                }
+            }
+
+            if (in_array($this->securityFacade->getLoggedUserId(), $ownerIds, true)) {
+                $access = true;
+            }
+        }
+
+        return $access;
+    }
+
     /**
      * @param mixed $origin
      *
@@ -253,65 +314,4 @@ protected function getEntityManager()
 
         return $this->em;
     }
-
-    /**
-     * Check on access to email owner data by logged in user
-     *
-     * @param EmailOwnerInterface $emailOwner
-     *
-     * @return bool
-     */
-    protected function hasOriginAccess($emailOwner)
-    {
-        $access = false;
-        if ($emailOwner instanceof User
-            && $this->securityFacade->getLoggedUserId() === $emailOwner->getId()) {
-            $access = true;
-        } elseif ($emailOwner instanceof Mailbox) {
-            $ownerIds = [];
-            $authorizedUsers = $emailOwner->getAuthorizedUsers();
-            foreach ($authorizedUsers as $user) {
-                $ownerIds[] = $user->getId();
-            }
-
-            $authorizedRoles = $emailOwner->getAuthorizedRoles();
-            foreach ($authorizedRoles as $role) {
-                $users = $this->getEntityManager()->getRepository('OroUserBundle:Role')
-                    ->getUserQueryBuilder($role)
-                    ->getQuery()->getResult();
-
-                foreach ($users as $user) {
-                    $ownerIds[] = $user->getId();
-                }
-            }
-
-            if (in_array($this->securityFacade->getLoggedUserId(), $ownerIds, true)) {
-                $access = true;
-            }
-        }
-
-        return $access;
-    }
-
-    /**
-     * Get first accessible email owner
-     *
-     * @param EmailOwnerInterface[] $emailOwners
-     * @param bool $secured
-     *
-     * @return null
-     */
-    protected function chooseEmailOwner($emailOwners, $secured)
-    {
-        $selectedEmailOwner = null;
-        foreach ($emailOwners as $emailOwner) {
-            if ($secured && !$this->hasOriginAccess($emailOwner)) {
-                continue;
-            }
-            $selectedEmailOwner = $emailOwner;
-            break;
-        }
-
-        return $selectedEmailOwner;
-    }
 }

From 814d734b49eaf3acfc4aa542d60c17e8c0a0d537 Mon Sep 17 00:00:00 2001
From: Makar Sichevoi <msichevoi@oroinc.com>
Date: Wed, 18 Jan 2017 13:17:21 +0200
Subject: [PATCH 25/29] BAP-13339: Impossible to send email via System Email
 Box

---
 .../Bundle/EmailBundle/Entity/Provider/EmailOwnerProvider.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Oro/Bundle/EmailBundle/Entity/Provider/EmailOwnerProvider.php b/src/Oro/Bundle/EmailBundle/Entity/Provider/EmailOwnerProvider.php
index 7908b5cfd78..0f8f0150816 100644
--- a/src/Oro/Bundle/EmailBundle/Entity/Provider/EmailOwnerProvider.php
+++ b/src/Oro/Bundle/EmailBundle/Entity/Provider/EmailOwnerProvider.php
@@ -44,6 +44,7 @@ public function findEmailOwner(EntityManager $em, $email)
 
         return $emailOwner;
     }
+
     /**
      * Find an entity objects which is an owner of the given email address
      *

From 8beedcc973394150bcb79ad5bd97933cccd4590a Mon Sep 17 00:00:00 2001
From: Igor Krynychanskyi <ikrynychanskyi@oroinc.com>
Date: Wed, 18 Jan 2017 13:34:43 +0200
Subject: [PATCH 26/29] CRM-7391: Duplicated Contacts view name should be
 corrected - Changed grid labels

---
 .../DataGridBundle/Resources/translations/messages.en.yml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml
index d9407d5b2e6..fda88a5a8c4 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml
@@ -23,7 +23,7 @@ oro:
             columns_data.label: Columns data
             appearance_type.label: Appearance type
             appearance_data.label: Appearance data
-            duplicate.label: Duplicate %entity%
+            duplicate.label: Duplicated %entity%
         appearance:
             grid: Grid
             board: Kanban Board

From 330d589721141378b43e19d6a86f2a22a06f53b6 Mon Sep 17 00:00:00 2001
From: Dmitry Naydenov <dnaidonov@oroinc.com>
Date: Wed, 18 Jan 2017 13:45:15 +0100
Subject: [PATCH 27/29] BAP-13165 Linked entety is not processed during the
 import, if the value is Null - move filterEmptyArrays method to ImportExport
 bundle utils

---
 .../Converter/AbstractTableDataConverter.php  |  2 +-
 .../Tests/Unit/Utils/ArrayUtilTest.php        | 60 +++++++++++++++++++
 .../ImportExportBundle/Utils/ArrayUtil.php    | 36 +++++++++++
 src/Oro/Component/PhpUtils/ArrayUtil.php      | 30 ----------
 .../PhpUtils/Tests/Unit/ArrayUtilTest.php     | 52 ----------------
 5 files changed, 97 insertions(+), 83 deletions(-)
 create mode 100644 src/Oro/Bundle/ImportExportBundle/Tests/Unit/Utils/ArrayUtilTest.php
 create mode 100644 src/Oro/Bundle/ImportExportBundle/Utils/ArrayUtil.php

diff --git a/src/Oro/Bundle/ImportExportBundle/Converter/AbstractTableDataConverter.php b/src/Oro/Bundle/ImportExportBundle/Converter/AbstractTableDataConverter.php
index 546d024f189..34c72dc3aa0 100644
--- a/src/Oro/Bundle/ImportExportBundle/Converter/AbstractTableDataConverter.php
+++ b/src/Oro/Bundle/ImportExportBundle/Converter/AbstractTableDataConverter.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
-use Oro\Component\PhpUtils\ArrayUtil;
+use Oro\Bundle\ImportExportBundle\Utils\ArrayUtil;
 use Oro\Bundle\ImportExportBundle\Event\Events;
 use Oro\Bundle\ImportExportBundle\Event\FormatConversionEvent;
 use Oro\Bundle\ImportExportBundle\Exception\LogicException;
diff --git a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Utils/ArrayUtilTest.php b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Utils/ArrayUtilTest.php
new file mode 100644
index 00000000000..1c60fac87e2
--- /dev/null
+++ b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Utils/ArrayUtilTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Oro\Bundle\ImportExportBundle\Tests\Unit\Utils;
+
+use Oro\Bundle\ImportExportBundle\Utils\ArrayUtil;
+
+class ArrayUtilTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider filterEmptyArraysDataProvider
+     *
+     * @param array $expected
+     * @param array $data
+     */
+    public function testFilterEmptyArrays(array $expected, array $data)
+    {
+        $this->assertEquals($expected, ArrayUtil::filterEmptyArrays($data));
+    }
+
+    /**
+     * @return array
+     */
+    public function filterEmptyArraysDataProvider()
+    {
+        return [
+            'One-level array data' => [
+                'expected' => [
+                    'One Level Array' => [
+                        'rowOne' => 'some value',
+                        'rowTwo' => 'some value',
+                    ],
+                    'Empty Array'     => [],
+                    'Empty SubArrays' => [
+                        'rowOne'  => 'some value',
+                        'rowTree' => [
+                            'subrowTwo'  => 'some value',
+                            'subrowTree' => null,
+                        ],
+                    ],
+                ],
+                'data'     => [
+                    'One Level Array' => [
+                        'rowOne' => 'some value',
+                        'rowTwo' => 'some value',
+                    ],
+                    'Empty Array'     => [],
+                    'Empty SubArrays' => [
+                        'rowOne'  => 'some value',
+                        'rowTwo'  => [],
+                        'rowTree' => [
+                            'subrowOne'  => [],
+                            'subrowTwo'  => 'some value',
+                            'subrowTree' => null,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/src/Oro/Bundle/ImportExportBundle/Utils/ArrayUtil.php b/src/Oro/Bundle/ImportExportBundle/Utils/ArrayUtil.php
new file mode 100644
index 00000000000..35e7f918e0d
--- /dev/null
+++ b/src/Oro/Bundle/ImportExportBundle/Utils/ArrayUtil.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Oro\Bundle\ImportExportBundle\Utils;
+
+class ArrayUtil
+{
+    /**
+     * Remove all empty sub-arrays and leave first level empty arrays
+     *
+     * @param array   $data
+     * @param integer $depth This variable reflects the depth of entering into an array. Please be careful with
+     *                       this variable if you set $depth it will change current function logic. If you don`t know
+     *                       do not set $depth
+     *
+     * @return array
+     */
+    public static function filterEmptyArrays(array $data, $depth = 0)
+    {
+        $hasValue = false;
+
+        foreach ($data as $key => $value) {
+            if (is_array($value)) {
+                $value      = self::filterEmptyArrays($value, $depth + 1);
+                $data[$key] = $value;
+            }
+
+            if ([] === $value && 0 !== $depth) {
+                unset($data[$key]);
+            } elseif (null !== $value) {
+                $hasValue = true;
+            }
+        }
+
+        return $hasValue ? $data : [];
+    }
+}
diff --git a/src/Oro/Component/PhpUtils/ArrayUtil.php b/src/Oro/Component/PhpUtils/ArrayUtil.php
index 46c891c34a8..24bc08eec23 100644
--- a/src/Oro/Component/PhpUtils/ArrayUtil.php
+++ b/src/Oro/Component/PhpUtils/ArrayUtil.php
@@ -430,34 +430,4 @@ function ($part) {
 
         return $propertyAccessor->getValue($array, $propertyPath);
     }
-
-    /**
-     * Remove all empty sub-arrays and leave first level empty arrays
-     *
-     * @param array   $data
-     * @param integer $depth This variable reflects the depth of entering into an array. Please be careful with
-     *                       this variable if you set $depth it will change current function logic. If you don`t know
-     *                       do not set $depth
-     *
-     * @return array
-     */
-    public static function filterEmptyArrays(array $data, $depth = 0)
-    {
-        $hasValue = false;
-
-        foreach ($data as $key => $value) {
-            if (is_array($value)) {
-                $value      = self::filterEmptyArrays($value, $depth + 1);
-                $data[$key] = $value;
-            }
-
-            if ([] === $value && 0 !== $depth) {
-                unset($data[$key]);
-            } elseif (null !== $value) {
-                $hasValue = true;
-            }
-        }
-
-        return $hasValue ? $data : [];
-    }
 }
diff --git a/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php b/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php
index ae78a1382d0..14668549b16 100644
--- a/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php
+++ b/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php
@@ -955,56 +955,4 @@ protected function createObject($properties)
 
         return $obj;
     }
-
-    /**
-     * @dataProvider filterEmptyArraysDataProvider
-     *
-     * @param array $expected
-     * @param array $data
-     */
-    public function testFilterEmptyArrays(array $expected, array $data)
-    {
-        $this->assertEquals($expected, ArrayUtil::filterEmptyArrays($data));
-    }
-
-    /**
-     * @return array
-     */
-    public function filterEmptyArraysDataProvider()
-    {
-        return [
-            'One-level array data' => [
-                'expected' => [
-                    'One Level Array' => [
-                        'rowOne' => 'some value',
-                        'rowTwo' => 'some value',
-                    ],
-                    'Empty Array'     => [],
-                    'Empty SubArrays' => [
-                        'rowOne'  => 'some value',
-                        'rowTree' => [
-                            'subrowTwo'  => 'some value',
-                            'subrowTree' => null,
-                        ],
-                    ],
-                ],
-                'data'     => [
-                    'One Level Array' => [
-                        'rowOne' => 'some value',
-                        'rowTwo' => 'some value',
-                    ],
-                    'Empty Array'     => [],
-                    'Empty SubArrays' => [
-                        'rowOne'  => 'some value',
-                        'rowTwo'  => [],
-                        'rowTree' => [
-                            'subrowOne'  => [],
-                            'subrowTwo'  => 'some value',
-                            'subrowTree' => null,
-                        ],
-                    ],
-                ],
-            ],
-        ];
-    }
 }

From d19dfd529cc613d40df4c5552b73fa3ed6c36ee4 Mon Sep 17 00:00:00 2001
From: Vladyslav Byndych <vbyndych@oroinc.com>
Date: Wed, 18 Jan 2017 15:24:11 +0200
Subject: [PATCH 28/29] =?UTF-8?q?CRM-6668:=20Widget=20=E2=80=9CCampaigns?=
 =?UTF-8?q?=20By=20Close=20Revenue=20=E2=80=9D:=20Total=20$=20for=20campai?=
 =?UTF-8?q?gn=20are=20shown=20for=20opportunities=20Closed=20Lost.=20(#668?=
 =?UTF-8?q?3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-  fix closed opportunities in widget showing
-  fix date filter on widget
- add filter by won opportunities
- add test
- added functional test to widget with today filter range to cover problem described in task
- Refactor widgets tests:
--- Move them to one place.
--- Move all checks to one test and decrease fixtures number
--- Move useful method to fetch chart data to parent (DRY)
---
 .../Functional/AbstractWidgetTestCase.php     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/Oro/Bundle/DashboardBundle/Tests/Functional/AbstractWidgetTestCase.php b/src/Oro/Bundle/DashboardBundle/Tests/Functional/AbstractWidgetTestCase.php
index 2b8ce177e0e..ae9f9e74640 100644
--- a/src/Oro/Bundle/DashboardBundle/Tests/Functional/AbstractWidgetTestCase.php
+++ b/src/Oro/Bundle/DashboardBundle/Tests/Functional/AbstractWidgetTestCase.php
@@ -62,4 +62,25 @@ protected function configureWidget(Widget $widget, array $configFields)
         $response = $this->client->getResponse();
         $this->assertEquals($response->getStatusCode(), 200, "Failed in submit widget configuration options !");
     }
+
+    /**
+     * Returns data for which will be used to show widget's chart
+     *
+     * @param $crawler
+     * @return array
+     */
+    protected function getChartData($crawler)
+    {
+        $dataComponent = $crawler->filter('.column-chart');
+        if ($dataComponent->extract(['data-page-component-options'])) {
+            $data = $dataComponent->extract(['data-page-component-options']);
+            $data = json_decode($data[0]);
+            return $data->chartOptions->dataSource->data;
+        } else {
+            $dataComponent = $crawler->filter('.dashboard-widget-content > [data-page-component-options]');
+            $data = $dataComponent->extract(['data-page-component-options']);
+            $data = json_decode($data[0]);
+            return $data->data;
+        }
+    }
 }

From 18902f1b2f3cb4de27a765e8912865954d3f8938 Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Fri, 20 Jan 2017 15:50:02 +0200
Subject: [PATCH 29/29] BAP-13382: Unpredictable data sorting on Calls grid
 (#6791)

- Fix issues in ORDER BY modification and move it to AST walker
- Fix indexes (add ID to the end)
---
 .../Sorter/PostgresqlGridModifier.php         | 193 -----------
 .../Sorter/PreciseOrderByExtension.php        |  88 +++++
 .../Resources/config/extensions.yml           |   8 +-
 .../Resources/doc/backend/datasources/orm.md  |  18 +
 .../Extension/PostgresqlGridModifierTest.php  |  81 -----
 .../Sorter/PreciseOrderByExtensionTest.php    | 121 +++++++
 .../EntityBundle/Resources/config/orm.yml     |  10 +
 .../ORM/Walker/CurrentUserWalker.php          |   4 +-
 .../DoctrineUtils/ORM/QueryHintResolver.php   |   2 +-
 .../ORM/Walker/PreciseOrderByWalker.php       | 308 ++++++++++++++++++
 src/Oro/Component/DoctrineUtils/README.md     |  11 +
 .../Tests/Unit/Fixtures/Entity/Person.php     |   7 +
 .../Unit/ORM/PreciseOrderByWalkerTest.php     | 225 +++++++++++++
 .../Tests/Unit/ORM/QueryHintResolverTest.php  |  34 ++
 14 files changed, 827 insertions(+), 283 deletions(-)
 delete mode 100644 src/Oro/Bundle/DataGridBundle/Extension/Sorter/PostgresqlGridModifier.php
 create mode 100644 src/Oro/Bundle/DataGridBundle/Extension/Sorter/PreciseOrderByExtension.php
 delete mode 100644 src/Oro/Bundle/DataGridBundle/Tests/Functional/Extension/PostgresqlGridModifierTest.php
 create mode 100644 src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/Sorter/PreciseOrderByExtensionTest.php
 create mode 100644 src/Oro/Component/DoctrineUtils/ORM/Walker/PreciseOrderByWalker.php
 create mode 100644 src/Oro/Component/DoctrineUtils/Tests/Unit/ORM/PreciseOrderByWalkerTest.php

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Sorter/PostgresqlGridModifier.php b/src/Oro/Bundle/DataGridBundle/Extension/Sorter/PostgresqlGridModifier.php
deleted file mode 100644
index 1678ade9e50..00000000000
--- a/src/Oro/Bundle/DataGridBundle/Extension/Sorter/PostgresqlGridModifier.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-namespace Oro\Bundle\DataGridBundle\Extension\Sorter;
-
-use Doctrine\ORM\Query\Expr\From;
-use Doctrine\ORM\QueryBuilder;
-use Doctrine\ORM\Query\Expr\Select;
-
-use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
-use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface;
-use Oro\Bundle\DataGridBundle\Extension\AbstractExtension;
-use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource;
-use Oro\Bundle\EntityBundle\ORM\DatabaseDriverInterface;
-use Oro\Bundle\EntityBundle\ORM\EntityClassResolver;
-
-class PostgresqlGridModifier extends AbstractExtension
-{
-    const PRIORITY = -261;
-
-    /** @var string */
-    protected $databaseDriver;
-
-    /** @var EntityClassResolver */
-    protected $entityClassResolver;
-
-    /**
-     * @param string $databaseDriver
-     * @param EntityClassResolver $entityClassResolver
-     */
-    public function __construct($databaseDriver, EntityClassResolver $entityClassResolver)
-    {
-        $this->databaseDriver = $databaseDriver;
-        $this->entityClassResolver = $entityClassResolver;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isApplicable(DatagridConfiguration $config)
-    {
-        return $this->databaseDriver === DatabaseDriverInterface::DRIVER_POSTGRESQL;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getPriority()
-    {
-        return self::PRIORITY;
-    }
-
-    /**
-     * Add sorting by identifier because postgresql return rows in different order on two the same sql, but
-     * different LIMIT number
-     *
-     * @param DatagridConfiguration $config
-     * @param DatasourceInterface $datasource
-     * @return mixed|void
-     */
-    public function visitDatasource(DatagridConfiguration $config, DatasourceInterface $datasource)
-    {
-        //getQueryBuilder exists only in datagrid orm datasource
-        if (!$datasource instanceof OrmDatasource) {
-            return;
-        }
-
-        $entityClassName = $this->getEntityClassName($config);
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $datasource->getQueryBuilder();
-
-        if (!$entityClassName) {
-            return;
-        }
-
-        $fromParts = $queryBuilder->getDQLPart('from');
-        $alias = false;
-
-        $metadata = $queryBuilder->getEntityManager()->getClassMetadata($entityClassName);
-        $identifier = $metadata->getSingleIdentifierFieldName();
-
-        /** @var From $fromPart */
-        foreach ($fromParts as $fromPart) {
-            if ($this->entityClassResolver->getEntityClass($fromPart->getFrom()) == $entityClassName) {
-                $alias = $fromPart->getAlias();
-                break;
-            }
-        }
-
-        if ($alias && $this->isAllowedAddingSorting($alias, $identifier, $queryBuilder)) {
-            $field = $alias . '.' . $identifier;
-            $orderBy = $queryBuilder->getDQLPart('orderBy');
-            if (!isset($orderBy[$field])) {
-                if ($this->isDistinct($queryBuilder)) {
-                    $this->ensureIdentifierSelected($queryBuilder, $field);
-                }
-                $queryBuilder->addOrderBy($field, 'ASC');
-            }
-        }
-    }
-
-    /**
-     * @param DatagridConfiguration $config
-     *
-     * @return null|string
-     */
-    protected function getEntityClassName(DatagridConfiguration $config)
-    {
-        $entityClassName = $config->offsetGetByPath('[extended_entity_name]');
-        if ($entityClassName) {
-            return $entityClassName;
-        }
-
-        $from = $config->offsetGetByPath('[source][query][from]');
-        if (count($from) !== 0) {
-            return $this->entityClassResolver->getEntityClass($from[0]['table']);
-        }
-
-        return null;
-    }
-
-    /**
-     * @param string $alias
-     * @param string $identifier
-     * @param QueryBuilder $queryBuilder
-     * @return bool
-     */
-    protected function isAllowedAddingSorting($alias, $identifier, QueryBuilder $queryBuilder)
-    {
-        $groupByParts = $queryBuilder->getDQLPart('groupBy');
-
-        if (!count($groupByParts)) {
-            return true;
-        }
-
-        foreach ($groupByParts as $groupBy) {
-            if (in_array($alias.'.'.$identifier, $groupBy->getParts(), true) !== false) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param QueryBuilder $queryBuilder
-     * @return bool
-     */
-    protected function isDistinct(QueryBuilder $queryBuilder)
-    {
-        if ($queryBuilder->getDQLPart('distinct')) {
-            return true;
-        }
-
-        foreach ($queryBuilder->getDQLPart('select') as $select) {
-            $selectString = ltrim(strtolower((string)$select));
-            if (strpos($selectString, 'distinct ') === 0) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param QueryBuilder $queryBuilder
-     * @param string $field
-     */
-    protected function ensureIdentifierSelected(QueryBuilder $queryBuilder, $field)
-    {
-        $isSelected = false;
-        /** @var Select $select */
-        foreach ($queryBuilder->getDQLPart('select') as $select) {
-            $selectString = ltrim(strtolower((string)$select));
-            if (strpos($selectString, 'distinct ') === 0) {
-                $selectString = substr($selectString, 9);
-            }
-            // if field itself or field with alias
-            if ($selectString === $field ||
-                (
-                    strpos($selectString, $field) === 0 &&
-                    strpos(strtolower(ltrim(substr($selectString, strlen($field)))), 'as ') === 0
-                )
-            ) {
-                $isSelected = true;
-                break;
-            }
-        }
-
-        if (!$isSelected) {
-            $queryBuilder->addSelect($field);
-        }
-    }
-}
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Sorter/PreciseOrderByExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Sorter/PreciseOrderByExtension.php
new file mode 100644
index 00000000000..cbeadf7e37f
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Extension/Sorter/PreciseOrderByExtension.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Oro\Bundle\DataGridBundle\Extension\Sorter;
+
+use Oro\Component\DoctrineUtils\ORM\QueryHintResolver;
+use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
+use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource;
+use Oro\Bundle\DataGridBundle\Extension\AbstractExtension;
+
+/**
+ * @see Oro\Component\DoctrineUtils\ORM\Walker\PreciseOrderByWalker
+ */
+class PreciseOrderByExtension extends AbstractExtension
+{
+    const HINT_PRECISE_ORDER_BY = 'HINT_PRECISE_ORDER_BY';
+
+    /** @var QueryHintResolver */
+    protected $queryHintResolver;
+
+    /**
+     * @param QueryHintResolver $queryHintResolver
+     */
+    public function __construct(QueryHintResolver $queryHintResolver)
+    {
+        $this->queryHintResolver = $queryHintResolver;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPriority()
+    {
+        // should visit after all extensions and after SorterExtension
+        return -261;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isApplicable(DatagridConfiguration $config)
+    {
+        return OrmDatasource::TYPE === $config->getDatasourceType();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function processConfigs(DatagridConfiguration $config)
+    {
+        $addHint = true;
+        $resolvedHintName = $this->queryHintResolver->resolveHintName(self::HINT_PRECISE_ORDER_BY);
+        $hints = $config->offsetGetByPath('[source][hints]', []);
+        foreach ($hints as $hintKey => $hint) {
+            if (is_array($hint)) {
+                $hintName = $this->getHintAttribute($hint, 'name');
+                if (self::HINT_PRECISE_ORDER_BY === $hintName || $resolvedHintName === $hintName) {
+                    $addHint = false;
+                    $hintValue = $this->getHintAttribute($hint, 'value');
+                    if (false === $hintValue) {
+                        // remove the hint if it was disabled
+                        unset($hints[$hintKey]);
+                        $config->offsetSetByPath('[source][hints]', $hints);
+                    }
+                    break;
+                }
+            } elseif (self::HINT_PRECISE_ORDER_BY === $hint || $resolvedHintName === $hint) {
+                $addHint = false;
+                break;
+            }
+        }
+        if ($addHint) {
+            $config->offsetAddToArrayByPath('[source][hints]', [self::HINT_PRECISE_ORDER_BY]);
+        }
+    }
+
+    /**
+     * @param array  $hint
+     * @param string $attributeName
+     *
+     * @return mixed
+     */
+    private function getHintAttribute(array $hint, $attributeName)
+    {
+        return array_key_exists($attributeName, $hint)
+            ? $hint[$attributeName]
+            : null;
+    }
+}
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml b/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
index eee29da9066..0929fdaf851 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
@@ -13,7 +13,6 @@ parameters:
     oro_datagrid.extension.totals.class:           Oro\Bundle\DataGridBundle\Extension\Totals\OrmTotalsExtension
     oro_datagrid.extension.columns.class:          Oro\Bundle\DataGridBundle\Extension\Columns\ColumnsExtension
     oro_datagrid.extension.mode.class:             Oro\Bundle\DataGridBundle\Extension\Mode\ModeExtension
-    oro_datagrid.extension.postgresql_grid_modifier.class: Oro\Bundle\DataGridBundle\Extension\Sorter\PostgresqlGridModifier
     oro_datagrid.extension.board.class:            Oro\Bundle\DataGridBundle\Extension\Board\BoardExtension
     oro_datagrid.extension.appearance.class:       Oro\Bundle\DataGridBundle\Extension\Appearance\AppearanceExtension
 
@@ -136,11 +135,10 @@ services:
         tags:
             - { name: oro_datagrid.extension }
 
-    oro_datagrid.extension.postgresql_grid_modifier:
-        class: %oro_datagrid.extension.postgresql_grid_modifier.class%
+    oro_datagrid.extension.precise_order_by:
+        class: Oro\Bundle\DataGridBundle\Extension\Sorter\PreciseOrderByExtension
         arguments:
-            - %database_driver%
-            - '@oro_entity.orm.entity_class_resolver'
+            - '@oro_entity.query_hint_resolver'
         tags:
             - { name: oro_datagrid.extension }
 
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/doc/backend/datasources/orm.md b/src/Oro/Bundle/DataGridBundle/Resources/doc/backend/datasources/orm.md
index 34a313d89e1..22795c35ab6 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/doc/backend/datasources/orm.md
+++ b/src/Oro/Bundle/DataGridBundle/Resources/doc/backend/datasources/orm.md
@@ -22,6 +22,24 @@ datagrid:
                 from:
                     - { table: OroCRMContactBundle:Group, alias: g }
 ```
+Important notes
+---------------
+
+By default all datagrids that use ORM datasource is marked by [HINT_PRECISE_ORDER_BY](../../../../../../Component/DoctrineUtils/README.md#preciseorderbywalker-class) query hint. This guarantee that rows are sorted in the same way independent from a state of SQL server and from values of OFFSET and LIMIT clauses. More details you can find in [PostgreSQL documentation](https://www.postgresql.org/docs/8.1/static/queries-limit.html).
+
+If you need to disable this behaviour for your datagrid the following configuration can be used:
+
+```yaml
+
+datagrids:
+    DATAGRID_NAME_HERE:
+        source:
+            type: orm
+            query:
+                ...
+            hints:
+                - { name: HINT_PRECISE_ORDER_BY, value: false }
+```
 
 Query hints
 -----------
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Functional/Extension/PostgresqlGridModifierTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Functional/Extension/PostgresqlGridModifierTest.php
deleted file mode 100644
index a15f83369b0..00000000000
--- a/src/Oro/Bundle/DataGridBundle/Tests/Functional/Extension/PostgresqlGridModifierTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-namespace Oro\Bundle\DataGridBundle\Tests\Functional\Extension;
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-use Doctrine\ORM\QueryBuilder;
-
-use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase;
-use Oro\Bundle\EntityBundle\ORM\DatabaseDriverInterface;
-
-/**
- * @dbIsolation
- */
-class PostgresqlGridModifierTest extends WebTestCase
-{
-    protected $gridName = 'users-grid';
-    protected $gridParameters = [];
-    protected $identifier = 'u.id';
-
-    /**
-     * @var ContainerInterface
-     */
-    protected $container;
-
-    protected function setUp()
-    {
-        $this->initClient([], $this->generateBasicAuthHeader());
-        $this->client->useHashNavigation(true);
-        $this->container = $this->client->getKernel()->getContainer();
-        $this->loadFixtures([
-            'Oro\Bundle\DataGridBundle\Tests\Functional\DataFixtures\LoadUserData',
-        ]);
-    }
-
-    public function testGridIsValidAndContainsEntityIdentifierInSorting()
-    {
-        if ($this->container->getParameter('database_driver') !== DatabaseDriverInterface::DRIVER_POSTGRESQL) {
-            $this->markTestSkipped('Test runs only on PostgreSQL environment');
-        }
-
-        $getIdFunction = function ($array) {
-            if (isset($array['id'])) {
-                return $array['id'];
-            }
-            return null;
-        };
-
-        // any route just to initialize security context
-        $this->client->request('GET', $this->getUrl('oro_user_index'));
-
-        $isFoundIdentifier = false;
-        $usersGrid = $this->container->get('oro_datagrid.datagrid.manager')->getDatagrid(
-            $this->gridName,
-            $this->gridParameters
-        );
-        //this is just running my extension
-        $usersGrid->getData();
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $usersGrid->getDatasource()->getQueryBuilder();
-        $queryBuilder->setFirstResult(0)->setMaxResults(10);
-        $idsWithLittleLimit = array_map($getIdFunction, $queryBuilder->getQuery()->getResult());
-        $queryBuilder->setFirstResult(0)->setMaxResults(50000);
-        $idsWithLargeLimit = array_map($getIdFunction, $queryBuilder->getQuery()->getResult());
-        $orderByParts = $usersGrid->getDatasource()->getQueryBuilder()->getDQLPart('orderBy');
-
-        foreach ($orderByParts as $part) {
-            $parts = $part->getParts();
-            if (in_array($this->identifier . ' ASC', $parts, true) !== false) {
-                $isFoundIdentifier = true;
-                break;
-            }
-        }
-
-        $this->assertTrue($isFoundIdentifier);
-        $this->assertEquals($idsWithLargeLimit, $idsWithLittleLimit);
-
-        // make sure query builder valid
-        $queryBuilder->getQuery()->execute();
-    }
-}
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/Sorter/PreciseOrderByExtensionTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/Sorter/PreciseOrderByExtensionTest.php
new file mode 100644
index 00000000000..c12029a4e32
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/Sorter/PreciseOrderByExtensionTest.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace Oro\Bundle\DataGridBundle\Tests\Unit\Extension\Sorter;
+
+use Oro\Component\DoctrineUtils\ORM\QueryHintResolver;
+use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
+use Oro\Bundle\DataGridBundle\Extension\Sorter\PreciseOrderByExtension;
+
+class PreciseOrderByExtensionTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var PreciseOrderByExtension */
+    protected $extension;
+
+    public function setUp()
+    {
+        $queryHintResolver = $this->getMockBuilder(QueryHintResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $queryHintResolver->expects(self::any())
+            ->method('resolveHintName')
+            ->with(PreciseOrderByExtension::HINT_PRECISE_ORDER_BY)
+            ->willReturn('oro_entity.precise_order_by');
+
+        $this->extension = new PreciseOrderByExtension($queryHintResolver);
+    }
+
+    public function testGetPriority()
+    {
+        self::assertSame(-261, $this->extension->getPriority());
+    }
+
+    public function testIsApplicableForNotOrmDatasource()
+    {
+        $config = DatagridConfiguration::create(['source' => ['type' => 'other']]);
+        self::assertFalse($this->extension->isApplicable($config));
+    }
+
+    public function testIsApplicableForOrmDatasource()
+    {
+        $config = DatagridConfiguration::create(['source' => ['type' => 'orm']]);
+        self::assertTrue($this->extension->isApplicable($config));
+    }
+
+    public function testProcessConfigsWhenNoPreciseOrderByHint()
+    {
+        $config = DatagridConfiguration::create([]);
+        $this->extension->processConfigs($config);
+        self::assertEquals(
+            ['HINT_PRECISE_ORDER_BY'],
+            $config->offsetGetByPath('[source][hints]')
+        );
+    }
+
+    public function testProcessConfigsWhenPreciseOrderByHintAlreadyExists()
+    {
+        $config = DatagridConfiguration::create(['source' => ['hints' => ['HINT_PRECISE_ORDER_BY']]]);
+        $this->extension->processConfigs($config);
+        self::assertEquals(
+            ['HINT_PRECISE_ORDER_BY'],
+            $config->offsetGetByPath('[source][hints]')
+        );
+    }
+
+    public function testProcessConfigsWhenPreciseOrderByHintAlreadyExistsAndWasAddedByItsName()
+    {
+        $config = DatagridConfiguration::create(['source' => ['hints' => ['oro_entity.precise_order_by']]]);
+        $this->extension->processConfigs($config);
+        self::assertEquals(
+            ['oro_entity.precise_order_by'],
+            $config->offsetGetByPath('[source][hints]')
+        );
+    }
+
+    public function testProcessConfigsWhenPreciseOrderByHintAlreadyExistsFullDeclaration()
+    {
+        $config = DatagridConfiguration::create(
+            ['source' => ['hints' => [['name' => 'HINT_PRECISE_ORDER_BY', 'value' => true]]]]
+        );
+        $this->extension->processConfigs($config);
+        self::assertEquals(
+            [['name' => 'HINT_PRECISE_ORDER_BY', 'value' => true]],
+            $config->offsetGetByPath('[source][hints]')
+        );
+    }
+
+    public function testProcessConfigsWhenPreciseOrderByHintAlreadyExistsFullDeclarationAndWasAddedByItsName()
+    {
+        $config = DatagridConfiguration::create(
+            ['source' => ['hints' => [['name' => 'oro_entity.precise_order_by', 'value' => true]]]]
+        );
+        $this->extension->processConfigs($config);
+        self::assertEquals(
+            [['name' => 'oro_entity.precise_order_by', 'value' => true]],
+            $config->offsetGetByPath('[source][hints]')
+        );
+    }
+
+    public function testProcessConfigsWhenPreciseOrderByHintDisabled()
+    {
+        $config = DatagridConfiguration::create(
+            ['source' => ['hints' => [['name' => 'HINT_PRECISE_ORDER_BY', 'value' => false]]]]
+        );
+        $this->extension->processConfigs($config);
+        self::assertEquals(
+            [],
+            $config->offsetGetByPath('[source][hints]')
+        );
+    }
+
+    public function testProcessConfigsWhenPreciseOrderByHintDisabledByItsName()
+    {
+        $config = DatagridConfiguration::create(
+            ['source' => ['hints' => [['name' => 'oro_entity.precise_order_by', 'value' => false]]]]
+        );
+        $this->extension->processConfigs($config);
+        self::assertEquals(
+            [],
+            $config->offsetGetByPath('[source][hints]')
+        );
+    }
+}
diff --git a/src/Oro/Bundle/EntityBundle/Resources/config/orm.yml b/src/Oro/Bundle/EntityBundle/Resources/config/orm.yml
index 7159dd33eee..5f950a37b3c 100644
--- a/src/Oro/Bundle/EntityBundle/Resources/config/orm.yml
+++ b/src/Oro/Bundle/EntityBundle/Resources/config/orm.yml
@@ -49,3 +49,13 @@ services:
         class: %oro_entity.orm.insert_from_select_query_executor.class%
         arguments:
             - '@oro_entity.orm.native_query_executor_helper'
+
+    oro_entity.query_hint.precise_order_by:
+        public: false
+        abstract: true
+        tags:
+            -
+                name: oro_entity.query_hint
+                hint: oro_entity.precise_order_by
+                alias: HINT_PRECISE_ORDER_BY
+                tree_walker: Oro\Component\DoctrineUtils\ORM\Walker\PreciseOrderByWalker
diff --git a/src/Oro/Bundle/SecurityBundle/ORM/Walker/CurrentUserWalker.php b/src/Oro/Bundle/SecurityBundle/ORM/Walker/CurrentUserWalker.php
index 6ad385c0860..009894fb490 100644
--- a/src/Oro/Bundle/SecurityBundle/ORM/Walker/CurrentUserWalker.php
+++ b/src/Oro/Bundle/SecurityBundle/ORM/Walker/CurrentUserWalker.php
@@ -13,8 +13,6 @@ class CurrentUserWalker extends TreeWalkerAdapter
 {
     const HINT_SECURITY_CONTEXT = 'oro_security.current_user_walker.security_context';
 
-    const EXPECTED_TYPE = 12;
-
     /**
      * {@inheritdoc}
      */
@@ -125,7 +123,7 @@ protected function createSimpleConditionalExpression($expr)
      */
     protected function createEqualByIdComparisonExpression($alias, $field, $id)
     {
-        $pathExpr       = new AST\PathExpression(self::EXPECTED_TYPE, $alias, $field);
+        $pathExpr = new AST\PathExpression(AST\PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $alias, $field);
         $pathExpr->type = AST\PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION;
 
         return new AST\ComparisonExpression(
diff --git a/src/Oro/Component/DoctrineUtils/ORM/QueryHintResolver.php b/src/Oro/Component/DoctrineUtils/ORM/QueryHintResolver.php
index 0436c371a81..5779ec01ab3 100644
--- a/src/Oro/Component/DoctrineUtils/ORM/QueryHintResolver.php
+++ b/src/Oro/Component/DoctrineUtils/ORM/QueryHintResolver.php
@@ -152,7 +152,7 @@ public function addHints(Query $query, array $hints)
      *
      * @return string
      */
-    protected function resolveHintName($name)
+    public function resolveHintName($name)
     {
         if (isset($this->aliases[$name])) {
             return $this->aliases[$name];
diff --git a/src/Oro/Component/DoctrineUtils/ORM/Walker/PreciseOrderByWalker.php b/src/Oro/Component/DoctrineUtils/ORM/Walker/PreciseOrderByWalker.php
new file mode 100644
index 00000000000..971749e15ab
--- /dev/null
+++ b/src/Oro/Component/DoctrineUtils/ORM/Walker/PreciseOrderByWalker.php
@@ -0,0 +1,308 @@
+<?php
+
+namespace Oro\Component\DoctrineUtils\ORM\Walker;
+
+use Doctrine\ORM\Query\AST;
+use Doctrine\ORM\Query\TreeWalkerAdapter;
+
+/**
+ * This walker can be used to modify ORDER BY clause to ensure that records
+ * will be returned in the same order independent from a state of SQL server
+ * and from values of OFFSET and LIMIT clauses.
+ * To achieve this the PK of the root entity is added to the end of ORDER BY clause.
+ * @link https://www.postgresql.org/docs/8.1/static/queries-limit.html
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ */
+class PreciseOrderByWalker extends TreeWalkerAdapter
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function walkSelectStatement(AST\SelectStatement $AST)
+    {
+        $rootEntityClass = null;
+        $rootEntityAlias = null;
+        /** @var AST\IdentificationVariableDeclaration $declaration */
+        foreach ($AST->fromClause->identificationVariableDeclarations as $declaration) {
+            if ($declaration->rangeVariableDeclaration->isRoot) {
+                $rootEntityClass = $declaration->rangeVariableDeclaration->abstractSchemaName;
+                $rootEntityAlias = $declaration->rangeVariableDeclaration->aliasIdentificationVariable;
+                break;
+            }
+        }
+        if ($rootEntityClass && $rootEntityAlias) {
+            $this->updateQuery($AST, $rootEntityClass, $rootEntityAlias);
+        }
+    }
+
+    /**
+     * @param AST\SelectStatement $AST
+     * @param                     $rootEntityClass
+     * @param                     $rootEntityAlias
+     */
+    private function updateQuery(AST\SelectStatement $AST, $rootEntityClass, $rootEntityAlias)
+    {
+        $orderByClause = $AST->orderByClause;
+        if (null === $orderByClause) {
+            $orderByClause = new AST\OrderByClause([]);
+        }
+        /** @var AST\OrderByItem[] $itemsToAdd */
+        $itemsToAdd = [];
+        $fieldNamesToCheck = $this->getIdentifierFieldNames($rootEntityClass);
+        if (null !== $AST->groupByClause && !empty($AST->groupByClause->groupByItems)) {
+            $fieldNamesToCheck = $this->processGroupBy(
+                $AST->groupByClause,
+                $rootEntityAlias,
+                $fieldNamesToCheck,
+                $AST->selectClause
+            );
+        }
+        $direction = $this->getOrderByDirection($orderByClause);
+        foreach ($fieldNamesToCheck as $fieldName) {
+            if (!$this->hasOrderByField($orderByClause, $rootEntityAlias, $fieldName, $AST->selectClause)) {
+                $itemsToAdd[] = $this->createOrderByItem($rootEntityAlias, $fieldName, $direction);
+            }
+        }
+        if (!empty($itemsToAdd)) {
+            foreach ($itemsToAdd as $item) {
+                $orderByClause->orderByItems[] = $item;
+                /** @var AST\PathExpression $expr */
+                $expr = $item->expression;
+                if ($AST->selectClause->isDistinct) {
+                    $this->ensureFieldExistsInSelect(
+                        $AST->selectClause,
+                        $expr->identificationVariable,
+                        $expr->field
+                    );
+                }
+            }
+            if (null === $AST->orderByClause && !empty($orderByClause->orderByItems)) {
+                $AST->orderByClause = $orderByClause;
+            }
+        }
+    }
+
+    /**
+     * @param AST\GroupByClause $groupByClause
+     * @param string            $rootEntityAlias
+     * @param string[]          $fieldNamesToCheck
+     * @param AST\SelectClause  $selectClause
+     *
+     * @return string[]
+     */
+    private function processGroupBy(
+        AST\GroupByClause $groupByClause,
+        $rootEntityAlias,
+        array $fieldNamesToCheck,
+        AST\SelectClause $selectClause
+    ) {
+        $fieldNamesToAdd = [];
+        foreach ($groupByClause->groupByItems as $groupByItem) {
+            foreach ($fieldNamesToCheck as $fieldName) {
+                if ($this->isExpressionByField($groupByItem, $rootEntityAlias, $fieldName, $selectClause)) {
+                    $fieldNamesToAdd[] = $fieldName;
+                }
+            }
+        }
+
+        return $fieldNamesToAdd;
+    }
+
+    /**
+     * @param AST\SelectClause $selectClause
+     * @param string           $entityAlias
+     * @param string           $fieldName
+     */
+    private function ensureFieldExistsInSelect(AST\SelectClause $selectClause, $entityAlias, $fieldName)
+    {
+        if (!$this->hasSelectField($selectClause, $entityAlias, $fieldName)) {
+            $selectClause->selectExpressions[] = $this->createHiddenSelectExpression(
+                $entityAlias,
+                $fieldName
+            );
+        }
+    }
+
+    /**
+     * @param string $entityClass
+     *
+     * @return string[]
+     */
+    private function getIdentifierFieldNames($entityClass)
+    {
+        return $this->_getQuery()
+            ->getEntityManager()
+            ->getClassMetadata($entityClass)
+            ->getIdentifierFieldNames();
+    }
+
+    /**
+     * @param mixed            $expr
+     * @param string           $entityAlias
+     * @param string           $fieldName
+     * @param AST\SelectClause $selectClause
+     *
+     * @return bool
+     */
+    private function isExpressionByField($expr, $entityAlias, $fieldName, AST\SelectClause $selectClause)
+    {
+        if ($expr instanceof AST\PathExpression) {
+            return $this->isPathExpressionByField($expr, $entityAlias, $fieldName);
+        } elseif (is_string($expr)) {
+            /** @var AST\SelectExpression $selectExpr */
+            foreach ($selectClause->selectExpressions as $selectExpr) {
+                if ($expr === $selectExpr->fieldIdentificationVariable) {
+                    return $selectExpr->expression instanceof AST\PathExpression
+                        ? $this->isPathExpressionByField($selectExpr->expression, $entityAlias, $fieldName)
+                        : false;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param AST\PathExpression $expr
+     * @param string             $entityAlias
+     * @param string             $fieldName
+     *
+     * @return bool
+     */
+    private function isPathExpressionByField(AST\PathExpression $expr, $entityAlias, $fieldName)
+    {
+        return
+            AST\PathExpression::TYPE_STATE_FIELD === $expr->type
+            && $entityAlias === $expr->identificationVariable
+            && $fieldName === $expr->field;
+    }
+
+    /**
+     * @param AST\SelectClause $selectClause
+     * @param string           $entityAlias
+     * @param string           $fieldName
+     *
+     * @return bool
+     */
+    private function hasSelectField(
+        AST\SelectClause $selectClause,
+        $entityAlias,
+        $fieldName
+    ) {
+        $result = false;
+        /** @var AST\SelectExpression $selectExpr */
+        foreach ($selectClause->selectExpressions as $selectExpr) {
+            if ($selectExpr->expression instanceof AST\PathExpression) {
+                if ($this->isPathExpressionByField($selectExpr->expression, $entityAlias, $fieldName)) {
+                    $result = true;
+                    break;
+                }
+            } elseif (null === $selectExpr->fieldIdentificationVariable) {
+                if ($selectExpr->expression instanceof AST\PartialObjectExpression) {
+                    if ($entityAlias === $selectExpr->expression->identificationVariable
+                        && in_array($fieldName, $selectExpr->expression->partialFieldSet, true)
+                    ) {
+                        $result = true;
+                        break;
+                    }
+                } elseif (is_string($selectExpr->expression) && $entityAlias = $selectExpr->expression) {
+                    $result = true;
+                    break;
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param AST\OrderByClause $orderByClause
+     * @param string            $entityAlias
+     * @param string            $fieldName
+     * @param AST\SelectClause  $selectClause
+     *
+     * @return bool
+     */
+    private function hasOrderByField(
+        AST\OrderByClause $orderByClause,
+        $entityAlias,
+        $fieldName,
+        AST\SelectClause $selectClause
+    ) {
+        $result = false;
+        /** @var AST\OrderByItem $orderByItem */
+        foreach ($orderByClause->orderByItems as $orderByItem) {
+            if ($this->isExpressionByField($orderByItem->expression, $entityAlias, $fieldName, $selectClause)) {
+                $result = true;
+                break;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param AST\OrderByClause $orderByClause
+     *
+     * @return string
+     */
+    private function getOrderByDirection(AST\OrderByClause $orderByClause)
+    {
+        $direction = 'ASC';
+        if (!empty($orderByClause->orderByItems)) {
+            /** @var AST\OrderByItem $lastOrderByItem */
+            $lastOrderByItem = end($orderByClause->orderByItems);
+            if ($lastOrderByItem->isDesc()) {
+                $direction = 'DESC';
+            }
+        }
+
+        return $direction;
+    }
+
+    /**
+     * @param string $entityAlias
+     * @param string $fieldName
+     *
+     * @return AST\SelectExpression
+     */
+    private function createHiddenSelectExpression($entityAlias, $fieldName)
+    {
+        return new AST\SelectExpression(
+            $this->createFieldPathExpression($entityAlias, $fieldName),
+            null,
+            true
+        );
+    }
+
+    /**
+     * @param string $entityAlias
+     * @param string $fieldName
+     * @param string $direction
+     *
+     * @return AST\OrderByItem
+     */
+    private function createOrderByItem($entityAlias, $fieldName, $direction = 'ASC')
+    {
+        $orderByItem = new AST\OrderByItem(
+            $this->createFieldPathExpression($entityAlias, $fieldName)
+        );
+        $orderByItem->type = $direction;
+
+        return $orderByItem;
+    }
+
+    /**
+     * @param string $entityAlias
+     * @param string $fieldName
+     *
+     * @return AST\PathExpression
+     */
+    private function createFieldPathExpression($entityAlias, $fieldName)
+    {
+        $expr = new AST\PathExpression(AST\PathExpression::TYPE_STATE_FIELD, $entityAlias, $fieldName);
+        $expr->type = AST\PathExpression::TYPE_STATE_FIELD;
+
+        return $expr;
+    }
+}
diff --git a/src/Oro/Component/DoctrineUtils/README.md b/src/Oro/Component/DoctrineUtils/README.md
index 1084b6a2478..c656b6bce95 100644
--- a/src/Oro/Component/DoctrineUtils/README.md
+++ b/src/Oro/Component/DoctrineUtils/README.md
@@ -15,3 +15,14 @@ The [QueryHintResolver](./ORM/QueryHintResolver.php) can be used to make [Doctri
 - **resolveHints** - Resolves query hints.
 - **addHint** - Adds a hint to a query object.
 - **addHints** - Adds hints to a query object.
+
+PreciseOrderByWalker class
+--------------------------
+**Description:**
+The [PreciseOrderByWalker](./ORM/Walker/PreciseOrderByWalker.php) is an [Doctrine tree walker](http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/cookbook/dql-custom-walkers.html) that is used to modify ORDER BY clause of a query to make sure that records will be returned in the same order independent from a state of SQL server and from values of OFFSET and LIMIT clauses. This is achieved by adding the primary key column of the first root entity to the end of ORDER BY clause.
+
+Example of usage:
+
+```php
+$query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [PreciseOrderByWalker::class]);
+```
diff --git a/src/Oro/Component/DoctrineUtils/Tests/Unit/Fixtures/Entity/Person.php b/src/Oro/Component/DoctrineUtils/Tests/Unit/Fixtures/Entity/Person.php
index e702c74ad81..7aee6e3975e 100644
--- a/src/Oro/Component/DoctrineUtils/Tests/Unit/Fixtures/Entity/Person.php
+++ b/src/Oro/Component/DoctrineUtils/Tests/Unit/Fixtures/Entity/Person.php
@@ -17,6 +17,13 @@ class Person
      */
     protected $id;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(type="string")
+     */
+    protected $name;
+
     /**
      * @var Item
      *
diff --git a/src/Oro/Component/DoctrineUtils/Tests/Unit/ORM/PreciseOrderByWalkerTest.php b/src/Oro/Component/DoctrineUtils/Tests/Unit/ORM/PreciseOrderByWalkerTest.php
new file mode 100644
index 00000000000..a59d5b4e15f
--- /dev/null
+++ b/src/Oro/Component/DoctrineUtils/Tests/Unit/ORM/PreciseOrderByWalkerTest.php
@@ -0,0 +1,225 @@
+<?php
+
+namespace Oro\Component\DoctrineUtils\Tests\Unit\ORM;
+
+use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
+use Doctrine\ORM\Query;
+
+use Oro\Component\DoctrineUtils\ORM\Walker\PreciseOrderByWalker;
+use Oro\Component\TestUtils\ORM\Mocks\EntityManagerMock;
+use Oro\Component\TestUtils\ORM\OrmTestCase;
+
+class PreciseOrderByWalkerTest extends OrmTestCase
+{
+    /** @var EntityManagerMock */
+    protected $em;
+
+    protected function setUp()
+    {
+        $reader = new AnnotationReader();
+        $metadataDriver = new AnnotationDriver(
+            $reader,
+            'Oro\Component\DoctrineUtils\Tests\Unit\Fixtures\Entity'
+        );
+
+        $this->em = $this->getTestEntityManager();
+        $this->em->getConfiguration()->setMetadataDriverImpl($metadataDriver);
+        $this->em->getConfiguration()->setEntityNamespaces(
+            [
+                'Test' => 'Oro\Component\DoctrineUtils\Tests\Unit\Fixtures\Entity'
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider queryModificationProvider
+     */
+    public function testQueryModification($dql, $expectedSql)
+    {
+        $query = $this->em->createQuery($dql);
+        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [PreciseOrderByWalker::class]);
+
+        $this->assertEquals($expectedSql, $query->getSQL());
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function queryModificationProvider()
+    {
+        return [
+            'no ORDER BY'                                                 => [
+                'SELECT p.id as pId FROM Test:Person p',
+                'SELECT p0_.id AS id_0 FROM Person p0_ ORDER BY p0_.id ASC',
+            ],
+            'ORDER BY by PK'                                              => [
+                'SELECT p.id as pId FROM Test:Person p ORDER BY p.id',
+                'SELECT p0_.id AS id_0 FROM Person p0_ ORDER BY p0_.id ASC',
+            ],
+            'ORDER BY by PK (DESC)'                                       => [
+                'SELECT p.id as pId FROM Test:Person p ORDER BY p.id DESC',
+                'SELECT p0_.id AS id_0 FROM Person p0_ ORDER BY p0_.id DESC',
+            ],
+            'ORDER BY by PK (several fields)'                             => [
+                'SELECT p.id as pId FROM Test:Person p ORDER BY p.id, p.name',
+                'SELECT p0_.id AS id_0 FROM Person p0_ ORDER BY p0_.id ASC, p0_.name ASC',
+            ],
+            'ORDER BY by not PK'                                          => [
+                'SELECT p.id as pId FROM Test:Person p ORDER BY p.name',
+                'SELECT p0_.id AS id_0 FROM Person p0_ ORDER BY p0_.name ASC, p0_.id ASC',
+            ],
+            'ORDER BY by PK alias'                                        => [
+                'SELECT p.id as pId FROM Test:Person p ORDER BY pId',
+                'SELECT p0_.id AS id_0 FROM Person p0_ ORDER BY id_0 ASC',
+            ],
+            'ORDER BY by not PK alias'                                    => [
+                'SELECT p.id as pId, p.name as pName FROM Test:Person p ORDER BY pName',
+                'SELECT p0_.id AS id_0, p0_.name AS name_1 FROM Person p0_ ORDER BY name_1 ASC, p0_.id ASC',
+            ],
+            'ORDER BY by association PK'                                  => [
+                'SELECT p.name as pName FROM Test:Person p INNER JOIN p.bestItem bi ORDER BY bi.id',
+                'SELECT p0_.name AS name_0 FROM Person p0_ INNER JOIN Item i1_ ON p0_.bestItem_id = i1_.id'
+                . ' ORDER BY i1_.id ASC, p0_.id ASC',
+            ],
+            'ORDER BY by unidirectional association PK'                   => [
+                'SELECT p.name as pName FROM Test:Person p INNER JOIN Test:Item bi WITH bi = p.bestItem'
+                . ' ORDER BY bi.id',
+                'SELECT p0_.name AS name_0 FROM Person p0_ INNER JOIN Item i1_ ON (i1_.id = p0_.bestItem_id)'
+                . ' ORDER BY i1_.id ASC, p0_.id ASC',
+            ],
+            'GROUP BY by PK'                                              => [
+                'SELECT p.id as pId, COUNT(p.name) FROM Test:Person p GROUP BY p.id',
+                'SELECT p0_.id AS id_0, COUNT(p0_.name) AS sclr_1 FROM Person p0_ GROUP BY p0_.id'
+                . ' ORDER BY p0_.id ASC',
+            ],
+            'GROUP BY by not PK'                                          => [
+                'SELECT p.name as pName, COUNT(p.id) FROM Test:Person p GROUP BY p.name',
+                'SELECT p0_.name AS name_0, COUNT(p0_.id) AS sclr_1 FROM Person p0_ GROUP BY p0_.name',
+            ],
+            'GROUP BY by PK alias'                                        => [
+                'SELECT p.id as pId, COUNT(p.name) FROM Test:Person p GROUP BY pId',
+                'SELECT p0_.id AS id_0, COUNT(p0_.name) AS sclr_1 FROM Person p0_ GROUP BY p0_.id'
+                . ' ORDER BY p0_.id ASC',
+            ],
+            'GROUP BY by not PK alias'                                    => [
+                'SELECT p.name as pName, COUNT(p.id) FROM Test:Person p GROUP BY pName',
+                'SELECT p0_.name AS name_0, COUNT(p0_.id) AS sclr_1 FROM Person p0_ GROUP BY p0_.name',
+            ],
+            'GROUP BY by association PK'                                  => [
+                'SELECT p.id as pId, COUNT(p.id) FROM Test:Person p INNER JOIN p.bestItem bi GROUP BY bi.id',
+                'SELECT p0_.id AS id_0, COUNT(p0_.id) AS sclr_1 FROM Person p0_'
+                . ' INNER JOIN Item i1_ ON p0_.bestItem_id = i1_.id'
+                . ' GROUP BY i1_.id',
+            ],
+            'GROUP BY by unidirectional association PK'                   => [
+                'SELECT p.id as pId, COUNT(p.id) FROM Test:Person p INNER JOIN Test:Item bi WITH bi = p.bestItem'
+                . ' GROUP BY bi.id',
+                'SELECT p0_.id AS id_0, COUNT(p0_.id) AS sclr_1 FROM Person p0_'
+                . ' INNER JOIN Item i1_ ON (i1_.id = p0_.bestItem_id)'
+                . ' GROUP BY i1_.id',
+            ],
+            'DISTINCT, no ORDER BY, PK in SELECT'                         => [
+                'SELECT DISTINCT p.id as pId FROM Test:Person p',
+                'SELECT DISTINCT p0_.id AS id_0 FROM Person p0_ ORDER BY p0_.id ASC',
+            ],
+            'DISTINCT, no ORDER BY, no PK in SELECT'                      => [
+                'SELECT DISTINCT p.name as pName FROM Test:Person p',
+                'SELECT DISTINCT p0_.name AS name_0, p0_.id AS id_1 FROM Person p0_ ORDER BY p0_.id ASC',
+            ],
+            'DISTINCT, ORDER BY by PK, PK in SELECT'                      => [
+                'SELECT DISTINCT p.id as pId FROM Test:Person p ORDER BY p.id',
+                'SELECT DISTINCT p0_.id AS id_0 FROM Person p0_ ORDER BY p0_.id ASC',
+            ],
+            'DISTINCT, ORDER BY by PK, no PK in SELECT'                   => [
+                'SELECT DISTINCT p.name as pName FROM Test:Person p ORDER BY p.id',
+                'SELECT DISTINCT p0_.name AS name_0 FROM Person p0_ ORDER BY p0_.id ASC',
+            ],
+            'DISTINCT, ORDER BY by not PK, PK in SELECT'                  => [
+                'SELECT DISTINCT p.id as pId FROM Test:Person p ORDER BY p.name',
+                'SELECT DISTINCT p0_.id AS id_0 FROM Person p0_ ORDER BY p0_.name ASC, p0_.id ASC',
+            ],
+            'DISTINCT, ORDER BY by not PK, no PK in SELECT'               => [
+                'SELECT DISTINCT p.name as pName FROM Test:Person p ORDER BY p.name',
+                'SELECT DISTINCT p0_.name AS name_0, p0_.id AS id_1 FROM Person p0_'
+                . ' ORDER BY p0_.name ASC, p0_.id ASC',
+            ],
+            'whole entity in SELECT, no ORDER BY'                         => [
+                'SELECT p FROM Test:Person p',
+                'SELECT p0_.id AS id_0, p0_.name AS name_1, p0_.bestItem_id AS bestItem_id_2'
+                . ' FROM Person p0_ ORDER BY p0_.id ASC',
+            ],
+            'whole entity in SELECT, join, no ORDER BY'                   => [
+                'SELECT bi, p FROM Test:Person p INNER JOIN p.bestItem bi',
+                'SELECT p0_.id AS id_0, p0_.name AS name_1, i1_.id AS id_2,'
+                . ' p0_.bestItem_id AS bestItem_id_3, i1_.owner_id AS owner_id_4'
+                . ' FROM Person p0_ INNER JOIN Item i1_ ON p0_.bestItem_id = i1_.id'
+                . ' ORDER BY p0_.id ASC',
+            ],
+            'whole entity in SELECT, ORDER BY by PK'                      => [
+                'SELECT p FROM Test:Person p ORDER BY p.id',
+                'SELECT p0_.id AS id_0, p0_.name AS name_1, p0_.bestItem_id AS bestItem_id_2'
+                . ' FROM Person p0_ ORDER BY p0_.id ASC',
+            ],
+            'whole entity in SELECT, join, ORDER BY by PK'                => [
+                'SELECT bi, p FROM Test:Person p INNER JOIN p.bestItem bi ORDER BY p.id',
+                'SELECT p0_.id AS id_0, p0_.name AS name_1, i1_.id AS id_2,'
+                . ' p0_.bestItem_id AS bestItem_id_3, i1_.owner_id AS owner_id_4'
+                . ' FROM Person p0_ INNER JOIN Item i1_ ON p0_.bestItem_id = i1_.id'
+                . ' ORDER BY p0_.id ASC',
+            ],
+            'whole entity in SELECT, join, ORDER BY by join PK'           => [
+                'SELECT bi, p FROM Test:Person p INNER JOIN p.bestItem bi ORDER BY bi.id',
+                'SELECT p0_.id AS id_0, p0_.name AS name_1, i1_.id AS id_2,'
+                . ' p0_.bestItem_id AS bestItem_id_3, i1_.owner_id AS owner_id_4'
+                . ' FROM Person p0_ INNER JOIN Item i1_ ON p0_.bestItem_id = i1_.id'
+                . ' ORDER BY i1_.id ASC, p0_.id ASC',
+            ],
+            'whole entity in SELECT, DISTINCT, no ORDER BY'               => [
+                'SELECT DISTINCT p FROM Test:Person p',
+                'SELECT DISTINCT p0_.id AS id_0, p0_.name AS name_1, p0_.bestItem_id AS bestItem_id_2'
+                . ' FROM Person p0_ ORDER BY p0_.id ASC',
+            ],
+            'whole entity in SELECT, DISTINCT, join, no ORDER BY'         => [
+                'SELECT DISTINCT bi, p FROM Test:Person p INNER JOIN p.bestItem bi',
+                'SELECT DISTINCT p0_.id AS id_0, p0_.name AS name_1, i1_.id AS id_2,'
+                . ' p0_.bestItem_id AS bestItem_id_3, i1_.owner_id AS owner_id_4'
+                . ' FROM Person p0_ INNER JOIN Item i1_ ON p0_.bestItem_id = i1_.id'
+                . ' ORDER BY p0_.id ASC',
+            ],
+            'whole entity in SELECT, DISTINCT, ORDER BY by PK'            => [
+                'SELECT DISTINCT p FROM Test:Person p ORDER BY p.id',
+                'SELECT DISTINCT p0_.id AS id_0, p0_.name AS name_1, p0_.bestItem_id AS bestItem_id_2'
+                . ' FROM Person p0_ ORDER BY p0_.id ASC',
+            ],
+            'whole entity in SELECT, DISTINCT, join, ORDER BY by PK'      => [
+                'SELECT DISTINCT bi, p FROM Test:Person p INNER JOIN p.bestItem bi ORDER BY p.id',
+                'SELECT DISTINCT p0_.id AS id_0, p0_.name AS name_1, i1_.id AS id_2,'
+                . ' p0_.bestItem_id AS bestItem_id_3, i1_.owner_id AS owner_id_4'
+                . ' FROM Person p0_ INNER JOIN Item i1_ ON p0_.bestItem_id = i1_.id'
+                . ' ORDER BY p0_.id ASC',
+            ],
+            'whole entity in SELECT, DISTINCT, join, ORDER BY by join PK' => [
+                'SELECT DISTINCT bi, p FROM Test:Person p INNER JOIN p.bestItem bi ORDER BY bi.id',
+                'SELECT DISTINCT p0_.id AS id_0, p0_.name AS name_1, i1_.id AS id_2,'
+                . ' p0_.bestItem_id AS bestItem_id_3, i1_.owner_id AS owner_id_4'
+                . ' FROM Person p0_ INNER JOIN Item i1_ ON p0_.bestItem_id = i1_.id'
+                . ' ORDER BY i1_.id ASC, p0_.id ASC',
+            ],
+            'partial SELECT, no ORDER BY'                                 => [
+                'SELECT partial p.{id} FROM Test:Person p',
+                'SELECT p0_.id AS id_0, p0_.bestItem_id AS bestItem_id_1 FROM Person p0_ ORDER BY p0_.id ASC',
+            ],
+            'partial SELECT, ORDER BY by PK'                              => [
+                'SELECT partial p.{id} FROM Test:Person p ORDER BY p.id',
+                'SELECT p0_.id AS id_0, p0_.bestItem_id AS bestItem_id_1 FROM Person p0_ ORDER BY p0_.id ASC',
+            ],
+            'partial SELECT, DISTINCT, no ORDER BY'                       => [
+                'SELECT DISTINCT partial p.{id} FROM Test:Person p',
+                'SELECT DISTINCT p0_.id AS id_0, p0_.bestItem_id AS bestItem_id_1'
+                . ' FROM Person p0_ ORDER BY p0_.id ASC',
+            ],
+        ];
+    }
+}
diff --git a/src/Oro/Component/DoctrineUtils/Tests/Unit/ORM/QueryHintResolverTest.php b/src/Oro/Component/DoctrineUtils/Tests/Unit/ORM/QueryHintResolverTest.php
index ec52996940c..c0a0da1bc6d 100644
--- a/src/Oro/Component/DoctrineUtils/Tests/Unit/ORM/QueryHintResolverTest.php
+++ b/src/Oro/Component/DoctrineUtils/Tests/Unit/ORM/QueryHintResolverTest.php
@@ -212,6 +212,40 @@ public function testResolveHints()
         );
     }
 
+    public function testResolveCustomHintName()
+    {
+        $this->queryHintResolver->addTreeWalker('test', 'Test\Walker', null, 'HINT_TEST');
+
+        $this->assertEquals(
+            'test',
+            $this->queryHintResolver->resolveHintName('HINT_TEST')
+        );
+        $this->assertEquals(
+            'test',
+            $this->queryHintResolver->resolveHintName('test')
+        );
+    }
+
+    public function testResolveDoctrineHintName()
+    {
+        $this->assertEquals(
+            Query::HINT_CUSTOM_OUTPUT_WALKER,
+            $this->queryHintResolver->resolveHintName('HINT_CUSTOM_OUTPUT_WALKER')
+        );
+        $this->assertEquals(
+            Query::HINT_CUSTOM_OUTPUT_WALKER,
+            $this->queryHintResolver->resolveHintName(Query::HINT_CUSTOM_OUTPUT_WALKER)
+        );
+    }
+
+    public function testResolveUndefinedHintName()
+    {
+        $this->assertEquals(
+            'HINT_UNDEFINED',
+            $this->queryHintResolver->resolveHintName('HINT_UNDEFINED')
+        );
+    }
+
     /**
      * @return Query
      */