Merge branch 'cherry-pick-be9b8ab5' into '2021.1.0'

Merge branch 'sales_pn_1081145_order_mainview_tabs' into '2021.1'

See merge request xrm/basic!998

neonView/ProductMain_view/ProductMain_view.aod

@@ -15,14 +15,14 @@
       <view>ProductPreview_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>41887933-bb9a-48ce-818d-1db815021a36</name>
-      <entityField>Activities</entityField>
-      <view>ActivityFilter_view</view>
+      <name>11c4c5a0-27fa-4748-a6c6-3a667d2f3d8f</name>
+      <entityField>Productprices</entityField>
+      <view>ProductpriceForProductFilter_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>754b4efe-3ea7-42de-8e35-c85c3a0b4abf</name>
-      <entityField>Tasks</entityField>
-      <view>TaskFilter_view</view>
+      <name>7f416115-ff89-45ca-be10-ed568cac266c</name>
+      <entityField>ProductLinks</entityField>
+      <view>Prod2prodFilter_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>7a475d46-0ce9-4fd3-ab5b-c5c625a4a3fa</name>
@@ -30,25 +30,25 @@
       <view>ProductDescritption_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>7f416115-ff89-45ca-be10-ed568cac266c</name>
-      <entityField>ProductLinks</entityField>
-      <view>Prod2prodFilter_view</view>
+      <name>6ee1258f-b571-45c1-b833-f292361b5a04</name>
+      <entityField>AttributeTree</entityField>
+      <view>AttributeRelationTree_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>11c4c5a0-27fa-4748-a6c6-3a667d2f3d8f</name>
-      <entityField>Productprices</entityField>
-      <view>ProductpriceForProductFilter_view</view>
+      <name>41887933-bb9a-48ce-818d-1db815021a36</name>
+      <entityField>Activities</entityField>
+      <view>ActivityFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>754b4efe-3ea7-42de-8e35-c85c3a0b4abf</name>
+      <entityField>Tasks</entityField>
+      <view>TaskFilter_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>616f7cc3-93e7-41ee-8d38-027dd3d4b299</name>
       <entityField>Documents</entityField>
       <view>DocumentFilter_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>6ee1258f-b571-45c1-b833-f292361b5a04</name>
-      <entityField>AttributeTree</entityField>
-      <view>AttributeRelationTree_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>0faf6a9e-b1f3-452d-b7fd-d0c9e3fc25f8</name>
       <entityField>LogHistories</entityField>

neonView/SalesprojectMain_view/SalesprojectMain_view.aod

@@ -9,6 +9,11 @@
     </masterSlaveLayout>
   </layout>
   <children>
+    <neonViewReference>
+      <name>eaee3a77-a3d8-4f0c-969a-da232b0c9537</name>
+      <entityField>#ENTITY</entityField>
+      <view>SalesprojectPreview_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>673a34c7-5781-4c72-b0c8-944f1e5de9c6</name>
       <entityField>#ENTITY</entityField>
@@ -19,16 +24,6 @@
         <element>DESKTOP</element>
       </devices>
     </neonViewReference>
-    <neonViewReference>
-      <name>d4daa13e-bf57-45e4-af43-d58c04f113f5</name>
-      <entityField>#ENTITY</entityField>
-      <view>SalesprojectActivity_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>107b20e3-6326-498a-968b-ac09257981fc</name>
-      <entityField>AttributeTree</entityField>
-      <view>AttributeRelationTree_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>d0c1344f-c143-43b4-9c44-f823fb525eff</name>
       <entityField>Classifications</entityField>
@@ -49,6 +44,16 @@
       <entityField>#ENTITY</entityField>
       <view>SalesprojectFurtherInfo_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>107b20e3-6326-498a-968b-ac09257981fc</name>
+      <entityField>AttributeTree</entityField>
+      <view>AttributeRelationTree_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>d4daa13e-bf57-45e4-af43-d58c04f113f5</name>
+      <entityField>#ENTITY</entityField>
+      <view>SalesprojectActivity_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>a5043042-e889-4a9e-9e69-bf727e35bddf</name>
       <entityField>Tasks</entityField>
@@ -64,10 +69,5 @@
       <entityField>LogHistories</entityField>
       <view>LogHistoryFilter_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>eaee3a77-a3d8-4f0c-969a-da232b0c9537</name>
-      <entityField>#ENTITY</entityField>
-      <view>SalesprojectPreview_view</view>
-    </neonViewReference>
   </children>
 </neonView>