Egyéb javítások

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

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

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

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