Átállás 17.2.3-ra

Related Work Items: #123
This commit is contained in:
2017-12-02 16:09:26 +01:00
parent 2b2f1b201c
commit 9cca882b34
201 changed files with 16991 additions and 3617 deletions
@@ -34,11 +34,11 @@ Public Class GLRowsVC
Frame.GetController(Of GLRowsVC).aGenerateGLReport.Active.SetItemValue("", False)
MyBase.OnActivated()
If View.Id Like "GLReport_GLReportRows_ListView*" Then
Frame.GetController(Of NewObjectViewController)().Active.SetItemValue("", False)
Frame.GetController(Of LinkUnlinkController)().Active.SetItemValue("", False)
Frame.GetController(Of ListViewProcessCurrentObjectController)().Active.SetItemValue("", False)
Frame.GetController(Of DeleteObjectsViewController)().Active.SetItemValue("", False)
Frame.GetController(Of ExportController).Active.SetItemValue("", True)
Frame.GetController(Of NewObjectViewController)()?.Active.SetItemValue("", False)
Frame.GetController(Of LinkUnlinkController)()?.Active.SetItemValue("", False)
Frame.GetController(Of ListViewProcessCurrentObjectController)()?.Active.SetItemValue("", False)
Frame.GetController(Of DeleteObjectsViewController)()?.Active.SetItemValue("", False)
Frame.GetController(Of ExportController)?.Active.SetItemValue("", True)
Frame.GetController(Of GLRowsVC).aGenerateGLReport.Active.SetItemValue("", True)
@@ -46,7 +46,7 @@ Public Class GLRowsVC
If TryCast(TryCast(View, ListView).CollectionSource, PropertyCollectionSource) IsNot Nothing Then
If TryCast(TryCast(TryCast(View, ListView).CollectionSource, PropertyCollectionSource).MasterObject, GLReport) IsNot Nothing Then
If TryCast(TryCast(TryCast(View, ListView).CollectionSource, PropertyCollectionSource).MasterObject, GLReport).InPublic Then
Frame.GetController(Of ViewVariantsModule.ChangeVariantController).Active.SetItemValue("", False)
Frame.GetController(Of ViewVariantsModule.ChangeVariantController)?.Active.SetItemValue("", False)
End If
End If
End If
@@ -58,7 +58,7 @@ Public Class GLRowsVC
If TryCast(TryCast(View, ListView).CollectionSource, PropertyCollectionSource) IsNot Nothing Then
If TryCast(TryCast(TryCast(View, ListView).CollectionSource, PropertyCollectionSource).MasterObject, GLReport) IsNot Nothing Then
If TryCast(TryCast(TryCast(View, ListView).CollectionSource, PropertyCollectionSource).MasterObject, GLReport).InPublic Then
Frame.GetController(Of ViewVariantsModule.ChangeVariantController).Active.SetItemValue("", False)
Frame.GetController(Of ViewVariantsModule.ChangeVariantController)?.Active.SetItemValue("", False)
End If
End If
End If
@@ -74,8 +74,8 @@ Public Class GLRowsVC
'Frame.GetController(Of ModificationsController).SaveAction.Active.SetItemValue("", False)
Frame.GetController(Of ModificationsController).SaveAndCloseAction.Active.SetItemValue("", False)
Frame.GetController(Of ModificationsController).SaveAndNewAction.Active.SetItemValue("", False)
Frame.GetController(Of DeleteObjectsViewController).Active.SetItemValue("", False)
Frame.GetController(Of CloneObjectViewController).Active.SetItemValue("", False)
Frame.GetController(Of DeleteObjectsViewController)?.Active.SetItemValue("", False)
Frame.GetController(Of CloneObjectViewController)?.Active.SetItemValue("", False)
Frame.GetController(Of GLRowsVC).aGenerateGLReport.Active.SetItemValue("", False)
End If
End If
@@ -87,8 +87,8 @@ Public Class GLRowsVC
End If
If View.Id = "GLReport_ListView_Public" Then
Frame.GetController(Of CloneObjectViewController).Active.SetItemValue("", True)
Frame.GetController(Of NewObjectViewController).Active.SetItemValue("", True)
Frame.GetController(Of CloneObjectViewController)?.Active.SetItemValue("", True)
Frame.GetController(Of NewObjectViewController)?.Active.SetItemValue("", True)
End If
If View.Id = "GLReport_ListView_Private" Then
If SecuritySystem.CurrentUserName = "SysAdmin" Then
@@ -99,14 +99,14 @@ Public Class GLRowsVC
End Sub
Protected Overrides Sub OnDeactivated()
MyBase.OnDeactivated()
'Frame.GetController(Of DevExpress.ExpressApp.SystemModule.ListViewProcessCurrentObjectController)().Active.SetItemValue("", True)
'Frame.GetController(Of DevExpress.ExpressApp.SystemModule.ListViewProcessCurrentObjectController)()?.Active.SetItemValue("", True)
If View.Id Like "GLReport_DetailView*" Then
Frame.GetController(Of ModificationsController).SaveAction.Active.SetItemValue("", True)
Frame.GetController(Of ModificationsController).SaveAndCloseAction.Active.SetItemValue("", True)
Frame.GetController(Of ModificationsController).SaveAndNewAction.Active.SetItemValue("", True)
Frame.GetController(Of DeleteObjectsViewController).Active.SetItemValue("", True)
Frame.GetController(Of CloneObjectViewController).Active.SetItemValue("", True)
Frame.GetController(Of DeleteObjectsViewController)?.Active.SetItemValue("", True)
Frame.GetController(Of CloneObjectViewController)?.Active.SetItemValue("", True)
Frame.GetController(Of GLRowsVC).aGenerateGLReport.Active.SetItemValue("", True)
End If
@@ -1197,7 +1197,7 @@ Public Class GLRowsVC
e.View = Application.CreateDetailView(_onew, "GLRowsCheck_DetailView", False, _GLRowsCheck)
End Sub
Private Sub aGLDTRChangeParam_Execute(sender As System.Object, e As DevExpress.ExpressApp.Actions.PopupWindowShowActionExecuteEventArgs) Handles aGLDTRChangeParam.Execute
Frame.GetController(Of DevExpress.ExpressApp.Validation.PersistenceValidationController)().Active.SetItemValue("", False)
Frame.GetController(Of DevExpress.ExpressApp.Validation.PersistenceValidationController)()?.Active.SetItemValue("", False)
Dim _ocur As Xpo.XPObjectSpace = TryCast(View.ObjectSpace, Xpo.XPObjectSpace)
Dim _GLRowsCheck As GLRowsCheck = TryCast(e.PopupWindow.View.SelectedObjects(0), GLRowsCheck)
Dim _GLRows As GLRows
@@ -1329,7 +1329,7 @@ Public Class GLRowsVC
Dim parentView As View = nestedFrame.View
parentView.ObjectSpace.Refresh()
End If
Frame.GetController(Of DevExpress.ExpressApp.Validation.PersistenceValidationController)().Active.SetItemValue("", True)
Frame.GetController(Of DevExpress.ExpressApp.Validation.PersistenceValidationController)()?.Active.SetItemValue("", True)
End Sub
Private Sub aSelectCustomersFrom_DTR_CustomizePopupWindowParams(sender As Object, e As DevExpress.ExpressApp.Actions.CustomizePopupWindowParamsEventArgs) Handles aSelectCustomersFrom_DTR.CustomizePopupWindowParams