diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.vb
index c74d2f5..010b9ae 100644
--- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.vb
+++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInVC.vb
@@ -3795,7 +3795,15 @@ CheckError:
                     .DiscountPriceDEV = _DeliveryNoteOutRows.StorageOutRowsInRows.StorageOutRows.OrderInRows.DiscountPriceDEV
                     .DiscountPriceHUF = _DeliveryNoteOutRows.StorageOutRowsInRows.StorageOutRows.OrderInRows.DiscountPriceHUF
                     .ListPriceDEV = _DeliveryNoteOutRows.StorageOutRowsInRows.StorageOutRows.OrderInRows.ListPriceDEV
-                    .ListPriceHUF = _DeliveryNoteOutRows.StorageOutRowsInRows.StorageOutRows.OrderInRows.ListPriceHUF
+                    'Ha a DEVIZA != HUF, akkor itt kell árfolyam alapján újragenerálás !!!
+                    If .InvoiceHeader.CurrencyName.ShortName <> "HUF" And _ORI_Invoice_Popup.PriceMode = ePriceMode.eDEVToHUF Then
+                        .DiscountPriceHUF = _DeliveryNoteOutRows.StorageOutRowsInRows.StorageOutRows.OrderInRows.DiscountPriceDEV * _ORI_Invoice_Popup.CurrencyRate, 2, MidpointRounding.AwayFromZero)
+                        .ListPriceHUF = Math.Round(_DeliveryNoteOutRows.StorageOutRowsInRows.StorageOutRows.OrderInRows.ListPriceDEV * _ORI_Invoice_Popup.CurrencyRate, 2, MidpointRounding.AwayFromZero)
+                    Else
+                        .ListPriceHUF = _DeliveryNoteOutRows.StorageOutRowsInRows.StorageOutRows.OrderInRows.ListPriceHUF
+                    End If
+
+
                     .QTT = _DeliveryNoteOutRows.QTT_Will
                     .QualityOption = _onew.GetObject(_DeliveryNoteOutRows.StorageOutRowsInRows.StorageOutRows.OrderInRows.QualityOption)
                     .ShortName = _DeliveryNoteOutRows.StorageOutRowsInRows.StorageOutRows.OrderInRows.Products.ProductNumber + vbNewLine +
diff --git a/Nuvolar.Win.Lite/WinApplication.vb b/Nuvolar.Win.Lite/WinApplication.vb
index 3ebfdb8..5916201 100644
--- a/Nuvolar.Win.Lite/WinApplication.vb
+++ b/Nuvolar.Win.Lite/WinApplication.vb
@@ -20,24 +20,10 @@ Partial Public Class NuvolarWindowsFormsApplication
     End Sub
 
     Private Sub NuvolarWindowsFormsApplication_DatabaseVersionMismatch(ByVal sender As Object, ByVal e As DevExpress.ExpressApp.DatabaseVersionMismatchEventArgs) Handles MyBase.DatabaseVersionMismatch
-#If EASYTEST Then
+
         e.Updater.Update()
         e.Handled = True
-#Else
-        If System.Diagnostics.Debugger.IsAttached Then
-            e.Updater.Update()
-            e.Handled = True
-        Else
-            Throw New InvalidOperationException( _
-             "The application cannot connect to the specified database, because the latter doesn't exist or its version is older than that of the application." & vbCrLf & _
-             "This error occurred  because the automatic database update was disabled when the application was started without debugging." & vbCrLf & _
-             "To avoid this error, you should either start the application under Visual Studio in debug mode, or modify the " & _
-             "source code of the 'DatabaseVersionMismatch' event handler to enable automatic database update, " & _
-             "or manually create a database using the 'DBUpdater' tool." & vbCrLf & _
-             "Anyway, refer to the 'Update Application and Database Versions' help topic at http://www.devexpress.com/Help/?document=ExpressApp/CustomDocument2795.htm " & _
-             "for more detailed information. If this doesn't help, please contact our Support Team at http://www.devexpress.com/Support/Center/")
-        End If
-#End If
+
     End Sub
     Protected Overrides Function GetTraceLogDirectory() As String
         Return MyBase.GetTraceLogDirectory()