diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 18b73ee9d79ca1d272ecba210f69d47f240fa849..fb8eeb2f9e72f36665157e13fda72fa680979808 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -37,6 +37,7 @@
       <name>CURRENCY</name>
       <title>Currency</title>
       <consumer>KeywordCurrencies</consumer>
+      <groupable v="true" />
       <mandatory v="true" />
       <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/valueProcess.js</valueProcess>
@@ -73,6 +74,7 @@
       <title>Probability</title>
       <consumer>KeywordProbabilities</consumer>
       <contentType>NUMBER</contentType>
+      <groupable v="true" />
       <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/displayValueProcess.js</displayValueProcess>
@@ -81,6 +83,7 @@
       <name>STATUS</name>
       <title>Status</title>
       <consumer>KeywordOfferStates</consumer>
+      <groupable v="true" />
       <mandatory v="true" />
       <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/status/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/valueProcess.js</valueProcess>
@@ -155,6 +158,7 @@
       <name>NET</name>
       <title>Total net</title>
       <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
       <inputFormat>#,##0.00</inputFormat>
       <state>READONLY</state>
       <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/net/displayValueProcess.js</displayValueProcess>
@@ -1008,6 +1012,10 @@
         <fieldName>#PROVIDER</fieldName>
       </dependency>
     </entityConsumer>
+    <entityAggregateField>
+      <name>NET_aggregate</name>
+      <parentField>NET</parentField>
+    </entityAggregateField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -1241,6 +1249,11 @@
           <name>ISOLANGUAGE.displayValue</name>
           <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/isolanguage.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
+        <aggregateFieldDbMapping>
+          <name>NET_aggregate.value</name>
+          <recordfield>OFFER.NET</recordfield>
+          <aggregateType>SUM</aggregateType>
+        </aggregateFieldDbMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>
diff --git a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/price_aggregate.value/expression.js b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/price_aggregate.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..6a3e3167e6a5d3a3ec8b30eefd928c665c58dc4a
--- /dev/null
+++ b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/price_aggregate.value/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("OFFERITEM.PRICE * OFFERITEM.QUANTITY * ((100 - OFFERITEM.DISCOUNT) / 100)");
\ No newline at end of file
diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod
index c1a048989f55375d660ca83cf9d853b3d64e79b0..28fb45b5ae0dc0f8a90f1205e21d0d28f7c25652 100644
--- a/neonView/OfferFilter_view/OfferFilter_view.aod
+++ b/neonView/OfferFilter_view/OfferFilter_view.aod
@@ -44,9 +44,9 @@
     </neonDashletConfiguration>
   </dashletConfigurations>
   <layout>
-    <boxLayout>
+    <groupLayout>
       <name>layout</name>
-    </boxLayout>
+    </groupLayout>
   </layout>
   <children>
     <tableViewTemplate>
@@ -94,5 +94,47 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
+    <treeTableViewTemplate>
+      <name>TreeTable</name>
+      <entityField>#ENTITY</entityField>
+      <linkedColumns>
+        <element>FullOfferCode</element>
+      </linkedColumns>
+      <columns>
+        <neonTreeTableColumn>
+          <name>d5482be9-bc51-4b23-b33d-3e50819d5a64</name>
+          <entityField>IMAGE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>8efb48cb-ebbf-43c7-b227-592db20fd738</name>
+          <entityField>FullOfferCode</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>d60e10fd-6e77-45e7-98d8-8a4abf457a89</name>
+          <entityField>CONTACT_ORG_ID</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>083a59f6-3db9-41ea-8bba-3077239fd84a</name>
+          <entityField>CONTACT_PERSON_ID</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>cfae46a9-1fce-4c63-b92f-4253b47fd5b3</name>
+          <entityField>STATUS</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>bc5c1349-aabe-4d99-a614-06315895aa6a</name>
+          <entityField>OFFERDATE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>9f552c79-b5e1-405b-aafa-c2504ca84c34</name>
+          <entityField>NET</entityField>
+          <aggregateEntityField>NET_aggregate</aggregateEntityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>53adfe2e-1eb3-4b0e-9ffd-61d040cbba5c</name>
+          <entityField>PROBABILITY</entityField>
+        </neonTreeTableColumn>
+      </columns>
+    </treeTableViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index 72e0b0fb1525cdea0428598d31a5e0a90bd01d2e..83392a97061b4c5719cbade740c5d64d5cd1f09a 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -24,6 +24,10 @@
       <drawerCaption>Details</drawerCaption>
       <entityField>#ENTITY</entityField>
       <fields>
+        <entityFieldLink>
+          <name>44e6dc8e-4f90-454b-9be5-f96c66ce36ec</name>
+          <entityField>CURRENCY</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>8d780ff6-9ca0-4067-b2b1-6e092c62253e</name>
           <entityField>STATUS</entityField>