diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/AssetsHandling/AssetsPCIVC.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/AssetsHandling/AssetsPCIVC.vb
index 1311fd4..0a04682 100644
--- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/AssetsHandling/AssetsPCIVC.vb
+++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/AssetsHandling/AssetsPCIVC.vb
@@ -21,7 +21,7 @@ Public Class AssetsPCIVC
Inherits DevExpress.ExpressApp.ViewController
Public Event InitWork(ByVal _Minimum As Long, ByVal _Step As Long, ByVal _Maximum As Long)
Public Event DoWork()
- Public Event FinalWork
+ Public Event FinalWork()
Public selection As ArrayList
Private _ActiveForm As Boolean
Public Sub New()
@@ -240,132 +240,130 @@ Public Class AssetsPCIVC
_uow.CommitChanges()
Try
'-- Lekérdezés, adott teljesítési dátumig történő lekérdezés LINQ paranccsal
- '_PCI.Customers.IsAssetsHandling = True And
- Dim _AssetsPCICustomersFrom_XPQuery As New XPQuery(Of AssetsPCICustomersFrom)(_uow)
- Dim cquery = From _AssetsPCICustomersFrom_LINQ In _AssetsPCICustomersFrom_XPQuery
- Where _AssetsPCICustomersFrom_LINQ.AssetsPCIHeader.Oid = _AssetsPCIHeader.Oid
- Select _AssetsPCICustomersFrom_LINQ.CustomersFrom.Oid
-
- Dim PCI As New XPQuery(Of PCIDetail)(_uow, True)
+ Dim PCI As New XPQuery(Of PCIDetail)(_uow)
Dim query = From _PCI In PCI
- Where _PCI.DateExecution.Date <= _AssetsPCIHeader.DateClose.Date And
+ Where _PCI.DateExecution.Date <= _AssetsPCIHeader.DateClose.Date And
_PCI.Customers IsNot Nothing And
String.IsNullOrEmpty(_PCI.ConnectInfo) = False And
_PCI.PartnerType = ePartnerType.eReceivables And
_PCI.Customers.IsAssetsHandling = True And
- cquery.Contains(_PCI.CustomersFrom.Oid) And
_PCI.DatePayment_Account.Date <= _AssetsPCIHeader.DateClose.Date And
String.IsNullOrEmpty(_PCI.DateExecution_Account) = False
- Group _PCI By _PCI.CustomersFrom, _
- _PCI.Customers, _
- _PCI.PartnerType, _
- _PCI.CurrencyName_Account, _
- _PCI.ConnectInfo Into g = Group _
- Select New With {Key .CustomersFrom = CustomersFrom, _
- Key .Customers = Customers, _
- Key .PartnerType = PartnerType, _
- Key .ConnectInfo = ConnectInfo, _
+ Group _PCI By _PCI.CustomersFrom,
+ _PCI.Customers,
+ _PCI.PartnerType,
+ _PCI.CurrencyName_Account,
+ _PCI.ConnectInfo Into g = Group
+ Select New With {Key .CustomersFrom = CustomersFrom,
+ Key .Customers = Customers,
+ Key .PartnerType = PartnerType,
+ Key .ConnectInfo = ConnectInfo,
Key .CurrencyName_Account = CurrencyName_Account,
- Key .BallanceHUF = g.Sum(Function(inv) inv.BallanceHUF), _
- Key .BallanceDEV = g.Sum(Function(inv) inv.BallanceDEV), _
- Key .AmountHUF_Account = g.Sum(Function(inv) inv.AmountHUF_Account), _
- Key .AmountDEV_Account = g.Sum(Function(inv) inv.AmountDEV_Account), _
- Key .DatePayment = g.Max(Function(inv) inv.DatePayment_Account), _
- Key .DelayedDay = g.Max(Function(inv) inv.DelayedDay), _
- Key .DateExecution = g.Max(Function(inv) inv.DateExecution), _
+ Key .BallanceHUF = g.Sum(Function(inv) inv.BallanceHUF),
+ Key .BallanceDEV = g.Sum(Function(inv) inv.BallanceDEV),
+ Key .AmountHUF_Account = g.Sum(Function(inv) inv.AmountHUF_Account),
+ Key .AmountDEV_Account = g.Sum(Function(inv) inv.AmountDEV_Account),
+ Key .DatePayment = g.Max(Function(inv) inv.DatePayment_Account),
+ Key .DelayedDay = g.Max(Function(inv) inv.DelayedDay),
+ Key .DateExecution = g.Max(Function(inv) inv.DateExecution),
Key .DateCreated = g.Max(Function(inv) inv.DateCreated)}
RaiseEvent InitWork(1, 1, query.Count)
For Each item In query
- If item.CurrencyName_Account IsNot Nothing Then
- If Math.Round(item.BallanceHUF, 0, MidpointRounding.AwayFromZero) > 0 And item.CurrencyName_Account.ShortName = "HUF" Then
- If _AssetsPCIHeader.QueryCustomersFrom = True Then
- _AssetsPCIRows = New AssetsPCIRows(_uow)
- _AssetsPCIRows.AssetsPCIHeader = _AssetsPCIHeader
- _AssetsPCIRows.CustomersFrom = item.CustomersFrom
- _AssetsPCIRows.Customers = item.Customers
- _AssetsPCIRows.DateExecution = item.DateExecution
- _AssetsPCIRows.DateCreated = item.DateCreated
- _AssetsPCIRows.DatePayment = item.DatePayment
- _AssetsPCIRows.BallanceDEV = item.BallanceDEV
- _AssetsPCIRows.BallanceHUF = item.BallanceHUF
- _AssetsPCIRows.ConnectInfo = item.ConnectInfo
- _AssetsPCIRows.CurrencyName = item.CurrencyName_Account
- _AssetsPCIRows.DatePayment = item.DatePayment
- _AssetsPCIRows.DelayedDay = item.DelayedDay
- _AssetsPCIRows.PartnerType = item.PartnerType
- _AssetsPCIRows.AmountDEV_Account = item.AmountDEV_Account
- _AssetsPCIRows.AmountHUF_Account = item.AmountHUF_Account
- Else
- If TryCast(item.Customers, CustomersFrom) Is Nothing Then
- _AssetsPCIRows = New AssetsPCIRows(_uow)
- _AssetsPCIRows.AssetsPCIHeader = _AssetsPCIHeader
- _AssetsPCIRows.CustomersFrom = item.CustomersFrom
- _AssetsPCIRows.Customers = item.Customers
- _AssetsPCIRows.DateExecution = item.DateExecution
- _AssetsPCIRows.DateCreated = item.DateCreated
- _AssetsPCIRows.DatePayment = item.DatePayment
- _AssetsPCIRows.BallanceDEV = item.BallanceDEV
- _AssetsPCIRows.BallanceHUF = item.BallanceHUF
- _AssetsPCIRows.ConnectInfo = item.ConnectInfo
- _AssetsPCIRows.CurrencyName = item.CurrencyName_Account
- _AssetsPCIRows.DatePayment = item.DatePayment
- _AssetsPCIRows.DelayedDay = item.DelayedDay
- _AssetsPCIRows.PartnerType = item.PartnerType
- _AssetsPCIRows.AmountDEV_Account = item.AmountDEV_Account
- _AssetsPCIRows.AmountHUF_Account = item.AmountHUF_Account
- End If
+ For Each _AssetsPCICustomersFrom As AssetsPCICustomersFrom In _AssetsPCIHeader.AssetsPCICustomersFrom
+ If _AssetsPCICustomersFrom.CustomersFrom.Oid = item.CustomersFrom.Oid Then
+ If item.CurrencyName_Account IsNot Nothing Then
+ If Math.Round(item.BallanceHUF, 0, MidpointRounding.AwayFromZero) > 0 And item.CurrencyName_Account.ShortName = "HUF" Then
+ If _AssetsPCIHeader.QueryCustomersFrom = True Then
+ _AssetsPCIRows = New AssetsPCIRows(_uow)
+ _AssetsPCIRows.AssetsPCIHeader = _AssetsPCIHeader
+ _AssetsPCIRows.CustomersFrom = item.CustomersFrom
+ _AssetsPCIRows.Customers = item.Customers
+ _AssetsPCIRows.DateExecution = item.DateExecution
+ _AssetsPCIRows.DateCreated = item.DateCreated
+ _AssetsPCIRows.DatePayment = item.DatePayment
+ _AssetsPCIRows.BallanceDEV = item.BallanceDEV
+ _AssetsPCIRows.BallanceHUF = item.BallanceHUF
+ _AssetsPCIRows.ConnectInfo = item.ConnectInfo
+ _AssetsPCIRows.CurrencyName = item.CurrencyName_Account
+ _AssetsPCIRows.DatePayment = item.DatePayment
+ _AssetsPCIRows.DelayedDay = item.DelayedDay
+ _AssetsPCIRows.PartnerType = item.PartnerType
+ _AssetsPCIRows.AmountDEV_Account = item.AmountDEV_Account
+ _AssetsPCIRows.AmountHUF_Account = item.AmountHUF_Account
+ Else
+ If TryCast(item.Customers, CustomersFrom) Is Nothing Then
+ _AssetsPCIRows = New AssetsPCIRows(_uow)
+ _AssetsPCIRows.AssetsPCIHeader = _AssetsPCIHeader
+ _AssetsPCIRows.CustomersFrom = item.CustomersFrom
+ _AssetsPCIRows.Customers = item.Customers
+ _AssetsPCIRows.DateExecution = item.DateExecution
+ _AssetsPCIRows.DateCreated = item.DateCreated
+ _AssetsPCIRows.DatePayment = item.DatePayment
+ _AssetsPCIRows.BallanceDEV = item.BallanceDEV
+ _AssetsPCIRows.BallanceHUF = item.BallanceHUF
+ _AssetsPCIRows.ConnectInfo = item.ConnectInfo
+ _AssetsPCIRows.CurrencyName = item.CurrencyName_Account
+ _AssetsPCIRows.DatePayment = item.DatePayment
+ _AssetsPCIRows.DelayedDay = item.DelayedDay
+ _AssetsPCIRows.PartnerType = item.PartnerType
+ _AssetsPCIRows.AmountDEV_Account = item.AmountDEV_Account
+ _AssetsPCIRows.AmountHUF_Account = item.AmountHUF_Account
+ End If
- End If
- End If
- If Math.Round(item.BallanceDEV, 2, MidpointRounding.AwayFromZero) > 0 And item.CurrencyName_Account.ShortName <> "HUF" Then
- If TryCast(item.Customers, CustomersFrom) Is Nothing Then
- _AssetsPCIRows = New AssetsPCIRows(_uow)
- _AssetsPCIRows.AssetsPCIHeader = _AssetsPCIHeader
- _AssetsPCIRows.CustomersFrom = item.CustomersFrom
- _AssetsPCIRows.Customers = item.Customers
- _AssetsPCIRows.DateExecution = item.DateExecution
- _AssetsPCIRows.DateCreated = item.DateCreated
- _AssetsPCIRows.DatePayment = item.DatePayment
- _AssetsPCIRows.BallanceDEV = item.BallanceDEV
- _AssetsPCIRows.BallanceHUF = item.BallanceHUF
- _AssetsPCIRows.ConnectInfo = item.ConnectInfo
- _AssetsPCIRows.CurrencyName = item.CurrencyName_Account
- _AssetsPCIRows.DatePayment = item.DatePayment
- _AssetsPCIRows.DelayedDay = item.DelayedDay
- _AssetsPCIRows.PartnerType = item.PartnerType
- _AssetsPCIRows.AmountDEV_Account = item.AmountDEV_Account
- _AssetsPCIRows.AmountHUF_Account = item.AmountHUF_Account
- Else
- If TryCast(item.Customers, CustomersFrom) IsNot Nothing Then
- _AssetsPCIRows = New AssetsPCIRows(_uow)
- _AssetsPCIRows.AssetsPCIHeader = _AssetsPCIHeader
- _AssetsPCIRows.CustomersFrom = item.CustomersFrom
- _AssetsPCIRows.Customers = item.Customers
- _AssetsPCIRows.DateExecution = item.DateExecution
- _AssetsPCIRows.DateCreated = item.DateCreated
- _AssetsPCIRows.DatePayment = item.DatePayment
- _AssetsPCIRows.BallanceDEV = item.BallanceDEV
- _AssetsPCIRows.BallanceHUF = item.BallanceHUF
- _AssetsPCIRows.ConnectInfo = item.ConnectInfo
- _AssetsPCIRows.CurrencyName = item.CurrencyName_Account
- _AssetsPCIRows.DatePayment = item.DatePayment
- _AssetsPCIRows.DelayedDay = item.DelayedDay
- _AssetsPCIRows.PartnerType = item.PartnerType
- _AssetsPCIRows.AmountDEV_Account = item.AmountDEV_Account
- _AssetsPCIRows.AmountHUF_Account = item.AmountHUF_Account
+ End If
+ End If
+ If Math.Round(item.BallanceDEV, 2, MidpointRounding.AwayFromZero) > 0 And item.CurrencyName_Account.ShortName <> "HUF" Then
+ If TryCast(item.Customers, CustomersFrom) Is Nothing Then
+ _AssetsPCIRows = New AssetsPCIRows(_uow)
+ _AssetsPCIRows.AssetsPCIHeader = _AssetsPCIHeader
+ _AssetsPCIRows.CustomersFrom = item.CustomersFrom
+ _AssetsPCIRows.Customers = item.Customers
+ _AssetsPCIRows.DateExecution = item.DateExecution
+ _AssetsPCIRows.DateCreated = item.DateCreated
+ _AssetsPCIRows.DatePayment = item.DatePayment
+ _AssetsPCIRows.BallanceDEV = item.BallanceDEV
+ _AssetsPCIRows.BallanceHUF = item.BallanceHUF
+ _AssetsPCIRows.ConnectInfo = item.ConnectInfo
+ _AssetsPCIRows.CurrencyName = item.CurrencyName_Account
+ _AssetsPCIRows.DatePayment = item.DatePayment
+ _AssetsPCIRows.DelayedDay = item.DelayedDay
+ _AssetsPCIRows.PartnerType = item.PartnerType
+ _AssetsPCIRows.AmountDEV_Account = item.AmountDEV_Account
+ _AssetsPCIRows.AmountHUF_Account = item.AmountHUF_Account
+ Else
+ If TryCast(item.Customers, CustomersFrom) IsNot Nothing Then
+ _AssetsPCIRows = New AssetsPCIRows(_uow)
+ _AssetsPCIRows.AssetsPCIHeader = _AssetsPCIHeader
+ _AssetsPCIRows.CustomersFrom = item.CustomersFrom
+ _AssetsPCIRows.Customers = item.Customers
+ _AssetsPCIRows.DateExecution = item.DateExecution
+ _AssetsPCIRows.DateCreated = item.DateCreated
+ _AssetsPCIRows.DatePayment = item.DatePayment
+ _AssetsPCIRows.BallanceDEV = item.BallanceDEV
+ _AssetsPCIRows.BallanceHUF = item.BallanceHUF
+ _AssetsPCIRows.ConnectInfo = item.ConnectInfo
+ _AssetsPCIRows.CurrencyName = item.CurrencyName_Account
+ _AssetsPCIRows.DatePayment = item.DatePayment
+ _AssetsPCIRows.DelayedDay = item.DelayedDay
+ _AssetsPCIRows.PartnerType = item.PartnerType
+ _AssetsPCIRows.AmountDEV_Account = item.AmountDEV_Account
+ _AssetsPCIRows.AmountHUF_Account = item.AmountHUF_Account
+ End If
+ End If
End If
End If
End If
- End If
+
+ Next
RaiseEvent DoWork()
Next
_uow.CommitChanges()
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
Catch ex As Exception
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
MsgBox(ex.Message)
End Try
@@ -431,7 +429,7 @@ Public Class AssetsPCIVC
_Customers = _uow.GetObjectByKey(Of Customers)(_AssetsPCIRows.Customers.Oid)
_CustomersFrom = _uow.GetObjectByKey(Of CustomersFrom)(_AssetsPCIRows.CustomersFrom.Oid)
- _AssetsHandling_Last_Collection = New XPCollection(Of AssetsHandling)(_uow, CriteriaOperator.Parse("Customers=? And CustomersFrom=? And DocumentNumber=?", _
+ _AssetsHandling_Last_Collection = New XPCollection(Of AssetsHandling)(_uow, CriteriaOperator.Parse("Customers=? And CustomersFrom=? And DocumentNumber=?",
_Customers, _CustomersFrom, _AssetsPCIRows.ConnectInfo))
_AssetsHandling_Last_Collection.Sorting().Add(New SortProperty("QueueIndex", DB.SortingDirection.Descending))
@@ -449,7 +447,7 @@ Public Class AssetsPCIVC
- If (_QueueIndex = 0 And _SysDate >= _AssetsPCIRows.DatePayment.Date.AddDays(_AssetsHandlingParameter.TolerationDay1)) Or _
+ If (_QueueIndex = 0 And _SysDate >= _AssetsPCIRows.DatePayment.Date.AddDays(_AssetsHandlingParameter.TolerationDay1)) Or
(_QueueIndex = 1 And _SysDate >= _AssetsPCIRows.DatePayment.Date.AddDays(_AssetsHandlingParameter.TolerationDay2)) Then
For Each _AssetsHandling_Last In _AssetsHandling_Last_Collection
@@ -490,7 +488,8 @@ Public Class AssetsPCIVC
If I Mod 1000 = 0 Then _uow.CommitChanges()
Next
_uow.CommitChanges()
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
+
If Frame.GetController(Of RefreshController).RefreshAction.Enabled Then
Frame.GetController(Of RefreshController).RefreshAction.DoExecute()
End If
@@ -504,7 +503,7 @@ Public Class AssetsPCIVC
Dim _InvoiceHeader As InvoiceHeader
_PCIGroup = TryCast(View.SelectedObjects(0), PCIGroup)
If _PCIGroup IsNot Nothing Then
- _invoiceheader = _PCIGroup.InvoiceHeader
+ _InvoiceHeader = _PCIGroup.InvoiceHeader
If _InvoiceHeader IsNot Nothing Then
CreateLateCharges(_ocur.Session, _InvoiceHeader, Now, True, True)
@@ -553,7 +552,7 @@ Public Class AssetsPCIVC
Throw New UserFriendlyException("Nincs kiválasztott elem.")
End If
End If
-
+
End Sub
Private Sub aViewLateCharges_Execute(sender As System.Object, e As DevExpress.ExpressApp.Actions.PopupWindowShowActionExecuteEventArgs) Handles aViewLateCharges.Execute
@@ -576,7 +575,7 @@ Public Class AssetsPCIVC
'Az összes a lejáratot megelőző fizetéssel a kollekciót növelni kell
Dim _PCID_Before As PCIDetail = Nothing
Dim _PCID_Before_Collection As New XPCollection(Of PCIDetail) _
- (_uow, CriteriaOperator.Parse("CustomersFrom=? and Customers=? and PartnerType=0 and ConnectInfo=? and MainType <>'01-Account' and MainType<>'06-Latecharge' and GetDate(DateExecution)<=?", _
+ (_uow, CriteriaOperator.Parse("CustomersFrom=? and Customers=? and PartnerType=0 and ConnectInfo=? and MainType <>'01-Account' and MainType<>'06-Latecharge' and GetDate(DateExecution)<=?",
_InvoiceHeader.CustomersFrom, _InvoiceHeader.Customers, _InvoiceHeader.DocumentNumber, _InvoiceHeader.DatePayment.Date))
For Each _PCID_Before In _PCID_Before_Collection
_TotalBruttoPayedBefore += _PCID_Before.BallanceHUF
@@ -630,13 +629,13 @@ Public Class AssetsPCIVC
_LateCharges_Collection.Add(_LateCharges)
Next
-
+
_LateCharges_Collection.Sorting.Add(New SortProperty("GetDate(DateExecution)", DB.SortingDirection.Ascending))
Dim _PCID As PCIDetail = Nothing
Dim _PCID_Collection As New XPCollection(Of PCIDetail) _
- (_uow, CriteriaOperator.Parse("CustomersFrom=? and Customers=? and PartnerType=0 and ConnectInfo=? and MainType <>'01-Account' and MainType<>'06-Latecharge' and GetDate(DateExecution)>?", _
+ (_uow, CriteriaOperator.Parse("CustomersFrom=? and Customers=? and PartnerType=0 and ConnectInfo=? and MainType <>'01-Account' and MainType<>'06-Latecharge' and GetDate(DateExecution)>?",
_InvoiceHeader.CustomersFrom, _InvoiceHeader.Customers, _InvoiceHeader.DocumentNumber, _InvoiceHeader.DatePayment.Date))
_PCID_Collection.Sorting.Add(New SortProperty("GetDate(DateExecution)", DB.SortingDirection.Ascending))
@@ -676,7 +675,7 @@ Public Class AssetsPCIVC
_I = 0
For Each _LateCharges In _LateCharges_Collection
If _I = 0 Then
-
+
Else
_LateChargesHUF = ((_LateCharges.CapitalBalanceHUF * _LateCharges.CurrentLateChargesPercent) / 365)
_LateChargesBalanceHUF += _LateChargesHUF
@@ -708,7 +707,7 @@ Public Class AssetsPCIVC
'-- A pénzügyi teljesítések kollekciója
Dim _PCID As PCIDetail
Dim _PCID_Collection As New XPCollection(Of PCIDetail) _
- (_uow, CriteriaOperator.Parse("CustomersFrom=? and Customers=? and PartnerType=0 and ConnectInfo=? and MainType <>'01-Account'", _
+ (_uow, CriteriaOperator.Parse("CustomersFrom=? and Customers=? and PartnerType=0 and ConnectInfo=? and MainType <>'01-Account'",
_InvoiceHeader.CustomersFrom, _InvoiceHeader.Customers, _InvoiceHeader.DocumentNumber))
_PCID_Collection.Sorting.Add(New SortProperty("GetDate(DateExecution)", DB.SortingDirection.Ascending))
Dim _AssetsHandling_Collection As New XPCollection(Of AssetsHandling)(_uow, CriteriaOperator.Parse("InvoiceHeader=?", _InvoiceHeader))
@@ -919,7 +918,7 @@ Public Class AssetsPCIVC
' _Deletable_LateCharge.Delete() 'Erre nincs szükség.
'End If
If _StatusBar Then
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
End If
If _WithTransaction Then
_uow.CommitChanges()
@@ -941,7 +940,7 @@ Public Class AssetsPCIVC
_InvoiceHeader = _uow.GetObjectByKey(Of InvoiceHeader)(_PCIGroup.InvoiceHeader.Oid)
CreateLateCharges(_uow, _InvoiceHeader, Now, True)
- Dim _LateCharges_Collection As New XPCollection(Of LateCharges)(_uow, _
+ Dim _LateCharges_Collection As New XPCollection(Of LateCharges)(_uow,
CriteriaOperator.Parse("InvoiceHeader=?", _InvoiceHeader))
_LateCharges_Collection.Sorting.Add(New SortProperty("DateExecution", DB.SortingDirection.Descending))
For Each _LateCharges In _LateCharges_Collection
@@ -952,7 +951,7 @@ Public Class AssetsPCIVC
End If
Next
_uow.CommitChanges()
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
Frame.GetController(Of DevExpress.ExpressApp.Validation.PersistenceValidationController).Active.SetItemValue("", True)
Else
Dim _AssetsHandling As AssetsHandling
@@ -970,7 +969,7 @@ Public Class AssetsPCIVC
If _AssetsHandling.NoAssetsHandling = False Then 'And _AssetsHandling.QueueIndex = 1 Then
CreateLateCharges(_ocur.Session, _AssetsHandling.InvoiceHeader, _AssetsHandling.DateClose, True)
End If
- Dim _LateCharges_Collection As New XPCollection(Of LateCharges)(_ocur.Session, _
+ Dim _LateCharges_Collection As New XPCollection(Of LateCharges)(_ocur.Session,
CriteriaOperator.Parse("InvoiceHeader=?", _AssetsHandling.InvoiceHeader))
_LateCharges_Collection.Sorting.Add(New SortProperty("DateExecution", DB.SortingDirection.Descending))
For Each _LateCharges In _LateCharges_Collection
@@ -980,9 +979,9 @@ Public Class AssetsPCIVC
Next
Next
_ocur.CommitChanges()
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
End If
-
+
End Sub
@@ -1001,7 +1000,7 @@ Public Class AssetsPCIVC
_AssetsHandling.NoAssetsHandling = True
End If
Next
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
_uow.CommitChanges()
Else
Throw New UserFriendlyException("Nincs kiválasztott elem.")
@@ -1016,7 +1015,7 @@ Public Class AssetsPCIVC
RaiseEvent DoWork()
_AssetsHandling.CountLateCharges = Not _AssetsHandling.CountLateCharges
Next
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
_uow.CommitChanges()
Else
Throw New UserFriendlyException("Nincs kiválasztott elem.")
@@ -1066,7 +1065,7 @@ Public Class AssetsPCIVC
RaiseEvent DoWork()
GLFunctions.ReconfigurePCI(_uow, _AssetsPCIRows.CustomersFrom, _AssetsPCIRows.Customers, ePartnerType.eReceivables, _AssetsPCIRows.ConnectInfo)
Next
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
End Sub
Private Sub aAssetsHandling_CreateSendEmailQueue_Execute(sender As Object, e As SimpleActionExecuteEventArgs) Handles aAssetsHandling_CreateSendEmailQueue.Execute
@@ -1175,7 +1174,7 @@ Public Class AssetsPCIVC
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.OkOnly + MsgBoxStyle.Critical, String.Format(CaptionHelper.GetLocalizedText("Exceptions\NuvolarExceptions", "MsgBoxCheckItAgain")))
Finally
- If _ActiveForm Then RaiseEvent FinalWork
+ If _ActiveForm Then RaiseEvent FinalWork()
End Try
End Sub
@@ -1186,8 +1185,8 @@ Public Class AssetsPCIVC
Dim _AssetsHandling2 As AssetsHandling
For Each _AssetsHandling In View.SelectedObjects
If _AssetsHandling.EMailSendQueueRows IsNot Nothing Then
- _AssetsHandling_Collection = New XPCollection(Of AssetsHandling)(_ocur.Session, _
- CriteriaOperator.Parse("EMailSendQueueRows=?", _
+ _AssetsHandling_Collection = New XPCollection(Of AssetsHandling)(_ocur.Session,
+ CriteriaOperator.Parse("EMailSendQueueRows=?",
_AssetsHandling.EMailSendQueueRows))
_AssetsHandling.EMailSendQueueRows.Delete()
For Each _AssetsHandling2 In _AssetsHandling_Collection
@@ -1238,7 +1237,7 @@ Public Class AssetsPCIVC
If _AssetsHandlingGroupChange.IsLateChargeModifies Then _AssetsHandling.InvoiceHeader.IsLateCharge = _AssetsHandlingGroupChange.IsLateCharge
Next
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
_ocur.CommitChanges()
Frame.GetController(Of Validation.PersistenceValidationController).Active.SetItemValue("", True)
End Sub
@@ -1255,7 +1254,7 @@ Public Class AssetsPCIVC
Dim _DateClose As Date = _AssetsHandling.DateClose
Dim _CS As New CollectionSource(_onew, GetType(LateCharges))
Dim _InvoiceHeader As InvoiceHeader = _ocur.FindObject(Of InvoiceHeader) _
- (CriteriaOperator.Parse("CustomersFrom=? and Customers=? and DocumentNumber=?", _
+ (CriteriaOperator.Parse("CustomersFrom=? and Customers=? and DocumentNumber=?",
_CustomersFrom, _Customers, _DocumentNumber))
If _InvoiceHeader IsNot Nothing Then
@@ -1382,7 +1381,7 @@ Public Class AssetsPCIVC
End If
Next
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
End Sub
@@ -1399,7 +1398,7 @@ Public Class AssetsPCIVC
If _PCIGroup.InvoiceHeader.AssetsHandling_GLMixed IsNot Nothing Then
-
+
_onew.Delete(_PCIGroup.InvoiceHeader.AssetsHandling_GLMixed.GLRows)
_onew.Delete(_PCIGroup.InvoiceHeader.AssetsHandling_GLMixed)
_PCIGroup.InvoiceHeader.AssetsHandling_GLMixed = Nothing
@@ -1409,7 +1408,7 @@ Public Class AssetsPCIVC
End If
Next
- RaiseEvent FinalWork
+ RaiseEvent FinalWork()
End Sub
Private Sub aPrintLateChargesDocument_Execute(sender As Object, e As SimpleActionExecuteEventArgs) Handles aPrintLateChargesDocument.Execute
diff --git a/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml b/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml
index 24391a8..81fbda2 100644
--- a/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml
+++ b/Nuvolar.Module/Model.DesignedDiffs.Localization.hu.xafml
@@ -73,6 +73,7 @@
+
diff --git a/Nuvolar.Module/Model.DesignedDiffs.xafml b/Nuvolar.Module/Model.DesignedDiffs.xafml
index 7151e80..e8bdf4e 100644
--- a/Nuvolar.Module/Model.DesignedDiffs.xafml
+++ b/Nuvolar.Module/Model.DesignedDiffs.xafml
@@ -71,6 +71,7 @@
+