diff --git a/Nuvolar.Module.CSharp/Helpers/Laravel/StorageTransactions.cs b/Nuvolar.Module.CSharp/Helpers/Laravel/StorageTransactions.cs
new file mode 100644
index 0000000..da079d8
--- /dev/null
+++ b/Nuvolar.Module.CSharp/Helpers/Laravel/StorageTransactions.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nuvolar.Module.Helpers
+{
+    public static class StorageTransactions
+    {
+    }
+}
diff --git a/Nuvolar.Module.CSharp/Nuvolar.Module.CSharp.csproj b/Nuvolar.Module.CSharp/Nuvolar.Module.CSharp.csproj
index 8f01b36..4f537c2 100644
--- a/Nuvolar.Module.CSharp/Nuvolar.Module.CSharp.csproj
+++ b/Nuvolar.Module.CSharp/Nuvolar.Module.CSharp.csproj
@@ -306,6 +306,7 @@
     <Compile Include="Gantt\GanttResources.cs" />
     <Compile Include="Gantt\GanttTaskDependencies.cs" />
     <Compile Include="Helpers\BusinessDocumentHelper.cs" />
+    <Compile Include="Helpers\Laravel\StorageTransactions.cs" />
     <Compile Include="Module.cs">
       <SubType>Component</SubType>
     </Compile>
diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInRows.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInRows.vb
index 83c2ad8..c12a72d 100644
--- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInRows.vb
+++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInRows.vb
@@ -433,6 +433,7 @@ Public Class OrderInRows
         End Get
     End Property
     '// Termeltetési szerződés miatt
+    <DataSourceCriteria("APCSheetHeader.Customers='@This.OrderInHeader.Customers' and APCSheetHeader.CustomersFrom='@This.OrderInHeader.CustomersFrom' and APCSheetHeader.IsActive = True")>
     Property APCSheetByProducts As APCSheetByProducts
         Get
             Return _APCSheetByProducts
diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInRowsOther.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInRowsOther.vb
index 7a2c99b..a03e436 100644
--- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInRowsOther.vb
+++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInRowsOther.vb
@@ -380,6 +380,7 @@ Public Class OrderInRowsOther 'Egyéb sorok
     End Property
 
     '// Termeltetési szerződés miatt
+    <DataSourceCriteria("APCSheetHeader.Customers='@This.OrderInHeader.Customers' and APCSheetHeader.CustomersFrom='@This.OrderInHeader.CustomersFrom' and APCSheetHeader.IsActive = True")>
     Property APCSheetByProducts As APCSheetByProducts
         Get
             Return _APCSheetByProducts
diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.vb
index b9b944a..3690e9f 100644
--- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.vb
+++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.vb
@@ -84,7 +84,12 @@ Public Class StorageDateVC
                     _StorageDateClearingPrice = New StorageDateClearingPrice(_uow)
                     _StorageDateClearingPrice.RowIndex = 1
                     _StorageDateClearingPrice.CustomersFrom = _InvoiceRows.InvoiceHeader.CustomersFrom
-                    _StorageDateClearingPrice.DateExecution = _InvoiceRows.InvoiceHeader.DateExecution.Date
+
+                    If _InvoiceRows.DeliveryNoteOutRows IsNot Nothing Then
+                        _StorageDateClearingPrice.DateExecution = _InvoiceRows.DeliveryNoteOutRows.DeliveryNoteOutHeader.DateExecution
+                    Else
+                        _StorageDateClearingPrice.DateExecution = _InvoiceRows.InvoiceHeader.DateExecution.Date
+                    End If
                     _StorageDateClearingPrice.InvoiceRows = _InvoiceRows
                     _StorageDateClearingPrice.Products = _InvoiceRows.OrderInRows.Products
                     _StorageDateClearingPrice.QTT_Out = _InvoiceRows.QTT
@@ -213,7 +218,11 @@ Public Class StorageDateVC
                     _StorageDateClearingPrice = New StorageDateClearingPrice(_uow)
                     _StorageDateClearingPrice.RowIndex = 1
                     _StorageDateClearingPrice.CustomersFrom = _InvoiceRows.InvoiceHeader.CustomersFrom
-                    _StorageDateClearingPrice.DateExecution = _InvoiceRows.InvoiceHeader.DateExecution.Date
+                    If _InvoiceRows.DeliveryNoteOutRows IsNot Nothing Then
+                        _StorageDateClearingPrice.DateExecution = _InvoiceRows.DeliveryNoteOutRows.DeliveryNoteOutHeader.DateExecution
+                    Else
+                        _StorageDateClearingPrice.DateExecution = _InvoiceRows.InvoiceHeader.DateExecution.Date
+                    End If
                     _StorageDateClearingPrice.InvoiceRows = _InvoiceRows
                     _StorageDateClearingPrice.Products = _InvoiceRows.OrderInRows.Products
                     _StorageDateClearingPrice.QTT_Out = _InvoiceRows.QTT
@@ -644,7 +653,11 @@ Public Class StorageDateVC
                     _StorageDateClearingPrice = New StorageDateClearingPrice(_uow)
                     _StorageDateClearingPrice.RowIndex = 1
                     _StorageDateClearingPrice.CustomersFrom = _InvoiceRows.InvoiceHeader.CustomersFrom
-                    _StorageDateClearingPrice.DateExecution = _InvoiceRows.InvoiceHeader.DateExecution.Date
+                    If _InvoiceRows.DeliveryNoteOutRows IsNot Nothing Then
+                        _StorageDateClearingPrice.DateExecution = _InvoiceRows.DeliveryNoteOutRows.DeliveryNoteOutHeader.DateExecution
+                    Else
+                        _StorageDateClearingPrice.DateExecution = _InvoiceRows.InvoiceHeader.DateExecution.Date
+                    End If
                     _StorageDateClearingPrice.InvoiceRows = _InvoiceRows
                     _StorageDateClearingPrice.Products = _InvoiceRows.OrderInRows.Products
                     _StorageDateClearingPrice.QTT_Out = _InvoiceRows.QTT
diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryHeader.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryHeader.vb
index 3e5a17b..11b1012 100644
--- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryHeader.vb
+++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryHeader.vb
@@ -437,13 +437,13 @@ Public Class RegistryHeader '-- iktatórendszer
 
 
     <RuleRequiredField("RegistryHeader.DocumentFile_If_Financial_Registry", "RegistryNextStep_Context", TargetCriteria:="DeliveryType<>'ePhone'")>
-    <Aggregated(), ExpandObjectMembers(ExpandObjectMembers.Never)>
+    <Aggregated(), ExpandObjectMembers(ExpandObjectMembers.Never), Delayed(True)>
     Property DocumentFile() As FileData
         Get
-            Return _DocumentFile
+            Return GetDelayedPropertyValue(Of FileData)("DocumentFile")
         End Get
         Set(ByVal value As FileData)
-            SetPropertyValue("DocumentFile", _DocumentFile, value)
+            SetDelayedPropertyValue(Of FileData)("DocumentFile", value)
         End Set
     End Property
     Property IsEditable As Boolean
diff --git a/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml b/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml
index 81fbda2..2ea7652 100644
--- a/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml
+++ b/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml
@@ -5615,9 +5615,9 @@
         <Member Name="PCIDetail" Caption="Nyitott p.ü. teljesítések" />
         <Member Name="PermissionAllowed" Caption="Engedélyezett" />
         <Member Name="QualityOption" Caption="Minőségi opció" />
-        <Member Name="row_APCSheetByProducts" Caption="Term. szerződés*" />
+        <Member Name="row_APCSheetByProducts" Caption="Term. szerződés (t)*" />
         <Member Name="row_DiscountPercent" Caption="Kedv.%*" />
-        <Member Name="row_o_APCSheetByProducts" Caption="Term. szerződés*" />
+        <Member Name="row_o_APCSheetByProducts" Caption="Term. szerződés (e)*" />
         <Member Name="row_o_CustomsTariffs" Caption="VTSZ./ SZJ.*" />
         <Member Name="row_o_Description" Caption="Leírás*" />
         <Member Name="row_o_DiscountPercent" Caption="Kedv. %*" />
diff --git a/Nuvolar.Module/Model.DesignedDiffs.xafml b/Nuvolar.Module/Model.DesignedDiffs.xafml
index 7365c1d..2734609 100644
--- a/Nuvolar.Module/Model.DesignedDiffs.xafml
+++ b/Nuvolar.Module/Model.DesignedDiffs.xafml
@@ -19463,8 +19463,8 @@
         <LayoutGroup Id="Main" RelativeSize="100" ImageName="">
           <LayoutGroup Id="SimpleEditors" RelativeSize="11" ImageName="">
             <LayoutGroup Id="JobNumberObjects" RelativeSize="100" ImageName="">
-              <LayoutItem Id="ParentObject" SizeConstraintsType="Default" RelativeSize="51" ViewItem="ParentObject" />
               <LayoutItem Id="Name" ViewItem="Name" SizeConstraintsType="Default" Index="1" RelativeSize="48" IsNewNode="True" />
+              <LayoutItem Id="ParentObject" SizeConstraintsType="Default" RelativeSize="51" ViewItem="ParentObject" />
             </LayoutGroup>
             <LayoutGroup Id="HCategory" RelativeSize="8" ImageName="" Direction="Horizontal" Removed="True">
               <LayoutItem Id="Name" ViewItem="Name" Removed="True" />