From 3d65ee18d645a30e600c9b63f0daefe2fc2b1151 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期三, 13 十一月 2024 15:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245.def                                                   |    2 
 _Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl                                                            |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319.def                                        |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhCheckPowers_OnDataChanged.def                         |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations#529.def                                       |    5 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers#568.def                                            |    3 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_OnClick.def                                         |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage519.def                                 |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu687.def                                   |    4 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623.def                                                     |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963.def                                      |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687.def                                        |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def          |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhPowers_OnCreated.def                                               |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListPowers_OnClick.def                                                      |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pDemandComparison#822.def                                     |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter.def                                   |    7 
 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlanMDSIDsByName.def                                  |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhGenerations_OnCreated.def                                     |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhMQBMLB_OnCreated.def                                              |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMQBMLB#393.def                                               |    4 
 _Main/Sys/ImgAttr/LocalValue.dme                                                                                                   |   27 ++
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers_OnClick.def                                    |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_OnClick.def                                         |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhFinelProducts_OnCreated.def            |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage245.def                                 |    4 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def                                     |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListGenerations_OnClick.def                                                 |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pProductAttributeFilter#791.def                               |    1 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListMQBMLB_OnClick.def                                                      |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_dhCheckPowers_OnDataChanged.def                    |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhCheckGenerations_OnDataChanged.def                            |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB#925.def                                            |    3 
 _Main/BL/Type_FinancialSalesReport/Method_GenerateColumn.qbl                                                                       |    2 
 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_AsyncCreateFullTable.qbl                                                      |    5 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonClearFilter_OnClick.def                  |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedProducts_OnDataChanged.def      |    8 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedSalesSegments_OnDataChanged.def |   21 +
 _Main/UI/MacroPlannerWebApp/_ROOT_Project_MacroPlannerWebApp.qp                                                                    |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower.def                                                                 |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def               |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def                        |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519.def                                      |    2 
 _Main/BL/Type_FinancialProductionReport/Method_GenerateColumn.qbl                                                                  |    2 
 _Main/BL/Type_Test/StaticMethod_TestMacroPlan.qbl                                                                                  |   16 +
 _Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_Create.qbl                                                                     |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhPowers_OnCreated.def                                  |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers.def                                           |   42 +++
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_OnClick.def                                    |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def                                 |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623.def                                        |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def                   |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage963.def                                 |    4 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter.def                                                |    7 
 _Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_AsyncCreateFullTable.qbl                                                       |    5 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers.def                                                |    9 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter.def                              |   18 +
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_OnClick.def                                    |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB.def                                                                |   12 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhCheckPowers_OnDataChanged.def                                      |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB.def                                                   |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB.def                                                |    9 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations.def                                                        |    9 
 _Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl                                                                   |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower.def                                               |   24 +
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_dhPowers_OnCreated.def                             |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration.def                                                            |   14 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhGenerations_OnCreated.def                        |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration.def                                          |   24 +
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687.def                                                     |    2 
 _Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl                                                                 |   21 +
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower.def                                                    |   12 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB.def                                                             |    9 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519.def                                                   |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_bExport_OnClick.def                             |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245.def                                      |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonFilter485_OnClick.def                    |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration#812.def                                           |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations.def                                      |   42 +++
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu319.def                                   |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB.def                                              |   24 +
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB.def                                           |   42 +++
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration.def                                               |   14 
 /dev/null                                                                                                                          |   18 -
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu623.def                                   |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations.def                                           |    9 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pPower#480.def                                                |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_dhGenerations_OnCreated.def                   |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def                            |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers.def                                                             |    9 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963.def                                                   |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft#545.def                                        |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319.def                                                     |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations_OnClick.def                               |    6 
 94 files changed, 470 insertions(+), 239 deletions(-)

diff --git a/_Main/BL/Type_FinancialProductionReport/Method_GenerateColumn.qbl b/_Main/BL/Type_FinancialProductionReport/Method_GenerateColumn.qbl
index f7f8483..85b473e 100644
--- a/_Main/BL/Type_FinancialProductionReport/Method_GenerateColumn.qbl
+++ b/_Main/BL/Type_FinancialProductionReport/Method_GenerateColumn.qbl
@@ -11,7 +11,7 @@
     startofyear               := startofplanning.StartOfYear();
     startofnextyear           := startofplanning.StartOfNextYear();
     
-    for( start := startofyear; start < startofnextyear; start := start.StartOfMonth() ){
+    for( start := startofyear; start < startofnextyear; start := start.StartOfNextMonth() ){
       periodtime := start.Date();
       periodname := periodtime.Format( "M2/D2/Y" );
       this.FinancialProductionColumn( relnew, Name := periodname, Period := periodtime );
diff --git a/_Main/BL/Type_FinancialSalesReport/Method_GenerateColumn.qbl b/_Main/BL/Type_FinancialSalesReport/Method_GenerateColumn.qbl
index 592acd8..8aed8c8 100644
--- a/_Main/BL/Type_FinancialSalesReport/Method_GenerateColumn.qbl
+++ b/_Main/BL/Type_FinancialSalesReport/Method_GenerateColumn.qbl
@@ -11,7 +11,7 @@
     startofyear               := startofplanning.StartOfYear();
     startofnextyear           := startofplanning.StartOfNextYear();
     
-    for( start := startofyear; start < startofnextyear; start := start.StartOfMonth() ){
+    for( start := startofyear; start < startofnextyear; start := start.StartOfNextMonth() ){
       periodtime := start.Date();
       periodname := periodtime.Format( "M2/D2/Y" );
       this.FinancialSalesColumn( relnew, Name := periodname, Period := periodtime );
diff --git a/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl b/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl
index 4231dde..4d34c0d 100644
--- a/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl
@@ -93,7 +93,7 @@
       isccorigin             := originspid.StartsWith( '闀挎槬' ) or originspid.StartsWith( 'CC' );
       //璧峰鍦版槸澶ц繛
       isdlorigin             :=  originspid.StartsWith( '澶ц繛' ) or originspid.StartsWith( 'DL' );
-      if( isccorigin and isdlorigin ){
+      if( isccorigin or isdlorigin ){
         traverse( laneleg, Trip, trip, trip.LeadTime().Days() > 1 ){
           for( transferdate := trip.Departure() + Duration::Days( 1 ); transferdate < trip.Arrival(); transferdate := transferdate + Duration::Days( 1 ) ){
             daycolumn        := selectobject( table, InventorySummaryColumn, column, column.StartDate() = transferdate.Date(), column.TimeUnit() = Translations::MP_GlobalParameters_Day() );
diff --git a/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_AsyncCreateFullTable.qbl b/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_AsyncCreateFullTable.qbl
index 0d45916..074f66a 100644
--- a/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_AsyncCreateFullTable.qbl
+++ b/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_AsyncCreateFullTable.qbl
@@ -12,8 +12,9 @@
     // Akari Nov-11-2024 (created)
     AsyncFlag::Running( recycleBin,MP_Cell_ScheduleSummary::GetTableName() );
     
-    macroPlans := stream[MacroPlan]::Success();
-    traverse( macroPlanMDSIDs,Elements,mdsid ){
+    macroPlans := MDSMacroPlan::Root( macroPlanMDSIDs.Element( 0 ) );
+    for( i := 1; i< macroPlanMDSIDs.Size(); i++ ){
+      mdsid := macroPlanMDSIDs.Element( i );
       streamMacroPlan := LocalTool::LoadMacroPlan( mdsid );
       macroPlans.Merge( streamMacroPlan );
     }
diff --git a/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_AsyncCreateFullTable.qbl b/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_AsyncCreateFullTable.qbl
index d1949ea..b0278c2 100644
--- a/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_AsyncCreateFullTable.qbl
+++ b/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_AsyncCreateFullTable.qbl
@@ -11,8 +11,9 @@
     // Akari Nov-11-2024 (created)
     AsyncFlag::Running( recycleBin,MP_Cell_AnnualPlanReport::GetTableName() );
     
-    macroPlans := stream[MacroPlan]::Success();
-    traverse( macroPlanMDSIDs,Elements,mdsid ){
+    macroPlans := MDSMacroPlan::Root( macroPlanMDSIDs.Element( 0 ) );
+    for( i := 1; i< macroPlanMDSIDs.Size(); i++ ){
+      mdsid := macroPlanMDSIDs.Element( i );
       streamMacroPlan := LocalTool::LoadMacroPlan( mdsid );
       macroPlans.Merge( streamMacroPlan );
     }
diff --git a/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_Create.qbl b/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_Create.qbl
index 09e1363..7cbb030 100644
--- a/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_Create.qbl
+++ b/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_Create.qbl
@@ -10,7 +10,7 @@
     traverse( owner,MP_Table,table,table.Name() = MP_Cell_AnnualPlanReport::GetTableName() ){
       table.Delete();
     }
-    
+    info( owner.MDSMacroPlan().Description() )
     table := owner.MP_Table( relnew,Name := MP_Cell_AnnualPlanReport::GetTableName());
     
     startDate := owner.StartOfPlanning().Date();
diff --git a/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl b/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl
index b81f496..f9f9e50 100644
--- a/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl
+++ b/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl
@@ -38,7 +38,7 @@
        localRowIndex := guard( localRowIndexTree.Root().Child( localRowHandle ),null( NamedValue ));
        localRow := null( LocalRow );
        if( isnull( localRowIndex )){
-         info( row.ProductID() + row.ProductionLine() );
+    
          localRow := localTable.LocalRow( relnew,CustomName := row.Name(),ProductID := row.ProductID(),ProductionLine := row.ProductionLine(),Index := localTable.GetRowIndexCache() );
          localRows.Add( localRow );
          localRowIndexTree.Root().AddChild( localRowHandle,localRows.Size() - 1 );
diff --git a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
index 392964d..812c079 100644
--- a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
@@ -81,21 +81,24 @@
     traverse( owner, Unit.Lane.LaneLeg, laneleg ){
       originspid             := laneleg.OriginStockingPointID();
       destinationspid        := laneleg.DestinationStockingPointID();
-      //CC to DL 闀挎槬鍘傚唴搴撳埌澶ц繛澶栫搴�
-      iscctodl               := originspid.EndsWith( '鍘傚唴搴�' ) and ( originspid.StartsWith( '闀挎槬' ) or originspid.StartsWith( 'CC' ) ) and destinationspid = '澶ц繛澶栫搴�';
+      //CC to DL 闀挎槬宸ュ巶鍒板ぇ杩炲伐鍘�
+      iscctodl               := ( originspid.StartsWith( '闀挎槬' ) or originspid.StartsWith( 'CC' ) ) and ( destinationspid.StartsWith( '澶ц繛' ) or destinationspid.StartsWith( 'DL' ) );
       //DL to CC 澶ц繛鍘傚唴搴撳埌澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴�
       isdltocc               := originspid.EndsWith( '鍘傚唴搴�' ) and ( originspid.StartsWith( '澶ц繛' ) or originspid.StartsWith( 'DL' ) ) and destinationspid = '澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴�';
-      if( iscctodl and isdltocc ){
-        traverse( table, Column, column){//, column.StartDate().Month() = 1 
-          alltrips           := selectset( laneleg, Trip, trip, ( trip.Arrival().Date() < column.StartDate().StartOfNextMonth() and trip.Arrival().Date() >= column.StartDate() )
-                                           or ( trip.Departure().Date() < column.StartDate().StartOfNextMonth() and trip.Departure().Date() >= column.StartDate() ) );
+      if( iscctodl or isdltocc ){
+    //    info( '------iscctodl------', originspid, destinationspid, iscctodl );
+        traverse( table, Column, column  ){//, column.StartDate().Month() = 1
+          alltrips           := selectset( laneleg, Trip, trip, trip.Arrival().Date() = column.StartDate()
+                                           or trip.Departure().Date() = column.StartDate() );
           producttrips      := selectuniquevalues( alltrips, Elements.ProductInTrip, pit, pit.Quantity() <> 0 and exists( pit.Product_MP().GetAllParent(), Elements, e, e.ID() = productparent ), pit.ProductID() );
-          traverse( producttrips, Elements, producttrip ){//, producttrip = '6912'
+    //      info( '---------Column----------', alltrips.Size(), producttrips.Size(), column.StartDate() );
+          traverse( producttrips, Elements, producttrip ){//, producttrip = '06K103011CP'
             row             := table.GetRow( producttrip );
             product         := selectobject( owner, Product_MP, product, product.ID() = producttrip );
             products.Add( product );
-            departureqty    := sum( alltrips, Elements.ProductInTrip, pit, ( pit.Trip().Departure().Date() < column.StartDate().StartOfNextMonth() and pit.Trip().Departure().Date() >= column.StartDate() ) and pit.Product_MP() = product, pit.Quantity() );
-            arrivalqty      := sum( alltrips, Elements.ProductInTrip, pit, ( pit.Trip().Arrival().Date() < column.StartDate().StartOfNextMonth() and pit.Trip().Arrival().Date() >= column.StartDate() ) and pit.Product_MP() = product, pit.Quantity() );
+            departureqty    := sum( alltrips, Elements.ProductInTrip, pit, pit.Trip().Departure().Date() = column.StartDate() and pit.Product_MP() = product, pit.Quantity() );
+            arrivalqty      := sum( alltrips, Elements.ProductInTrip, pit, pit.Trip().Arrival().Date() = column.StartDate() and pit.Product_MP() = product, pit.Quantity() );
+    //        info( '---------***************8---------', departureqty, arrivalqty, column.StartDate() );
             row.SetDepartureAndArrivalValue( column, iscctodl, departureqty, arrivalqty );
           }
         }
diff --git a/_Main/BL/Type_Test/StaticMethod_TestMacroPlan.qbl b/_Main/BL/Type_Test/StaticMethod_TestMacroPlan.qbl
new file mode 100644
index 0000000..842eead
--- /dev/null
+++ b/_Main/BL/Type_Test/StaticMethod_TestMacroPlan.qbl
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod TestMacroPlan (
+  const MacroPlan macroPlan
+)
+{
+  TextBody:
+  [*
+    // Akari Nov-12-2024 (created)
+    info( macroPlan.MDSMacroPlan().Description() );
+    
+    traverse( macroPlan,MP_Table,table ){
+      info( table.Name() ); 
+    }
+  *]
+}
diff --git a/_Main/Sys/ImgAttr/LocalValue.dme b/_Main/Sys/ImgAttr/LocalValue.dme
new file mode 100644
index 0000000..e5d6c36
--- /dev/null
+++ b/_Main/Sys/ImgAttr/LocalValue.dme
@@ -0,0 +1,27 @@
+Quintiq file version 2.0
+#parent: #root
+TypeDataInterface LocalValue
+{
+  TypeKey: '[414996.1.191854789]'
+  ImageDataMember ImageIsEnable
+  {
+    #keys: '1[414996.1.215962330]'
+    ImageSpecifications:
+    [
+      ImageDataMemberImageSpecification
+      {
+        Description: 'Enable'
+        Image: 'CHECKEDCHECKBOX'
+        Quill: 'object.IsCheck()'
+        Value: 'Enable'
+      }
+      ImageDataMemberImageSpecification
+      {
+        Description: 'Disable'
+        Image: 'EMPTYCHECKBOX'
+        Quill: 'not object.IsCheck()'
+        Value: 'Disable'
+      }
+    ]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlanMDSIDsByName.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlanMDSIDsByName.def
index fda706a..ac314f0 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlanMDSIDsByName.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlanMDSIDsByName.def
@@ -9,7 +9,7 @@
   [*
     macroPlanMDSIDs := construct( Keys );
     
-    macroPlanMDSIDs := selectuniquevalues( ScenarioManager,ScenarioMP,scemp,scemp.Name().LikeUserLocale( macroPlanName ) ,scemp.MDSID());
+    macroPlanMDSIDs := selectuniquevalues( ScenarioManager,ScenarioMP,scemp,scemp.Name().LikeUserLocale( macroPlanName ) ,scemp.DatasetMDSID());
     
     return &macroPlanMDSIDs
   *]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations.def
index a84ded0..4eb67ef 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component ListGenerations
 {
-  #keys: '[414996.1.211223843]'
+  #keys: '[414996.1.218091520]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor989
     {
-      #keys: '[414996.1.211223844]'
+      #keys: '[414996.1.218091521]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -20,7 +20,7 @@
     #child: listActionBarPage963
     Component DataSetLevel191
     {
-      #keys: '[414996.1.211223846]'
+      #keys: '[414996.1.218091523]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":2,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":6,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu687'
         Taborder: 2
       ]
@@ -36,6 +36,7 @@
   ]
   Properties:
   [
+    MinimumColumns: 8
     Taborder: 0
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB.def
index c692844..5eccf28 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component ListMQBMLB
 {
-  #keys: '[414996.1.211223825]'
+  #keys: '[414996.1.218091500]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor472
     {
-      #keys: '[414996.1.211223826]'
+      #keys: '[414996.1.218091501]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -20,7 +20,7 @@
     #child: listActionBarPage519
     Component DataSetLevel527
     {
-      #keys: '[414996.1.211223828]'
+      #keys: '[414996.1.218091503]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":2,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":6,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu319'
         Taborder: 2
       ]
@@ -36,6 +36,7 @@
   ]
   Properties:
   [
+    MinimumColumns: 8
     Taborder: 0
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers.def
index 77587f2..6e68952 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component ListPowers
 {
-  #keys: '[414996.1.211223834]'
+  #keys: '[414996.1.218091509]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor671
     {
-      #keys: '[414996.1.211223835]'
+      #keys: '[414996.1.218091510]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -20,7 +20,7 @@
     #child: listActionBarPage245
     Component DataSetLevel995
     {
-      #keys: '[414996.1.211223837]'
+      #keys: '[414996.1.218091512]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":2,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":6,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu623'
         Taborder: 2
       ]
@@ -36,6 +36,7 @@
   ]
   Properties:
   [
+    MinimumColumns: 8
     Taborder: 0
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245.def
index 70b1750..78007b6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listActionBarPage245
 {
-  #keys: '[414996.1.211223836]'
+  #keys: '[414996.1.218091511]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519.def
index 3ef0486..71a5f23 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listActionBarPage519
 {
-  #keys: '[414996.1.211223827]'
+  #keys: '[414996.1.218091502]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963.def
index cbb1e9f..b8158a4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listActionBarPage963
 {
-  #keys: '[414996.1.211223845]'
+  #keys: '[414996.1.218091522]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319.def
index ee08f17..e386fa2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listContextMenu319
 {
-  #keys: '[414996.1.211223829]'
+  #keys: '[414996.1.218091504]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623.def
index a5988e5..75c5526 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listContextMenu623
 {
-  #keys: '[414996.1.211223838]'
+  #keys: '[414996.1.218091513]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687.def
index 1fceefe..334ee4c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listContextMenu687
 {
-  #keys: '[414996.1.211223847]'
+  #keys: '[414996.1.218091524]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration.def
index e77fbd3..708354e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component pGeneration
 {
-  #keys: '[414996.1.211223841]'
+  #keys: '[414996.1.218091516]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhGenerations
     {
-      #keys: '[414996.1.211223842]'
+      #keys: '[414996.1.218091517]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -15,17 +15,16 @@
         Taborder: 1
       ]
     }
-    #child: ListGenerations
     Component dhCheckGenerations
     {
-      #keys: '[414996.1.211223848]'
+      #keys: '[414996.1.218091518]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckGenerations
         {
-          #keys: '[414996.1.211223849]'
+          #keys: '[414996.1.218091519]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -42,10 +41,13 @@
         Taborder: 2
       ]
     }
+    #child: ListGenerations
   ]
   Properties:
   [
-    MinimumRows: 20
+    FixedSize: true
+    MinimumColumns: 8
+    MinimumRows: 15
     Taborder: 0
     Title: 'Generation'
   ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB.def
index 24dedd8..a1117e0 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component pMQBMLB
 {
-  #keys: '[414996.1.211223823]'
+  #keys: '[414996.1.218091498]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhMQBMLB
     {
-      #keys: '[414996.1.211223824]'
+      #keys: '[414996.1.218091499]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -18,14 +18,14 @@
     #child: ListMQBMLB
     Component dhCheckMQBMLB
     {
-      #keys: '[414996.1.211223830]'
+      #keys: '[414996.1.218091505]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckMQBMLB
         {
-          #keys: '[414996.1.211223831]'
+          #keys: '[414996.1.218091506]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -45,7 +45,9 @@
   ]
   Properties:
   [
-    MinimumRows: 20
+    FixedSize: true
+    MinimumColumns: 8
+    MinimumRows: 15
     Taborder: 2
     Title: 'MQB/MLB'
   ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower.def
index 2c3f4da..24caf4a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component pPower
 {
-  #keys: '[414996.1.211223832]'
+  #keys: '[414996.1.218091507]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhPowers
     {
-      #keys: '[414996.1.211223833]'
+      #keys: '[414996.1.218091508]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -18,14 +18,14 @@
     #child: ListPowers
     Component dhCheckPowers
     {
-      #keys: '[414996.1.211223839]'
+      #keys: '[414996.1.218091514]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckPowers
         {
-          #keys: '[414996.1.211223840]'
+          #keys: '[414996.1.218091515]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -45,7 +45,9 @@
   ]
   Properties:
   [
-    MinimumRows: 20
+    FixedSize: true
+    MinimumColumns: 8
+    MinimumRows: 15
     Taborder: 1
     Title: 'Power'
   ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter.def
index 22877ae..d09cd9e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter.def
@@ -1,17 +1,18 @@
 Quintiq file version 2.0
 Component pProductAttributeFilter
 {
-  #keys: '[414996.1.211223822]'
+  #keys: '[414996.1.218091497]'
   BaseType: 'WebPanel'
   Children:
   [
-    #child: pMQBMLB
-    #child: pPower
     #child: pGeneration
+    #child: pPower
+    #child: pMQBMLB
   ]
   Properties:
   [
     FixedSize: true
+    MinimumColumns: 8
     Taborder: 0
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListGenerations_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListGenerations_OnClick.def
index afdff5a..0048c99 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListGenerations_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListGenerations_OnClick.def
@@ -4,7 +4,7 @@
   LocalValue selection
 ) id:Response_ListGenerations_OnClick
 {
-  #keys: '[414996.1.211223757]'
+  #keys: '[414996.1.218091482]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListMQBMLB_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListMQBMLB_OnClick.def
index bdc082a..6262cf7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListMQBMLB_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListMQBMLB_OnClick.def
@@ -4,7 +4,7 @@
   LocalValue selection
 ) id:Response_ListMQBMLB_OnClick
 {
-  #keys: '[414996.1.211223765]'
+  #keys: '[414996.1.218091491]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListPowers_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListPowers_OnClick.def
index 7fcdb2d..80f51bc 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListPowers_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListPowers_OnClick.def
@@ -4,7 +4,7 @@
   LocalValue selection
 ) id:Response_ListPowers_OnClick
 {
-  #keys: '[414996.1.211223761]'
+  #keys: '[414996.1.218091487]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhCheckGenerations_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
index dfdd368..bbb124e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
@@ -2,7 +2,7 @@
 #parent: pGeneration/dhCheckGenerations
 Response OnDataChanged () id:Response_pGeneration_dhCheckGenerations_OnDataChanged
 {
-  #keys: '[414996.1.211223756]'
+  #keys: '[414996.1.218091484]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhGenerations_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhGenerations_OnCreated.def
index e5d83d8..764006f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhGenerations_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhGenerations_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: pGeneration/dhGenerations
 Response OnCreated () id:Response_pGeneration_dhGenerations_OnCreated
 {
-  #keys: '[414996.1.211223759]'
+  #keys: '[414996.1.218091485]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
index 8a54c6f..57e14d1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
@@ -2,7 +2,7 @@
 #parent: pMQBMLB/dhCheckMQBMLB
 Response OnDataChanged () id:Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged
 {
-  #keys: '[414996.1.211223764]'
+  #keys: '[414996.1.218091490]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhMQBMLB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhMQBMLB_OnCreated.def
index 245b2e1..eb48e74 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhMQBMLB_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhMQBMLB_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: pMQBMLB/dhMQBMLB
 Response OnCreated () id:Response_pMQBMLB_dhMQBMLB_OnCreated
 {
-  #keys: '[414996.1.211223767]'
+  #keys: '[414996.1.218091493]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhCheckPowers_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhCheckPowers_OnDataChanged.def
index f8c96ab..dff455a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhCheckPowers_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhCheckPowers_OnDataChanged.def
@@ -2,7 +2,7 @@
 #parent: pPower/dhCheckPowers
 Response OnDataChanged () id:Response_pPower_dhCheckPowers_OnDataChanged
 {
-  #keys: '[414996.1.211223760]'
+  #keys: '[414996.1.218091486]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhPowers_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhPowers_OnCreated.def
index f1a40cd..f035ae7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhPowers_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhPowers_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: pPower/dhPowers
 Response OnCreated () id:Response_pPower_dhPowers_OnCreated
 {
-  #keys: '[414996.1.211223763]'
+  #keys: '[414996.1.218091489]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations\043529.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations\043529.def"
index a374678..e2b8f6a 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations\043529.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations\043529.def"
@@ -5,6 +5,7 @@
   BaseType: 'WebList'
   Children:
   [
+    #child: listActionBarPage963_1
     Component DataExtractor989
     {
       #keys: '[414996.1.209190763]'
@@ -17,7 +18,6 @@
         Transformation: 'Elements'
       ]
     }
-    #child: listActionBarPage963_1
     Component DataSetLevel191
     {
       #keys: '[414996.1.209190765]'
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":2,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":6,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu687'
         Taborder: 2
       ]
@@ -36,6 +36,7 @@
   ]
   Properties:
   [
+    MinimumColumns: 8
     Taborder: 0
   ]
 }
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB\043925.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB\043925.def"
index 256ab51..a0e270a 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB\043925.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB\043925.def"
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":2,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":6,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu319'
         Taborder: 2
       ]
@@ -36,6 +36,7 @@
   ]
   Properties:
   [
+    MinimumColumns: 8
     Taborder: 0
   ]
 }
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers\043568.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers\043568.def"
index b66b7af..fea4560 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers\043568.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListPowers\043568.def"
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":2,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":6,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu623'
         Taborder: 2
       ]
@@ -36,6 +36,7 @@
   ]
   Properties:
   [
+    MinimumColumns: 8
     Taborder: 0
   ]
 }
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043812.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043812.def"
index 7417951..0cf42ce 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043812.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043812.def"
@@ -15,7 +15,6 @@
         Taborder: 1
       ]
     }
-    #child: ListGenerations_529
     Component dhCheckGenerations
     {
       #keys: '[414996.1.209190767]'
@@ -42,10 +41,13 @@
         Taborder: 2
       ]
     }
+    #child: ListGenerations_529
   ]
   Properties:
   [
-    MinimumRows: 20
+    FixedSize: true
+    MinimumColumns: 8
+    MinimumRows: 15
     Taborder: 0
     Title: 'Generation'
   ]
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMQBMLB\043393.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMQBMLB\043393.def"
index 436c6f7..bd04f08 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMQBMLB\043393.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMQBMLB\043393.def"
@@ -45,7 +45,9 @@
   ]
   Properties:
   [
-    MinimumRows: 20
+    FixedSize: true
+    MinimumColumns: 8
+    MinimumRows: 15
     Taborder: 2
     Title: 'MQB/MLB'
   ]
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pPower\043480.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pPower\043480.def"
index bc748bb..522f28e 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pPower\043480.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pPower\043480.def"
@@ -45,7 +45,9 @@
   ]
   Properties:
   [
-    MinimumRows: 20
+    FixedSize: true
+    MinimumColumns: 8
+    MinimumRows: 15
     Taborder: 1
     Title: 'Power'
   ]
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pProductAttributeFilter\043791.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pProductAttributeFilter\043791.def"
index cac6d85..d7a0ca5 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pProductAttributeFilter\043791.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pProductAttributeFilter\043791.def"
@@ -12,6 +12,7 @@
   Properties:
   [
     FixedSize: true
+    MinimumColumns: 8
     Taborder: 0
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations.def
index 6673770..a78f666 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component ListGenerations
 {
-  #keys: '[414996.1.211223084]'
+  #keys: '[414996.1.218091408]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor989
     {
-      #keys: '[414996.1.211223085]'
+      #keys: '[414996.1.218091409]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -20,7 +20,7 @@
     #child: listActionBarPage963
     Component DataSetLevel191
     {
-      #keys: '[414996.1.211223087]'
+      #keys: '[414996.1.218091411]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":2,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":6,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu687'
         Taborder: 2
       ]
@@ -36,6 +36,7 @@
   ]
   Properties:
   [
+    MinimumColumns: 8
     Taborder: 0
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB.def
index 493bb13..4517df1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component ListMQBMLB
 {
-  #keys: '[414996.1.211223066]'
+  #keys: '[414996.1.218091388]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor472
     {
-      #keys: '[414996.1.211223067]'
+      #keys: '[414996.1.218091389]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -20,7 +20,7 @@
     #child: listActionBarPage519
     Component DataSetLevel527
     {
-      #keys: '[414996.1.211223069]'
+      #keys: '[414996.1.218091391]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":2,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":6,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu319'
         Taborder: 2
       ]
@@ -36,6 +36,7 @@
   ]
   Properties:
   [
+    MinimumColumns: 8
     Taborder: 0
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers.def
index cf62e07..336eeb3 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component ListPowers
 {
-  #keys: '[414996.1.211223075]'
+  #keys: '[414996.1.218091397]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor671
     {
-      #keys: '[414996.1.211223076]'
+      #keys: '[414996.1.218091398]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -20,7 +20,7 @@
     #child: listActionBarPage245
     Component DataSetLevel995
     {
-      #keys: '[414996.1.211223078]'
+      #keys: '[414996.1.218091400]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":2,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":6,"display":"always","editable":false,"attribute":"StringValue"}}]'
         ContextMenu: 'listContextMenu623'
         Taborder: 2
       ]
@@ -36,6 +36,7 @@
   ]
   Properties:
   [
+    MinimumColumns: 8
     Taborder: 0
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245.def
index fa7a1ce..d9a2043 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listActionBarPage245
 {
-  #keys: '[414996.1.211223077]'
+  #keys: '[414996.1.218091399]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519.def
index 42071fc..899a107 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listActionBarPage519
 {
-  #keys: '[414996.1.211223068]'
+  #keys: '[414996.1.218091390]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963.def
index f655583..d9b151f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listActionBarPage963
 {
-  #keys: '[414996.1.211223086]'
+  #keys: '[414996.1.218091410]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319.def
index 11260c8..bbe427d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listContextMenu319
 {
-  #keys: '[414996.1.211223070]'
+  #keys: '[414996.1.218091392]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623.def
index 04ce6fb..1419534 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listContextMenu623
 {
-  #keys: '[414996.1.211223079]'
+  #keys: '[414996.1.218091401]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687.def
index c136f63..c409ab9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component listContextMenu687
 {
-  #keys: '[414996.1.211223088]'
+  #keys: '[414996.1.218091412]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pDemandComparison\043822.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pDemandComparison\043822.def"
index 7dd3886..3cdf2dc 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pDemandComparison\043822.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pDemandComparison\043822.def"
@@ -15,7 +15,7 @@
         Taborder: 1
       ]
     }
-    Component dhCheckedProduct
+    Component dhCheckedProducts
     {
       #keys: '[414996.1.211223499]'
       BaseType: 'WebDataHolder'
@@ -40,7 +40,7 @@
         Taborder: 3
       ]
     }
-    Component dhFinelProduct
+    Component dhFinelProducts
     {
       #keys: '[414996.1.211223501]'
       BaseType: 'WebDataHolder'
@@ -50,7 +50,7 @@
         Taborder: 2
       ]
     }
-    Component dhCheckedSalesSegment
+    Component dhCheckedSalesSegments
     {
       #keys: '[414996.1.211223502]'
       BaseType: 'WebDataHolder'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration.def
index ec94058..073d4d2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component pGeneration
 {
-  #keys: '[414996.1.211223082]'
+  #keys: '[414996.1.218091404]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhGenerations
     {
-      #keys: '[414996.1.211223083]'
+      #keys: '[414996.1.218091405]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -15,17 +15,16 @@
         Taborder: 1
       ]
     }
-    #child: ListGenerations
     Component dhCheckGenerations
     {
-      #keys: '[414996.1.211223089]'
+      #keys: '[414996.1.218091406]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckGenerations
         {
-          #keys: '[414996.1.211223090]'
+          #keys: '[414996.1.218091407]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -42,10 +41,13 @@
         Taborder: 2
       ]
     }
+    #child: ListGenerations
   ]
   Properties:
   [
-    MinimumRows: 20
+    FixedSize: true
+    MinimumColumns: 8
+    MinimumRows: 15
     Taborder: 0
     Title: 'Generation'
   ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB.def
index bc61124..4ab95ec 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component pMQBMLB
 {
-  #keys: '[414996.1.211223064]'
+  #keys: '[414996.1.218091386]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhMQBMLB
     {
-      #keys: '[414996.1.211223065]'
+      #keys: '[414996.1.218091387]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -18,14 +18,14 @@
     #child: ListMQBMLB
     Component dhCheckMQBMLB
     {
-      #keys: '[414996.1.211223071]'
+      #keys: '[414996.1.218091393]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckMQBMLB
         {
-          #keys: '[414996.1.211223072]'
+          #keys: '[414996.1.218091394]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -45,7 +45,9 @@
   ]
   Properties:
   [
-    MinimumRows: 20
+    FixedSize: true
+    MinimumColumns: 8
+    MinimumRows: 15
     Taborder: 2
     Title: 'MQB/MLB'
   ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower.def
index 9751775..16c256d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component pPower
 {
-  #keys: '[414996.1.211223073]'
+  #keys: '[414996.1.218091395]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhPowers
     {
-      #keys: '[414996.1.211223074]'
+      #keys: '[414996.1.218091396]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -18,14 +18,14 @@
     #child: ListPowers
     Component dhCheckPowers
     {
-      #keys: '[414996.1.211223080]'
+      #keys: '[414996.1.218091402]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckPowers
         {
-          #keys: '[414996.1.211223081]'
+          #keys: '[414996.1.218091403]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -45,7 +45,9 @@
   ]
   Properties:
   [
-    MinimumRows: 20
+    FixedSize: true
+    MinimumColumns: 8
+    MinimumRows: 15
     Taborder: 1
     Title: 'Power'
   ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter.def
index e536a45..95906bf 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter.def
@@ -1,17 +1,18 @@
 Quintiq file version 2.0
 Component pProductAttributeFilter
 {
-  #keys: '[414996.1.211223063]'
+  #keys: '[414996.1.218091385]'
   BaseType: 'WebPanel'
   Children:
   [
-    #child: pMQBMLB
-    #child: pPower
     #child: pGeneration
+    #child: pPower
+    #child: pMQBMLB
   ]
   Properties:
   [
     FixedSize: true
+    MinimumColumns: 8
     Taborder: 0
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_OnClick.def
index ed75271..5671eff 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_OnClick.def
@@ -4,7 +4,7 @@
   LocalValue selection
 ) id:Response_ListGenerations_OnClick
 {
-  #keys: '[414996.1.211222998]'
+  #keys: '[414996.1.218091370]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_OnClick.def
index b4b308b..d8f5a89 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_OnClick.def
@@ -4,7 +4,7 @@
   LocalValue selection
 ) id:Response_ListMQBMLB_OnClick
 {
-  #keys: '[414996.1.211223006]'
+  #keys: '[414996.1.218091379]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_OnClick.def
index 0f4c94a..91b2137 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_OnClick.def
@@ -4,7 +4,7 @@
   LocalValue selection
 ) id:Response_ListPowers_OnClick
 {
-  #keys: '[414996.1.211223002]'
+  #keys: '[414996.1.218091375]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonClearFilter_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonClearFilter_OnClick.def
index 9b469f3..4a18fcd 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonClearFilter_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonClearFilter_OnClick.def
@@ -12,7 +12,7 @@
       ddslGeneration.Text( "<All>" );
       ddslMQBMLB.Text( "<All>" );
       ddslPower.Text( "<All>" )
-      dhFinelProduct.Data( DataHolderProduct.Data().Copy() );
+      dhFinelProducts.Data( DataHolderProduct.Data().Copy() );
     *]
     GroupServerCalls: false
   }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonFilter485_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonFilter485_OnClick.def
index 5e452da..fb9a317 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonFilter485_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonFilter485_OnClick.def
@@ -10,7 +10,7 @@
   {
     Body:
     [*
-      products := dhFinelProduct.Data().Copy();
+      products := dhFinelProducts.Data().Copy();
       if( ddslGeneration.Text() <> "<All>" ){
         products := selectset( products,Elements,element,element.Generation() = ddslGeneration.Text());
       }
@@ -20,7 +20,7 @@
       if( ddslPower.Text() <> "<All>" ){
         products := selectset( products,Elements,element,element.Power() = ddslPower.Text());
       }
-      dhFinelProduct.Data( &products );
+      dhFinelProducts.Data( &products );
     *]
   }
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_bExport_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_bExport_OnClick.def
index c1cfd41..28f0a36 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_bExport_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_bExport_OnClick.def
@@ -9,7 +9,7 @@
   {
     Body:
     [*
-      rows := selectset( dhComparisonData.Data(),LocalRow,row,exists( dhFinelProduct.Data(),Elements,product,product.ID() = row.ProductID()));
+      rows := selectset( dhComparisonData.Data(),LocalRow,row,exists( dhFinelProducts.Data(),Elements,product,product.ID() = row.ProductID()));
       columns := selectset( dhComparisonData.Data( ),LocalColumn,column,not column.IsAttrbuteColumn() and dhStartDate.Data() <= column.Date() and dhEndDate.Data() > column.Date() );
       LocalCell_DemandComparison::AsyncExport( RecycleBin, rows, columns ,MacroPlan );
     *]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedProduct_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedProducts_OnDataChanged.def
similarity index 63%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedProduct_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedProducts_OnDataChanged.def
index e94b01d..0b413e9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedProduct_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedProducts_OnDataChanged.def
@@ -1,6 +1,6 @@
 Quintiq file version 2.0
-#parent: pDemandComparison_822/dhCheckedProduct
-Response OnDataChanged () id:Response_pDemandComparison_822_dhCheckedProduct_OnDataChanged
+#parent: pDemandComparison_822/dhCheckedProducts
+Response OnDataChanged () id:Response_pDemandComparison_822_dhCheckedProducts_OnDataChanged
 {
   #keys: '[414996.1.211223484]'
   CanBindMultiple: false
@@ -11,9 +11,9 @@
     Body:
     [*
       if( this.Data().Size() <> 0 ){
-        dhFinelProduct.Data( this.Data().Copy() ); 
+        dhFinelProducts.Data( this.Data().Copy() ); 
       }else{
-        dhFinelProduct.Data( DataHolderProduct.Data().Copy() ); 
+        dhFinelProducts.Data( DataHolderProduct.Data().Copy() ); 
       }
     *]
   }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedSalesSegment_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedSalesSegment_OnDataChanged.def
deleted file mode 100644
index 9218b91..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedSalesSegment_OnDataChanged.def
+++ /dev/null
@@ -1,21 +0,0 @@
-Quintiq file version 2.0
-#parent: pDemandComparison_822/dhCheckedSalesSegment
-Response OnDataChanged () id:Response_pDemandComparison_822_dhCheckedSalesSegment_OnDataChanged
-{
-  #keys: '[414996.1.211223482]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      if( this.Data().Size() <> 0 ){
-        prods := selectset( dhFinelProduct.Data(),Elements,element,exists( this.Data(),Elements.SalesDemand.Product_MP,prod,element = prod ));
-        dhFinelProduct.Data( &prods );
-      }else{
-        dhFinelProduct.Data( DataHolderProduct.Data().Copy() );
-      }
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedSalesSegments_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedSalesSegments_OnDataChanged.def
new file mode 100644
index 0000000..9e568d8
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedSalesSegments_OnDataChanged.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+#parent: pDemandComparison_822/dhCheckedSalesSegments
+Response OnDataChanged () id:Response_pDemandComparison_822_dhCheckedSalesSegments_OnDataChanged
+{
+  #keys: '[414996.1.211223482]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      if( this.Data().Size() <> 0 ){
+        prods := selectset( dhFinelProducts.Data(),Elements,element,exists( this.Data(),Elements.SalesDemand.Product_MP,prod,element = prod ));
+        dhFinelProducts.Data( &prods );
+      }else{
+        dhFinelProducts.Data( DataHolderProduct.Data().Copy() );
+      }
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhFinelProduct_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhFinelProducts_OnCreated.def
similarity index 83%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhFinelProduct_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhFinelProducts_OnCreated.def
index f40738b..d5f46d5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhFinelProduct_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhFinelProducts_OnCreated.def
@@ -1,6 +1,6 @@
 Quintiq file version 2.0
-#parent: pDemandComparison_822/dhFinelProduct
-Response OnCreated () id:Response_pDemandComparison_822_dhFinelProduct_OnCreated
+#parent: pDemandComparison_822/dhFinelProducts
+Response OnCreated () id:Response_pDemandComparison_822_dhFinelProducts_OnCreated
 {
   #keys: '[414996.1.211223483]'
   CanBindMultiple: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
index bcbdb8a..f381df8 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
@@ -2,7 +2,7 @@
 #parent: pGeneration/dhCheckGenerations
 Response OnDataChanged () id:Response_pGeneration_dhCheckGenerations_OnDataChanged
 {
-  #keys: '[414996.1.211222997]'
+  #keys: '[414996.1.218091372]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
@@ -10,15 +10,15 @@
   {
     Body:
     [*
-      products := dhFinelProduct.Data();
+      products := dhFinelProducts.Data();
       if( this.Data().Size() <> 0 ){
         products := selectset( products,Elements,product,exists( this.Data(),Elements,element,element.StringValue() = product.Generation()));
-        dhFinelProduct.Data( &products );
+        dhFinelProducts.Data( &products );
       }else{
-        if( dhCheckedProduct.Data().Size() <> 0 ){
-          dhFinelProduct.Data( dhCheckedProduct.Data().Copy() );
+        if( dhCheckedProducts.Data().Size() <> 0 ){
+          dhFinelProducts.Data( dhCheckedProducts.Data().Copy() );
         }else{
-          dhFinelProduct.Data( DataHolderProduct.Data().Copy() );
+          dhFinelProducts.Data( DataHolderProduct.Data().Copy() );
         }
       }
     *]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhGenerations_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhGenerations_OnCreated.def
index 3592860..84d0dab 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhGenerations_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhGenerations_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: pGeneration/dhGenerations
 Response OnCreated () id:Response_pGeneration_dhGenerations_OnCreated
 {
-  #keys: '[414996.1.211223000]'
+  #keys: '[414996.1.218091373]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
index 4ed4a05..0abae5f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
@@ -2,7 +2,7 @@
 #parent: pMQBMLB/dhCheckMQBMLB
 Response OnDataChanged () id:Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged
 {
-  #keys: '[414996.1.211223005]'
+  #keys: '[414996.1.218091378]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
@@ -10,15 +10,15 @@
   {
     Body:
     [*
-      products := dhFinelProduct.Data();
+      products := dhFinelProducts.Data();
       if( this.Data().Size() <> 0 ){
         products := selectset( products,Elements,product,exists( this.Data(),Elements,element,element.StringValue() = product.MQBMLB()));
-        dhFinelProduct.Data( &products );
+        dhFinelProducts.Data( &products );
       }else{
-        if( dhCheckedProduct.Data().Size() <> 0 ){
-          dhFinelProduct.Data( dhCheckedProduct.Data().Copy() );
+        if( dhCheckedProducts.Data().Size() <> 0 ){
+          dhFinelProducts.Data( dhCheckedProducts.Data().Copy() );
         }else{
-          dhFinelProduct.Data( DataHolderProduct.Data().Copy() );
+          dhFinelProducts.Data( DataHolderProduct.Data().Copy() );
         }
       }
     *]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def
index 797a070..e6aa0b9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: pMQBMLB/dhMQBMLB
 Response OnCreated () id:Response_pMQBMLB_dhMQBMLB_OnCreated
 {
-  #keys: '[414996.1.211223008]'
+  #keys: '[414996.1.218091381]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhCheckPowers_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhCheckPowers_OnDataChanged.def
index 3471296..8e029ac 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhCheckPowers_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhCheckPowers_OnDataChanged.def
@@ -2,7 +2,7 @@
 #parent: pPower/dhCheckPowers
 Response OnDataChanged () id:Response_pPower_dhCheckPowers_OnDataChanged
 {
-  #keys: '[414996.1.211223001]'
+  #keys: '[414996.1.218091374]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
@@ -10,15 +10,15 @@
   {
     Body:
     [*
-      products := dhFinelProduct.Data();
+      products := dhFinelProducts.Data();
       if( this.Data().Size() <> 0 ){
         products := selectset( products,Elements,product,exists( this.Data(),Elements,element,element.StringValue() = product.Power()));
-        dhFinelProduct.Data( &products );
+        dhFinelProducts.Data( &products );
       }else{
-        if( dhCheckedProduct.Data().Size() <> 0 ){
-          dhFinelProduct.Data( dhCheckedProduct.Data().Copy() );
+        if( dhCheckedProducts.Data().Size() <> 0 ){
+          dhFinelProducts.Data( dhCheckedProducts.Data().Copy() );
         }else{
-          dhFinelProduct.Data( DataHolderProduct.Data().Copy() );
+          dhFinelProducts.Data( DataHolderProduct.Data().Copy() );
         }
       }
     *]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhPowers_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhPowers_OnCreated.def
index 20ad743..d34c9e4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhPowers_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhPowers_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: pPower/dhPowers
 Response OnCreated () id:Response_pPower_dhPowers_OnCreated
 {
-  #keys: '[414996.1.211223004]'
+  #keys: '[414996.1.218091377]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations.def
new file mode 100644
index 0000000..3459d2c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations.def
@@ -0,0 +1,42 @@
+Quintiq file version 2.0
+Component ListGenerations
+{
+  #keys: '[414996.1.218091290]'
+  BaseType: 'WebList'
+  Children:
+  [
+    Component DataExtractor989
+    {
+      #keys: '[414996.1.218091291]'
+      BaseType: 'WebDataExtractor'
+      Properties:
+      [
+        DataType: 'structured[LocalValue]'
+        Source: 'dhGenerations'
+        Taborder: 0
+        Transformation: 'Elements'
+      ]
+    }
+    #child: listActionBarPage963
+    Component DataSetLevel191
+    {
+      #keys: '[414996.1.218091293]'
+      BaseType: 'WebDataSetLevel'
+      Children:
+      [
+        #child: listContextMenu687
+      ]
+      Properties:
+      [
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":2,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":6,"display":"always","editable":false,"attribute":"StringValue"}}]'
+        ContextMenu: 'listContextMenu687'
+        Taborder: 2
+      ]
+    }
+  ]
+  Properties:
+  [
+    MinimumColumns: 8
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations366.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations366.def
deleted file mode 100644
index 5502cb5..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations366.def
+++ /dev/null
@@ -1,41 +0,0 @@
-Quintiq file version 2.0
-Component ListGenerations366
-{
-  #keys: '[414996.1.211222181]'
-  BaseType: 'WebList'
-  Children:
-  [
-    Component DataExtractor532
-    {
-      #keys: '[414996.1.211222182]'
-      BaseType: 'WebDataExtractor'
-      Properties:
-      [
-        DataType: 'structured[LocalValue]'
-        Source: 'dhGenerations423'
-        Taborder: 0
-        Transformation: 'Elements'
-      ]
-    }
-    #child: listActionBarPage206
-    Component DataSetLevel174
-    {
-      #keys: '[414996.1.211222184]'
-      BaseType: 'WebDataSetLevel'
-      Children:
-      [
-        #child: listContextMenu936
-      ]
-      Properties:
-      [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
-        ContextMenu: 'listContextMenu936'
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB.def
new file mode 100644
index 0000000..832568b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB.def
@@ -0,0 +1,42 @@
+Quintiq file version 2.0
+Component ListMQBMLB
+{
+  #keys: '[414996.1.218091270]'
+  BaseType: 'WebList'
+  Children:
+  [
+    Component DataExtractor472
+    {
+      #keys: '[414996.1.218091271]'
+      BaseType: 'WebDataExtractor'
+      Properties:
+      [
+        DataType: 'structured[LocalValue]'
+        Source: 'dhMQBMLB'
+        Taborder: 0
+        Transformation: 'Elements'
+      ]
+    }
+    #child: listActionBarPage519
+    Component DataSetLevel527
+    {
+      #keys: '[414996.1.218091273]'
+      BaseType: 'WebDataSetLevel'
+      Children:
+      [
+        #child: listContextMenu319
+      ]
+      Properties:
+      [
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":2,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":6,"display":"always","editable":false,"attribute":"StringValue"}}]'
+        ContextMenu: 'listContextMenu319'
+        Taborder: 2
+      ]
+    }
+  ]
+  Properties:
+  [
+    MinimumColumns: 8
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB700.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB700.def
deleted file mode 100644
index 43fa536..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB700.def
+++ /dev/null
@@ -1,41 +0,0 @@
-Quintiq file version 2.0
-Component ListMQBMLB700
-{
-  #keys: '[414996.1.211222163]'
-  BaseType: 'WebList'
-  Children:
-  [
-    Component DataExtractor687
-    {
-      #keys: '[414996.1.211222164]'
-      BaseType: 'WebDataExtractor'
-      Properties:
-      [
-        DataType: 'structured[LocalValue]'
-        Source: 'dhMQBMLB972'
-        Taborder: 0
-        Transformation: 'Elements'
-      ]
-    }
-    #child: listActionBarPage703
-    Component DataSetLevel671
-    {
-      #keys: '[414996.1.211222166]'
-      BaseType: 'WebDataSetLevel'
-      Children:
-      [
-        #child: listContextMenu245
-      ]
-      Properties:
-      [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
-        ContextMenu: 'listContextMenu245'
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers.def
new file mode 100644
index 0000000..df9ae2c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers.def
@@ -0,0 +1,42 @@
+Quintiq file version 2.0
+Component ListPowers
+{
+  #keys: '[414996.1.218091279]'
+  BaseType: 'WebList'
+  Children:
+  [
+    Component DataExtractor671
+    {
+      #keys: '[414996.1.218091280]'
+      BaseType: 'WebDataExtractor'
+      Properties:
+      [
+        DataType: 'structured[LocalValue]'
+        Source: 'dhPowers'
+        Taborder: 0
+        Transformation: 'Elements'
+      ]
+    }
+    #child: listActionBarPage245
+    Component DataSetLevel995
+    {
+      #keys: '[414996.1.218091282]'
+      BaseType: 'WebDataSetLevel'
+      Children:
+      [
+        #child: listContextMenu623
+      ]
+      Properties:
+      [
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":2,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":6,"display":"always","editable":false,"attribute":"StringValue"}}]'
+        ContextMenu: 'listContextMenu623'
+        Taborder: 2
+      ]
+    }
+  ]
+  Properties:
+  [
+    MinimumColumns: 8
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers199.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers199.def
deleted file mode 100644
index 8365707..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers199.def
+++ /dev/null
@@ -1,41 +0,0 @@
-Quintiq file version 2.0
-Component ListPowers199
-{
-  #keys: '[414996.1.211222172]'
-  BaseType: 'WebList'
-  Children:
-  [
-    Component DataExtractor707
-    {
-      #keys: '[414996.1.211222173]'
-      BaseType: 'WebDataExtractor'
-      Properties:
-      [
-        DataType: 'structured[LocalValue]'
-        Source: 'dhPowers404'
-        Taborder: 0
-        Transformation: 'Elements'
-      ]
-    }
-    #child: listActionBarPage690
-    Component DataSetLevel558
-    {
-      #keys: '[414996.1.211222175]'
-      BaseType: 'WebDataSetLevel'
-      Children:
-      [
-        #child: listContextMenu979
-      ]
-      Properties:
-      [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
-        ContextMenu: 'listContextMenu979'
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage206.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage206.def
deleted file mode 100644
index 2117e88..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage206.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage206
-{
-  #keys: '[414996.1.211222183]'
-  BaseType: 'listActionBarPage'
-  Properties:
-  [
-    Taborder: 1
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage245.def
similarity index 61%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage245.def
index eb6b6c9..3724072 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage245.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
-Component listActionBarPage690
+Component listActionBarPage245
 {
-  #keys: '[414996.1.211222174]'
+  #keys: '[414996.1.218091281]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage519.def
similarity index 61%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage519.def
index eb6b6c9..58a6dae 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage519.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
-Component listActionBarPage690
+Component listActionBarPage519
 {
-  #keys: '[414996.1.211222174]'
+  #keys: '[414996.1.218091272]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage703.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage703.def
deleted file mode 100644
index d288e9c..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage703.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage703
-{
-  #keys: '[414996.1.211222165]'
-  BaseType: 'listActionBarPage'
-  Properties:
-  [
-    Taborder: 1
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage963.def
similarity index 61%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage963.def
index eb6b6c9..1462b60 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage963.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
-Component listActionBarPage690
+Component listActionBarPage963
 {
-  #keys: '[414996.1.211222174]'
+  #keys: '[414996.1.218091292]'
   BaseType: 'listActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu319.def
similarity index 61%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu319.def
index 14c3c4d..2fe2c3c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu319.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
-Component listContextMenu245
+Component listContextMenu319
 {
-  #keys: '[414996.1.211222167]'
+  #keys: '[414996.1.218091274]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu623.def
similarity index 61%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu623.def
index 14c3c4d..3e1f48b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu623.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
-Component listContextMenu245
+Component listContextMenu623
 {
-  #keys: '[414996.1.211222167]'
+  #keys: '[414996.1.218091283]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu687.def
similarity index 61%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu687.def
index 14c3c4d..d666491 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu687.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
-Component listContextMenu245
+Component listContextMenu687
 {
-  #keys: '[414996.1.211222167]'
+  #keys: '[414996.1.218091294]'
   BaseType: 'listContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu936.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu936.def
deleted file mode 100644
index 43d83d5..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu936.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu936
-{
-  #keys: '[414996.1.211222185]'
-  BaseType: 'listContextMenu'
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu979.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu979.def
deleted file mode 100644
index 4fe59a9..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu979.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu979
-{
-  #keys: '[414996.1.211222176]'
-  BaseType: 'listContextMenu'
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration208.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration.def
similarity index 64%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration208.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration.def
index 6bcde59..9f6b548 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration208.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component pGeneration208
+Component pGeneration
 {
-  #keys: '[414996.1.211222179]'
+  #keys: '[414996.1.218091286]'
   BaseType: 'WebPanel'
   Children:
   [
-    Component dhGenerations423
+    Component dhGenerations
     {
-      #keys: '[414996.1.211222180]'
+      #keys: '[414996.1.218091287]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -15,23 +15,22 @@
         Taborder: 1
       ]
     }
-    #child: ListGenerations366
-    Component dhCheckGenerations744
+    Component dhCheckGenerations
     {
-      #keys: '[414996.1.211222186]'
+      #keys: '[414996.1.218091288]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
-        Component deCheckGenerations857
+        Component deCheckGenerations
         {
-          #keys: '[414996.1.211222187]'
+          #keys: '[414996.1.218091289]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
             DataType: 'structured[LocalValue]'
             FixedFilter: 'object.IsCheck()'
-            Source: 'dhGenerations423'
+            Source: 'dhGenerations'
             Taborder: 0
             Transformation: 'Elements'
           ]
@@ -42,10 +41,13 @@
         Taborder: 2
       ]
     }
+    #child: ListGenerations
   ]
   Properties:
   [
-    MinimumRows: 20
+    FixedSize: true
+    MinimumColumns: 8
+    MinimumRows: 15
     Taborder: 0
     Title: 'Generation'
   ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB154.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB.def
similarity index 66%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB154.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB.def
index eaf5fed..a6ba768 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB154.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component pMQBMLB154
+Component pMQBMLB
 {
-  #keys: '[414996.1.211222161]'
+  #keys: '[414996.1.218091268]'
   BaseType: 'WebPanel'
   Children:
   [
-    Component dhMQBMLB972
+    Component dhMQBMLB
     {
-      #keys: '[414996.1.211222162]'
+      #keys: '[414996.1.218091269]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -15,23 +15,23 @@
         Taborder: 1
       ]
     }
-    #child: ListMQBMLB700
-    Component dhCheckMQBMLB319
+    #child: ListMQBMLB
+    Component dhCheckMQBMLB
     {
-      #keys: '[414996.1.211222168]'
+      #keys: '[414996.1.218091275]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
-        Component deCheckMQBMLB661
+        Component deCheckMQBMLB
         {
-          #keys: '[414996.1.211222169]'
+          #keys: '[414996.1.218091276]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
             DataType: 'structured[LocalValue]'
             FixedFilter: 'object.IsCheck()'
-            Source: 'dhMQBMLB972'
+            Source: 'dhMQBMLB'
             Taborder: 0
             Transformation: 'Elements'
           ]
@@ -45,7 +45,9 @@
   ]
   Properties:
   [
-    MinimumRows: 20
+    FixedSize: true
+    MinimumColumns: 8
+    MinimumRows: 15
     Taborder: 2
     Title: 'MQB/MLB'
   ]
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft\043545.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft\043545.def"
index 592611f..157b7ab 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft\043545.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft\043545.def"
@@ -5,7 +5,7 @@
   BaseType: 'WebPanel'
   Children:
   [
-    #child: pProductAttributeFilter189
+    #child: pProductAttributeFilter
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower243.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower.def
similarity index 66%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower243.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower.def
index 4c8ef19..effb842 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower243.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component pPower243
+Component pPower
 {
-  #keys: '[414996.1.211222170]'
+  #keys: '[414996.1.218091277]'
   BaseType: 'WebPanel'
   Children:
   [
-    Component dhPowers404
+    Component dhPowers
     {
-      #keys: '[414996.1.211222171]'
+      #keys: '[414996.1.218091278]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -15,23 +15,23 @@
         Taborder: 1
       ]
     }
-    #child: ListPowers199
-    Component dhCheckPowers354
+    #child: ListPowers
+    Component dhCheckPowers
     {
-      #keys: '[414996.1.211222177]'
+      #keys: '[414996.1.218091284]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
-        Component deCheckPowers981
+        Component deCheckPowers
         {
-          #keys: '[414996.1.211222178]'
+          #keys: '[414996.1.218091285]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
             DataType: 'structured[LocalValue]'
             FixedFilter: 'object.IsCheck()'
-            Source: 'dhPowers404'
+            Source: 'dhPowers'
             Taborder: 0
             Transformation: 'Elements'
           ]
@@ -45,7 +45,9 @@
   ]
   Properties:
   [
-    MinimumRows: 20
+    FixedSize: true
+    MinimumColumns: 8
+    MinimumRows: 15
     Taborder: 1
     Title: 'Power'
   ]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter.def
new file mode 100644
index 0000000..d1c17a2
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+Component pProductAttributeFilter
+{
+  #keys: '[414996.1.218091267]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pGeneration
+    #child: pPower
+    #child: pMQBMLB
+  ]
+  Properties:
+  [
+    FixedSize: true
+    MinimumColumns: 8
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter189.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter189.def
deleted file mode 100644
index 21aa3d2..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter189.def
+++ /dev/null
@@ -1,17 +0,0 @@
-Quintiq file version 2.0
-Component pProductAttributeFilter189
-{
-  #keys: '[414996.1.211222160]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: pMQBMLB154
-    #child: pPower243
-    #child: pGeneration208
-  ]
-  Properties:
-  [
-    FixedSize: true
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations366_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations366_OnClick.def
deleted file mode 100644
index 092ea75..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations366_OnClick.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: ListGenerations366
-Response OnClick (
-  LocalValue selection
-) id:Response_ListGenerations366_OnClick
-{
-  #keys: '[414996.1.211222095]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebList_OnClick'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      selection.IsCheck( not selection.IsCheck() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations_OnClick.def
similarity index 73%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations_OnClick.def
index f3b51c6..61cf91e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListMQBMLB700
+#parent: ListGenerations
 Response OnClick (
   LocalValue selection
-) id:Response_ListMQBMLB700_OnClick
+) id:Response_ListGenerations_OnClick
 {
-  #keys: '[414996.1.211222103]'
+  #keys: '[414996.1.218091252]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_OnClick.def
similarity index 74%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_OnClick.def
index f3b51c6..e7da5e3 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListMQBMLB700
+#parent: ListMQBMLB
 Response OnClick (
   LocalValue selection
-) id:Response_ListMQBMLB700_OnClick
+) id:Response_ListMQBMLB_OnClick
 {
-  #keys: '[414996.1.211222103]'
+  #keys: '[414996.1.218091261]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers199_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers199_OnClick.def
deleted file mode 100644
index d999ea9..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers199_OnClick.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: ListPowers199
-Response OnClick (
-  LocalValue selection
-) id:Response_ListPowers199_OnClick
-{
-  #keys: '[414996.1.211222099]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebList_OnClick'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      selection.IsCheck( not selection.IsCheck() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers_OnClick.def
similarity index 74%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers_OnClick.def
index f3b51c6..ce7921c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListMQBMLB700
+#parent: ListPowers
 Response OnClick (
   LocalValue selection
-) id:Response_ListMQBMLB700_OnClick
+) id:Response_ListPowers_OnClick
 {
-  #keys: '[414996.1.211222103]'
+  #keys: '[414996.1.218091257]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhCheckGenerations744_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
similarity index 80%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhCheckGenerations744_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
index cb7087c..7715ff2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhCheckGenerations744_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pGeneration208/dhCheckGenerations744
-Response OnDataChanged () id:Response_pGeneration208_dhCheckGenerations744_OnDataChanged
+#parent: pGeneration/dhCheckGenerations
+Response OnDataChanged () id:Response_pGeneration_dhCheckGenerations_OnDataChanged
 {
-  #keys: '[414996.1.211222094]'
+  #keys: '[414996.1.218091254]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhGenerations423_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_dhGenerations_OnCreated.def
similarity index 67%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhGenerations423_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_dhGenerations_OnCreated.def
index 75ffbd9..409601e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhGenerations423_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_dhGenerations_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pGeneration208/dhGenerations423
-Response OnCreated () id:Response_pGeneration208_dhGenerations423_OnCreated
+#parent: pGeneration/dhGenerations
+Response OnCreated () id:Response_pGeneration_dhGenerations_OnCreated
 {
-  #keys: '[414996.1.211222097]'
+  #keys: '[414996.1.218091255]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhCheckMQBMLB319_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
similarity index 81%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhCheckMQBMLB319_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
index 2199fdb..8d6eb9f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhCheckMQBMLB319_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pMQBMLB154/dhCheckMQBMLB319
-Response OnDataChanged () id:Response_pMQBMLB154_dhCheckMQBMLB319_OnDataChanged
+#parent: pMQBMLB/dhCheckMQBMLB
+Response OnDataChanged () id:Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged
 {
-  #keys: '[414996.1.211222102]'
+  #keys: '[414996.1.218091260]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhMQBMLB972_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def
similarity index 70%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhMQBMLB972_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def
index de14fb0..4ee9add 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhMQBMLB972_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pMQBMLB154/dhMQBMLB972
-Response OnCreated () id:Response_pMQBMLB154_dhMQBMLB972_OnCreated
+#parent: pMQBMLB/dhMQBMLB
+Response OnCreated () id:Response_pMQBMLB_dhMQBMLB_OnCreated
 {
-  #keys: '[414996.1.211222105]'
+  #keys: '[414996.1.218091263]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhCheckPowers354_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_dhCheckPowers_OnDataChanged.def
similarity index 81%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhCheckPowers354_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_dhCheckPowers_OnDataChanged.def
index b50ec38..6a266c8 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhCheckPowers354_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_dhCheckPowers_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pPower243/dhCheckPowers354
-Response OnDataChanged () id:Response_pPower243_dhCheckPowers354_OnDataChanged
+#parent: pPower/dhCheckPowers
+Response OnDataChanged () id:Response_pPower_dhCheckPowers_OnDataChanged
 {
-  #keys: '[414996.1.211222098]'
+  #keys: '[414996.1.218091256]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhPowers404_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_dhPowers_OnCreated.def
similarity index 70%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhPowers404_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_dhPowers_OnCreated.def
index 666ed84..6bf14f4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhPowers404_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_dhPowers_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pPower243/dhPowers404
-Response OnCreated () id:Response_pPower243_dhPowers404_OnCreated
+#parent: pPower/dhPowers
+Response OnCreated () id:Response_pPower_dhPowers_OnCreated
 {
-  #keys: '[414996.1.211222101]'
+  #keys: '[414996.1.218091259]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/_ROOT_Project_MacroPlannerWebApp.qp b/_Main/UI/MacroPlannerWebApp/_ROOT_Project_MacroPlannerWebApp.qp
index 323d5c8..cde9965 100644
--- a/_Main/UI/MacroPlannerWebApp/_ROOT_Project_MacroPlannerWebApp.qp
+++ b/_Main/UI/MacroPlannerWebApp/_ROOT_Project_MacroPlannerWebApp.qp
@@ -5,7 +5,7 @@
   ProjectProperties
   {
     ApplicationComponentName: 'ApplicationMacroPlanner'
-    BuildVersion: '2022.3.0.48'
+    BuildVersion: '2022.3.0.74'
     Description: 'Quintiq Macro Planner'
     ProjectKind: 'WebClient'
   }

--
Gitblit v1.9.3