diff --git a/FruitBank.Common/FruitBankConstClient.cs b/FruitBank.Common/FruitBankConstClient.cs
index 0ec1b973..25d7b366 100644
--- a/FruitBank.Common/FruitBankConstClient.cs
+++ b/FruitBank.Common/FruitBankConstClient.cs
@@ -7,13 +7,13 @@ public static class FruitBankConstClient
 {
     public static string DefaultLocale = "en-US";
 
-    //public static string BaseUrl = "https://localhost:59579"; //FrutiBank nop
-    //public static string BaseUrl = "http://localhost:5000"; //FrutiBank nop
-
+    public static string BaseUrl = "https://localhost:59579"; //FrutiBank nop
+    
     #if RELEASE
-        public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop
+        //public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop
     #endif
 
+    //public static string BaseUrl = "http://localhost:5000"; //FrutiBank nop
     //public static string BaseUrl = "http://10.0.2.2:59579"; //FrutiBank (android) nop
     //public static string BaseUrl = "https://localhost:7144"; //HybridApp
     
diff --git a/FruitBankHybrid.Shared/Components/GridShippingDocument.razor b/FruitBankHybrid.Shared/Components/GridShippingDocument.razor
index 2e9282c0..b801204b 100644
--- a/FruitBankHybrid.Shared/Components/GridShippingDocument.razor
+++ b/FruitBankHybrid.Shared/Components/GridShippingDocument.razor
@@ -24,7 +24,13 @@
 				                    ListRenderMode="ListRenderMode.Entire"
 				                    SearchMode="ListSearchMode.AutoSearch"
 				                    SearchFilterCondition="ListSearchFilterCondition.Contains"
-				                    ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto"/>
+				                    ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto">
+					<Columns>
+						<DxListEditorColumn FieldName="@nameof(Partner.Id)" />
+						<DxListEditorColumn FieldName="@nameof(Partner.Name)" />
+						<DxListEditorColumn FieldName="@nameof(Partner.TaxId)" />
+					</Columns>
+				</DxComboBoxSettings>
 			</EditSettings>
 		</DxGridDataColumn>
 		<DxGridDataColumn FieldName="ShippingId" Caption="Shipping">
diff --git a/FruitBankHybrid.Shared/Components/GridShippingItem.razor b/FruitBankHybrid.Shared/Components/GridShippingItem.razor
index a6ce166e..4dedbed8 100644
--- a/FruitBankHybrid.Shared/Components/GridShippingItem.razor
+++ b/FruitBankHybrid.Shared/Components/GridShippingItem.razor
@@ -29,6 +29,7 @@
 					<Columns>
 						<DxListEditorColumn FieldName="@nameof(ShippingDocument.Id)" />
 						<DxListEditorColumn FieldName="@nameof(ShippingDocument.DocumentIdNumber)" />
+						<DxListEditorColumn FieldName="@nameof(ShippingDocument.PdfFileName)" />
 						<DxListEditorColumn FieldName="@("Partner.Name")" />
 					</Columns>
 				</DxComboBoxSettings>
diff --git a/FruitBankHybrid.Shared/Components/Grids/FruitBankGrid.cs b/FruitBankHybrid.Shared/Components/Grids/FruitBankGrid.cs
index 17e9a814..f677eaf2 100644
--- a/FruitBankHybrid.Shared/Components/Grids/FruitBankGrid.cs
+++ b/FruitBankHybrid.Shared/Components/Grids/FruitBankGrid.cs
@@ -1,10 +1,13 @@
-//using AyCode.Blazor.Components.Components.Grids;
-//using AyCode.Core.Interfaces;
-//using AyCode.Interfaces.Entities;
-//using FruitBankHybrid.Shared.Services.Loggers;
-//using FruitBankHybrid.Shared.Services.SignalRs;
+using AyCode.Blazor.Components.Components.Grids;
+using AyCode.Core.Interfaces;
+using AyCode.Interfaces.Entities;
+using FruitBankHybrid.Shared.Services.Loggers;
+using FruitBankHybrid.Shared.Services.SignalRs;
 
-//namespace FruitBankHybrid.Shared.Components.Grids;
+namespace FruitBankHybrid.Shared.Components.Grids;
 
-//public class FruitBankGrid<TDataItem> : MgGridBase<SignalRDataSource<TDataItem>, TDataItem, LoggerClient> where TDataItem : class, IId<int>
-//{}
\ No newline at end of file
+public class FruitBankListGridBase<TDataItem> : MgGridBase<SignalRDataSourceList<TDataItem>, TDataItem, int, LoggerClient> where TDataItem : class, IId<int>
+{ }
+
+//public abstract class FruitBankObservableGridBase<TDataItem> : MgGridBase<SignalRDataSourceObservable<TDataItem>, TDataItem, int, LoggerClient> where TDataItem : class, IId<int>
+//{ }
\ No newline at end of file
diff --git a/FruitBankHybrid.Shared/Components/Grids/ShippingItems/GridShippingItem.cs b/FruitBankHybrid.Shared/Components/Grids/ShippingItems/GridShippingItem.cs
index c8206ff4..865fe401 100644
--- a/FruitBankHybrid.Shared/Components/Grids/ShippingItems/GridShippingItem.cs
+++ b/FruitBankHybrid.Shared/Components/Grids/ShippingItems/GridShippingItem.cs
@@ -1,32 +1,33 @@
-//using AyCode.Core.Interfaces;
-//using FruitBank.Common.Entities;
-//using FruitBank.Common.SignalRs;
-//using FruitBankHybrid.Shared.Pages;
-//using Microsoft.AspNetCore.Components;
+using AyCode.Core.Interfaces;
+using DevExpress.Blazor;
+using FruitBank.Common.Entities;
+using FruitBank.Common.SignalRs;
+using FruitBankHybrid.Shared.Pages;
+using Microsoft.AspNetCore.Components;
 
-//namespace FruitBankHybrid.Shared.Components.Grids.ShippingItems;
+namespace FruitBankHybrid.Shared.Components.Grids.ShippingItems;
 
-//public class GridShippingItem : FruitBankGrid<ShippingItem>
-//{
-//    public GridShippingItem() : base()
-//    {
-//        GetAllMessageTag = SignalRTags.GetShippingItems;
-//        AddMessageTag = SignalRTags.AddShippingItem;
-//        UpdateMessageTag = SignalRTags.UpdateShippingItem;
-//        //RemoveMessageTag = SignalRTags.;
-//    }
+public class GridShippingItem : FruitBankListGridBase<ShippingItem>, IGrid
+{
+    public GridShippingItem() : base()
+    {
+        GetAllMessageTag = SignalRTags.GetShippingItems;
+        AddMessageTag = SignalRTags.AddShippingItem;
+        UpdateMessageTag = SignalRTags.UpdateShippingItem;
+        //RemoveMessageTag = SignalRTags.;
+    }
 
-//    protected override Task SetParametersAsyncCore(ParameterView parameters)
-//    {
-//        if (!IsFirstInitializeParameters)
-//        {
-//            //ShowFilterRow = true;
-//            //ShowGroupPanel = true;
-//            //AllowSort = false;
+    protected override Task SetParametersAsyncCore(ParameterView parameters)
+    {
+        if (!IsFirstInitializeParameters)
+        {
+            //ShowFilterRow = true;
+            //ShowGroupPanel = true;
+            //AllowSort = false;
 
-//            //etc...
-//        }
+            //etc...
+        }
 
-//        return base.SetParametersAsyncCore(parameters);
-//    }
-//}
\ No newline at end of file
+        return base.SetParametersAsyncCore(parameters);
+    }
+}
\ No newline at end of file
diff --git a/FruitBankHybrid.Shared/Services/SignalRs/SignalRDataSource.cs b/FruitBankHybrid.Shared/Services/SignalRs/SignalRDataSource.cs
index 4ab24295..9d6e3cbc 100644
--- a/FruitBankHybrid.Shared/Services/SignalRs/SignalRDataSource.cs
+++ b/FruitBankHybrid.Shared/Services/SignalRs/SignalRDataSource.cs
@@ -1,11 +1,17 @@
-//using AyCode.Core.Interfaces;
-//using AyCode.Services.Server.SignalRs;
-//using AyCode.Services.SignalRs;
-//using System.Diagnostics;
+using System.Collections.ObjectModel;
+using AyCode.Core.Interfaces;
+using AyCode.Services.Server.SignalRs;
+using AyCode.Services.SignalRs;
+using System.Diagnostics;
 
-//namespace FruitBankHybrid.Shared.Services.SignalRs;
+namespace FruitBankHybrid.Shared.Services.SignalRs;
 
-//[Serializable]
-//[DebuggerDisplay("Count = {Count}")]
-//public class SignalRDataSource<T>(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, params object[]? contextIds)
-//    : AcSignalRDataSource<T>(signalRClient, signalRCrudTags, contextIds) where T : class, IId<int>;
\ No newline at end of file
+[Serializable]
+[DebuggerDisplay("Count = {Count}")]
+public class SignalRDataSourceList<TDataItem>(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, params object[]? contextIds)
+    : AcSignalRDataSource<TDataItem, int, IList<TDataItem>>(signalRClient, signalRCrudTags, contextIds) where TDataItem : class, IId<int>;
+
+[Serializable]
+[DebuggerDisplay("Count = {Count}")]
+public class SignalRDataSourceObservable<TDataItem>(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, params object[]? contextIds)
+    : AcSignalRDataSource<TDataItem, int, ObservableCollection<TDataItem>>(signalRClient, signalRCrudTags, contextIds) where TDataItem : class, IId<int>;
\ No newline at end of file