diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceCreditNote/InvoiceCreditNote_VC.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceCreditNote/InvoiceCreditNote_VC.vb index bc88c53..185ddf4 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceCreditNote/InvoiceCreditNote_VC.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceCreditNote/InvoiceCreditNote_VC.vb @@ -288,17 +288,17 @@ Public Class InvoiceCreditNote_VC 'Betárolás véglegesítése For Each _StorageInRows As StorageInRows In _StorageInHeader.StorageInRows - Dim _StorageComputed As StorageComputed = _onew.FindObject(Of StorageComputed)(CriteriaOperator.Parse("Products=? and Storage=?", _ - _onew.GetObject(_StorageInRows.Products), _onew.GetObject(_StorageInHeader.Storage))) + Dim _StorageComputed As StorageComputed = _ocur.FindObject(Of StorageComputed)(CriteriaOperator.Parse("Products=? and Storage=?", + _ocur.GetObject(_StorageInRows.Products), _ocur.GetObject(_StorageInHeader.Storage))) If _StorageInRows.QTT_Will > 0 Then _StorageInRows.QTT = _StorageInRows.QTT_Will _StorageComputed.QTTFree += _StorageInRows.QTT_Will _StorageComputed.QTTReservedIn -= _StorageInRows.QTT_Will - Dim _StorageMoveEvents As New StorageMoveEvents(_onew.Session) + Dim _StorageMoveEvents As New StorageMoveEvents(_ocur.Session) With _StorageMoveEvents - .StorageInRows = _onew.GetObject(_StorageInRows) + .StorageInRows = _ocur.GetObject(_StorageInRows) .QTT = _StorageInRows.QTT_Will .QTT_Free_After = _StorageComputed.QTTFree .QTT_Free_Before = _StorageMoveEvents.QTT_Free_After - _StorageMoveEvents.QTT @@ -320,7 +320,7 @@ Public Class InvoiceCreditNote_VC Next _ocur.CommitChanges() - Dim _ReportData_Storage As ReportData = _onew.FindObject(Of ReportData)(CriteriaOperator.Parse("Oid=?", _StorageInHeader.Storage.ReportIn.Oid), True) + Dim _ReportData_Storage As ReportData = _ocur.FindObject(Of ReportData)(CriteriaOperator.Parse("Oid=?", _StorageInHeader.Storage.ReportIn.Oid), True) If _ReportData_Storage Is Nothing Or _StorageInHeader Is Nothing Then Else Frame.GetController(Of Reports.ReportServiceController).ShowPreview(_ReportData_Storage, CriteriaOperator.Parse("StorageInHeader.DocumentNumber =?", _StorageInHeader.DocumentNumber), True) diff --git a/Nuvolar.Module/BusinessObjects/GeneralObjects/Locking/LockingModule.vb b/Nuvolar.Module/BusinessObjects/GeneralObjects/Locking/LockingModule.vb index 7ba4511..71e47be 100644 --- a/Nuvolar.Module/BusinessObjects/GeneralObjects/Locking/LockingModule.vb +++ b/Nuvolar.Module/BusinessObjects/GeneralObjects/Locking/LockingModule.vb @@ -6,6 +6,7 @@ Imports DevExpress.ExpressApp.Model Public Module LockingModule Public Function LockObject(_Paramuow As UnitOfWork, _ParamObjectType As Type, _ParamObjectKey As String, _ParamUser As User) As Boolean + UnLockObject(_Paramuow, _ParamObjectType, _ParamObjectKey, _ParamUser) Dim _IsLocked As Boolean = False Dim _TableName As String Dim _LockingObject As LockingObject diff --git a/Nuvolar.Win.Lite/Nuvolar.Win.Lite.vbproj b/Nuvolar.Win.Lite/Nuvolar.Win.Lite.vbproj index 56fd7a9..87c250f 100644 --- a/Nuvolar.Win.Lite/Nuvolar.Win.Lite.vbproj +++ b/Nuvolar.Win.Lite/Nuvolar.Win.Lite.vbproj @@ -278,9 +278,6 @@ - - True - False True