From dd449f32d7c6d00d1c0312838714f695a678cca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Iv=C3=A1n?= Date: Mon, 12 Mar 2018 10:53:58 +0100 Subject: [PATCH] =?UTF-8?q?Jel=C3=B6l=C5=91=20adatok=20IsActive=20Mez?= =?UTF-8?q?=C5=91gazdas=C3=A1g=20termeltet=C3=A9s=20IsActive=20Sz=C3=A1mvi?= =?UTF-8?q?teli=20k=C3=A9szletn=C3=A9l=20sz=C3=A1ll=C3=ADt=C3=B3lev=C3=A9l?= =?UTF-8?q?=20DateExecution?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Contract/ContractRows.vb | 6 +- .../Contract/Contracts.vb | 2 + .../Contract/Popup/ContractModifyData.vb | 6 +- .../Contract/Popup/ContractRowsModifyData.vb | 2 + .../Popup/DeliveryNoteInToStorageInHeader.vb | 1 + .../DeliveryNote/Popup/DeliveryNoteView.vb | 1 + .../Estate/CRM/CRMEstate_Opportunity_Rent.vb | 3 +- .../ImmovablesCostRecordContactRow.vb | 4 +- .../CostRecord/ImmovablesCostRecordGroup.vb | 1 + .../Estate/Stocks/Immovables.vb | 3 +- .../Stocks/ImmovablesGroupsParameters.vb | 1 + .../InvoiceCreditNoteHeader.vb | 3 +- .../Invoice/InvoiceHeader.vb | 2 + .../Invoice/InvoiceRows.vb | 4 +- .../Invoice/Popup/InvoiceAdvancePopup.vb | 2 + .../Popup/InvoiceRows_Changer_Popup.vb | 12 ++-- .../Orders/OrdersIn/OrderInHeader.vb | 2 +- .../Orders/OrdersIn/OrderInParameters.vb | 1 + .../Orders/OrdersIn/OrderInRowsOther.vb | 2 + .../OrdersIn/Popup/ORI_Invoice_Popup.vb | 1 + .../Production/RecipeFrom.vb | 1 + .../Production/RecipeTo.vb | 1 + .../TakeOver/TakeoverProtocol.vb | 5 +- .../TakeOver/TakeoverProtocolRows.vb | 1 + .../Business/Products/Products.vb | 14 +++++ .../StorageInfromDeliveryNoteInRowsHeader.vb | 3 +- .../StorageTransactions/In/StorageInHeader.vb | 8 ++- .../Inventory/InventoryHeader.vb | 1 + .../Inventory/InventoryParameters.vb | 3 +- .../PopUp/CreateInventoryHeader_PopUp.vb | 3 +- .../Out/StorageOutCirculation.vb | 1 + .../Out/StorageOutHeader.vb | 4 +- .../PDA/StorageInFromPDACollectionPopup.vb | 3 +- .../StorageTransactions/Storage/Storage.vb | 13 ++++ .../Storage/StorageComputed.vb | 1 + .../Storage/StorageDateVC.Designer.vb | 61 ++++--------------- .../Storage/StorageDateVC.resx | 18 +++--- .../Storage/StorageDateVC.vb | 16 ++++- .../Storage/StorageLocation.vb | 1 + .../Storage/StorageMoveType.vb | 1 + .../Business/Worksheet/WorkPlace.vb | 1 + .../Business/Worksheet/Worksheet_Header.vb | 6 +- .../FinancialTransactions/Base/GLHeader.vb | 6 +- .../FinancialTransactions/Base/GLRows.vb | 14 +++-- .../Base/Popup/GLRowsDivideH.vb | 28 +++++---- .../Base/Popup/GLRowsDivideR.vb | 1 + .../BookEntry/BookEntryCheck.vb | 22 +++---- .../BookEntry/GLAccountRowsforBookEntry.vb | 10 +-- .../Fixed Assets/FixedAssets.vb | 4 +- .../Fixed Assets/FixedAssetsCard.vb | 3 +- .../Fixed Assets/FixedAssetsUsingHeader.vb | 1 + .../Popup/GLRowsCheck.vb | 14 ++--- .../Reports/Card/GLCardsRows.vb | 2 + .../Reports/DTR/GLReportCashflowRows.vb | 10 ++- .../Reports/DTR/GLReportRows.vb | 4 ++ .../ProjectPlan/ProjectPlanRows.vb | 4 ++ ...stryRowsFinancialControllingPopupWindow.vb | 3 + ...nancialControlling_ReInvoicePopupWindow.vb | 12 ++-- .../RegistryTaskGoToNewtStepWithGLAccount.vb | 18 +++--- .../Registry/RegistryHeader.vb | 6 ++ .../RegistryRowsFinancialControlling.vb | 12 ++-- .../Registry/RegistryTasks.vb | 9 ++- .../Registry/Telephone/RegistryTelephone.vb | 1 + .../FinancialObjects/Stocks/5D/Controlling.vb | 15 ++++- .../FinancialObjects/Stocks/5D/CostHolder.vb | 14 ++++- .../FinancialObjects/Stocks/5D/CostPlace.vb | 13 ++++ .../Stocks/5D/JobNumberObjects.vb | 10 ++- .../Stocks/5D/UniqueObjects.vb | 30 ++++++--- .../GeneralObjects/Cars/Cars.vb | 1 + .../GeneralObjects/HR/HRPerson.vb | 1 + .../GeneralObjects/Phones/Phones.vb | 2 +- Nuvolar.Module/Model.DesignedDiffs.xafml | 16 ++--- Nuvolar.Module/My Project/licenses.licx | 2 + Nuvolar.Module/Updater.vb | 44 ++++++------- 74 files changed, 355 insertions(+), 202 deletions(-) diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Contract/ContractRows.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Contract/ContractRows.vb index 2640dac..e5953e2 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Contract/ContractRows.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Contract/ContractRows.vb @@ -372,7 +372,8 @@ Public Class ContractRows 'Szerz End If End Set End Property - _ + + Property CostPlace As CostPlace Get Return _CostPlace @@ -396,7 +397,8 @@ Public Class ContractRows 'Szerz End If End Set End Property - _ + + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Contract/Contracts.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Contract/Contracts.vb index d647461..7f699a6 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Contract/Contracts.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Contract/Contracts.vb @@ -363,6 +363,7 @@ Public Class Contracts 'SzerzÅ‘dések SetPropertyValue("DocumentBody", _DocumentBody, value) End Set End Property + Property JobNumberObjects() As JobNumberObjects Get @@ -372,6 +373,7 @@ Public Class Contracts 'SzerzÅ‘dések SetPropertyValue("JobNumberObjects", _JobNumberObjects, value) End Set End Property + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Contract/Popup/ContractModifyData.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Contract/Popup/ContractModifyData.vb index e3ddb69..f641ee7 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Contract/Popup/ContractModifyData.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Contract/Popup/ContractModifyData.vb @@ -9,7 +9,7 @@ Imports DevExpress.Persistent.Base Imports DevExpress.Persistent.BaseImpl Imports DevExpress.Persistent.Validation - _ + Public Class ContractModifyData Inherits BaseObject Public Sub New(ByVal session As Session) @@ -45,10 +45,10 @@ Public Class ContractModifyData Property CurrencyName_Invoice As CurrencyName Property IsJobNumberObjects As Boolean = False - Property JobNumberObjects As JobNumberObjects + Property JobNumberObjects As JobNumberObjects Property IsUniqueObjects As Boolean = False - Property UniqueObjects As UniqueObjects + Property UniqueObjects As UniqueObjects Property IsHRResponsible As Boolean = False Property HRResponsible As HRPerson diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Contract/Popup/ContractRowsModifyData.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Contract/Popup/ContractRowsModifyData.vb index 327ca59..915af2e 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Contract/Popup/ContractRowsModifyData.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Contract/Popup/ContractRowsModifyData.vb @@ -180,6 +180,7 @@ Public Class ContractRowsModifyData SetPropertyValue("JobNumberObjects", _JobNumberObjects, value) End Set End Property + Property IsJobNumberObjects As Boolean Get Return _IsJobNumberObjects @@ -188,6 +189,7 @@ Public Class ContractRowsModifyData SetPropertyValue("IsJobNumberObjects", _IsJobNumberObjects, value) End Set End Property + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/DeliveryNoteIn/Popup/DeliveryNoteInToStorageInHeader.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/DeliveryNoteIn/Popup/DeliveryNoteInToStorageInHeader.vb index 8182181..09fbc59 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/DeliveryNoteIn/Popup/DeliveryNoteInToStorageInHeader.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/DeliveryNoteIn/Popup/DeliveryNoteInToStorageInHeader.vb @@ -24,6 +24,7 @@ Public Class DeliveryNoteInToStorageInHeader MyBase.AfterConstruction() IsRegistry = False End Sub + Property Storage As Storage Get Return _Storage diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/Popup/DeliveryNoteView.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/Popup/DeliveryNoteView.vb index fbd7d65..e7a2a54 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/Popup/DeliveryNoteView.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/DeliveryNote/Popup/DeliveryNoteView.vb @@ -111,6 +111,7 @@ Public Class DeliveryNoteView ' -- szállítólevél készítéséhez a popup-ho SetPropertyValue("Note", _Note, value) End Set End Property + Property Storage As Storage Get Return _Storage diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/CRM/CRMEstate_Opportunity_Rent.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/CRM/CRMEstate_Opportunity_Rent.vb index ae697b1..0e52501 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/CRM/CRMEstate_Opportunity_Rent.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/CRM/CRMEstate_Opportunity_Rent.vb @@ -180,7 +180,7 @@ Public Class CRMEstate_Opportunity_Rent SetPropertyValue("PaymentOption", _PaymentOption, value) End Set End Property - _ + Property CostHolder As CostHolder Get Return _CostHolder @@ -189,6 +189,7 @@ Public Class CRMEstate_Opportunity_Rent SetPropertyValue("CostHolder", _CostHolder, value) End Set End Property + Property CostPlace As CostPlace Get Return _CostPlace diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/CostRecord/ImmovablesCostRecordContactRow.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/CostRecord/ImmovablesCostRecordContactRow.vb index 4f67aab..145e568 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/CostRecord/ImmovablesCostRecordContactRow.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/CostRecord/ImmovablesCostRecordContactRow.vb @@ -31,8 +31,8 @@ Public Class ImmovablesCostRecordContactRow End Property Property UniqueObjects As UniqueObjects Property Controlling As Controlling - Property CostHolder As CostHolder - Property CostPlace As CostPlace + Property CostHolder As CostHolder + Property CostPlace As CostPlace Property JobNumberObjects As JobNumberObjects Property ShortName As String Property DateExecution As Date diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/CostRecord/ImmovablesCostRecordGroup.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/CostRecord/ImmovablesCostRecordGroup.vb index 13174da..5ccdad7 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/CostRecord/ImmovablesCostRecordGroup.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/CostRecord/ImmovablesCostRecordGroup.vb @@ -93,6 +93,7 @@ Public Class ImmovablesCostRecordGroup SetPropertyValue("CostRecordBaseMode", _CostRecordBaseMode, value) End Set End Property + Property CostPlace As CostPlace Get Return _CostPlace diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/Immovables.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/Immovables.vb index 625ec6c..5d4bb12 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/Immovables.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/Immovables.vb @@ -171,7 +171,8 @@ Public Class Immovables SetPropertyValue("CustomersLessor", _CustomersLessor, value) End Set End Property - _ + + Property UniqueObjects() As UniqueObjects Get Return _UniqueObjects diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/ImmovablesGroupsParameters.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/ImmovablesGroupsParameters.vb index ff4f025..e04a43c 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/ImmovablesGroupsParameters.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/ImmovablesGroupsParameters.vb @@ -150,6 +150,7 @@ Public Class ImmovablesGroupsParameters SetPropertyValue("CostHolder", _CostHolder, value) End Set End Property + Property CostPlace As CostPlace Get Return _CostPlace diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceCreditNote/InvoiceCreditNoteHeader.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceCreditNote/InvoiceCreditNoteHeader.vb index 9ea8864..6b163a9 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceCreditNote/InvoiceCreditNoteHeader.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceCreditNote/InvoiceCreditNoteHeader.vb @@ -66,7 +66,8 @@ Public Class InvoiceCreditNoteHeader SetPropertyValue("Customers", _Customers, value) End Set End Property - _ + + Property Storage As Storage Get Return _Storage diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceHeader.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceHeader.vb index 41f0041..4900c41 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceHeader.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceHeader.vb @@ -1260,6 +1260,7 @@ Public Class InvoiceHeader + Property row_UniqueObjects() As UniqueObjects ' -- Egyedi azonosító Get Return _row_UniqueObjects @@ -1282,6 +1283,7 @@ Public Class InvoiceHeader + Property row_CostPlace() As CostPlace ' -- Költség viselÅ‘ Get Return _row_CostPlace diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceRows.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceRows.vb index b4fff44..c9d547c 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceRows.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/InvoiceRows.vb @@ -627,7 +627,8 @@ Public Class InvoiceRows SetPropertyValue("ChartOfAccounts", _ChartOfAccounts, value) End Set End Property - _ + + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects @@ -645,6 +646,7 @@ Public Class InvoiceRows SetPropertyValue("CostHolder", _CostHolder, value) End Set End Property + Property CostPlace As CostPlace Get Return _CostPlace diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/Popup/InvoiceAdvancePopup.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/Popup/InvoiceAdvancePopup.vb index 0ac028d..1cfe655 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/Popup/InvoiceAdvancePopup.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/Popup/InvoiceAdvancePopup.vb @@ -176,6 +176,7 @@ Public Class InvoiceAdvancePopup 'ElÅ‘legszámla készítÅ‘, ez csinál InvoiceH End Set End Property + Property CostPlace As CostPlace Get Return _CostPlace @@ -185,6 +186,7 @@ Public Class InvoiceAdvancePopup 'ElÅ‘legszámla készítÅ‘, ez csinál InvoiceH End Set End Property + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/Popup/InvoiceRows_Changer_Popup.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/Popup/InvoiceRows_Changer_Popup.vb index f9c5f1e..13d6b4b 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/Popup/InvoiceRows_Changer_Popup.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Invoice/Popup/InvoiceRows_Changer_Popup.vb @@ -9,7 +9,7 @@ Imports DevExpress.Persistent.Base Imports DevExpress.Persistent.BaseImpl Imports DevExpress.Persistent.Validation - _ + Public Class InvoiceRows_Changer_Popup Inherits BaseObject Public Sub New(ByVal session As Session) @@ -27,10 +27,10 @@ Public Class InvoiceRows_Changer_Popup End Sub Property DateExecution As Date - Property Controlling As Controlling - Property CostPlace As CostPlace - Property CostHolder As CostHolder - Property UniqueObjects As UniqueObjects - Property JobNumberObjects As JobNumberObjects + Property Controlling As Controlling + Property CostPlace As CostPlace + Property CostHolder As CostHolder + Property UniqueObjects As UniqueObjects + Property JobNumberObjects As JobNumberObjects End Class diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInHeader.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInHeader.vb index aac504d..421539f 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInHeader.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInHeader.vb @@ -368,7 +368,7 @@ Public Class OrderInHeader End Property - + Property row_APCSheetByProducts As APCSheetByProducts Get Return _row_APCSheetByProducts diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInParameters.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInParameters.vb index 5658e4d..07d6803 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInParameters.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInParameters.vb @@ -283,6 +283,7 @@ Public Class OrderInParameters SetPropertyValue("Controlling_InvoiceAdvance_Default", _Controlling_InvoiceAdvance_Default, value) End Set End Property + Property CostPlace As CostPlace Get Return _CostPlace diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInRowsOther.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInRowsOther.vb index 99ef8b2..7a2c99b 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInRowsOther.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/OrderInRowsOther.vb @@ -234,6 +234,7 @@ Public Class OrderInRowsOther 'Egyéb sorok SetPropertyValue("QualityOption", _QualityOption, value) End Set End Property + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects @@ -250,6 +251,7 @@ Public Class OrderInRowsOther 'Egyéb sorok SetPropertyValue("CostHolder", _CostHolder, value) End Set End Property + Property CostPlace As CostPlace Get Return _CostPlace diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/Popup/ORI_Invoice_Popup.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/Popup/ORI_Invoice_Popup.vb index faa4477..258b656 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/Popup/ORI_Invoice_Popup.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Orders/OrdersIn/Popup/ORI_Invoice_Popup.vb @@ -301,6 +301,7 @@ Public Class ORI_Invoice_Popup SetPropertyValue("CustomerBankAccounts", _BankInformation, value) End Set End Property + Property Storage As Storage Get Return _Storage diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Production/RecipeFrom.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Production/RecipeFrom.vb index df0d73b..d139342 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Production/RecipeFrom.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Production/RecipeFrom.vb @@ -73,6 +73,7 @@ Public Class RecipeFrom End If End Set End Property + Property Storage As Storage Get Return _Storage diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Production/RecipeTo.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Production/RecipeTo.vb index d5ab7c0..e53fe90 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Production/RecipeTo.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/Production/RecipeTo.vb @@ -71,6 +71,7 @@ Public Class RecipeTo End If End Set End Property + Property Storage As Storage Get Return _Storage diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/TakeOver/TakeoverProtocol.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/TakeOver/TakeoverProtocol.vb index 500dd9f..80412af 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/TakeOver/TakeoverProtocol.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/TakeOver/TakeoverProtocol.vb @@ -151,8 +151,9 @@ Public Class TakeoverProtocolHeader SetPropertyValue("row_Installation", _row_Installation, value) End Set End Property - _ - _ + + + Property row_UniqueObjects() As UniqueObjects Get Return _row_UniqueObjects diff --git a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/TakeOver/TakeoverProtocolRows.vb b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/TakeOver/TakeoverProtocolRows.vb index 045ce5a..da19f3a 100644 --- a/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/TakeOver/TakeoverProtocolRows.vb +++ b/Nuvolar.Module/BusinessObjects/Business/BusinessTransactions/TakeOver/TakeoverProtocolRows.vb @@ -27,6 +27,7 @@ Public Class TakeoverProtocolRows SetPropertyValue("Installation", _Installation, value) End Set End Property + Property UniqueObjects() As UniqueObjects Get Return _UniqueObjects diff --git a/Nuvolar.Module/BusinessObjects/Business/Products/Products.vb b/Nuvolar.Module/BusinessObjects/Business/Products/Products.vb index e3d34e5..152b65a 100644 --- a/Nuvolar.Module/BusinessObjects/Business/Products/Products.vb +++ b/Nuvolar.Module/BusinessObjects/Business/Products/Products.vb @@ -97,6 +97,8 @@ Public Class Products Private _CustomersOrder01 As CustomersOrder '1. beszállító Private _CustomersOrder02 As CustomersOrder '2. beszállító + + Private _IsActive As Boolean Public Sub New(ByVal session As Session) MyBase.New(session) End Sub @@ -123,6 +125,18 @@ Public Class Products End If End If End Sub + ''' + ''' Használatban van ? + ''' + ''' + Property IsActive As Boolean + Get + Return _IsActive + End Get + Set(value As Boolean) + SetPropertyValue("IsActive", _IsActive, value) + End Set + End Property Property ProductType As eProductType Get Return _ProductType diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/In/Popup/StorageInfromDeliveryNoteInRowsHeader.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/In/Popup/StorageInfromDeliveryNoteInRowsHeader.vb index 74d8efa..9c1f679 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/In/Popup/StorageInfromDeliveryNoteInRowsHeader.vb +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/In/Popup/StorageInfromDeliveryNoteInRowsHeader.vb @@ -40,7 +40,8 @@ Public Class StorageInfromDeliveryNoteInRowsHeader SetPropertyValue("DeliveryNoteInHeader", _DeliveryNoteInHeader, value) End Set End Property - _ + + Property Storage As Storage Get Return _Storage diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/In/StorageInHeader.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/In/StorageInHeader.vb index 4c70b1b..e2a8c18 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/In/StorageInHeader.vb +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/In/StorageInHeader.vb @@ -102,7 +102,8 @@ Public Class StorageInHeader SetPropertyValue("ConnectInfo", _ConnectInfo, value) End Set End Property - _ + + Property Storage As Storage Get Return _Storage @@ -111,8 +112,9 @@ Public Class StorageInHeader SetPropertyValue("Storage", _Storage, value) End Set End Property - _ - _ + + + Property StorageFrom As Storage Get Return _StorageFrom diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Inventory/InventoryHeader.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Inventory/InventoryHeader.vb index 7d71f11..efb78cf 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Inventory/InventoryHeader.vb +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Inventory/InventoryHeader.vb @@ -65,6 +65,7 @@ Public Class InventoryHeader SetPropertyValue("DocumentNumber", _DocumentNumber, value) End Set End Property + Property Storage As Storage Get Return _Storage diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Inventory/InventoryParameters.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Inventory/InventoryParameters.vb index 8c0b42c..34701a3 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Inventory/InventoryParameters.vb +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Inventory/InventoryParameters.vb @@ -38,7 +38,8 @@ Public Class InventoryParameters SetPropertyValue("CustomersFrom", _CustomersFrom, value) End Set End Property - _ + + Property Storage As Storage Get Return _Storage diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Inventory/PopUp/CreateInventoryHeader_PopUp.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Inventory/PopUp/CreateInventoryHeader_PopUp.vb index af8d42d..9b2f642 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Inventory/PopUp/CreateInventoryHeader_PopUp.vb +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Inventory/PopUp/CreateInventoryHeader_PopUp.vb @@ -44,7 +44,8 @@ Public Class CreateInventoryHeader_PopUp End If End Set End Property - _ + + Property Storage As Storage Get Return _Storage diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Out/StorageOutCirculation.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Out/StorageOutCirculation.vb index ebad870..98aaff4 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Out/StorageOutCirculation.vb +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Out/StorageOutCirculation.vb @@ -48,6 +48,7 @@ Public Class StorageOutCirculation 'Fogyási mátrix SetPropertyValue("CirculationType", _CirculationType, value) End Set End Property + Property Storage As Storage Get Return _Storage diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Out/StorageOutHeader.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Out/StorageOutHeader.vb index aab112d..e333b20 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Out/StorageOutHeader.vb +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Out/StorageOutHeader.vb @@ -112,7 +112,7 @@ Public Class StorageOutHeader End Set End Property - + Property Storage() As Storage Get Return _Storage @@ -128,7 +128,7 @@ Public Class StorageOutHeader End If End Set End Property - + Property StorageTo As Storage Get diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/PDA/StorageInFromPDACollectionPopup.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/PDA/StorageInFromPDACollectionPopup.vb index b9b96df..db83596 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/PDA/StorageInFromPDACollectionPopup.vb +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/PDA/StorageInFromPDACollectionPopup.vb @@ -23,7 +23,8 @@ Public Class StorageInFromPDACollectionPopup Public Overrides Sub AfterConstruction() MyBase.AfterConstruction() End Sub - _ + + Property Storage As Storage Get Return _Storage diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/Storage.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/Storage.vb index a82bafa..72719bd 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/Storage.vb +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/Storage.vb @@ -30,6 +30,7 @@ Public Class Storage '-- Raktárak ------------ Private _ReportInventory As ReportData '--Leltár nyomtatvány DataType InventorySIR Private _DeliveryNoteOutType_InventoryTransfer As DeliveryNoteOutType '--Szállítólevél a raktárközi átadás hoz Private _DeliveryNoteOutType_ReturnBack As DeliveryNoteOutType '--Szállítólevél a visszárúhoz + Private _IsActive As Boolean '-- Ha false, akkor NE hozza fel Public Sub New(ByVal session As Session) MyBase.New(session) @@ -199,6 +200,18 @@ Public Class Storage '-- Raktárak ------------ SetPropertyValue("DeliveryNoteOutType_ReturnBack", _DeliveryNoteOutType_ReturnBack, value) End Set End Property + ''' + ''' Aktív akkor használható + ''' + ''' + Property IsActive As Boolean + Get + Return _IsActive + End Get + Set(value As Boolean) + SetPropertyValue("IsActive", _IsActive, value) + End Set + End Property '-------------ReadOnly-------------- _ Private ReadOnly Property CustomersFrom_Address As XPCollection(Of Address) diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageComputed.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageComputed.vb index 3008ed0..fd057e6 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageComputed.vb +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageComputed.vb @@ -48,6 +48,7 @@ Public Class StorageComputed '-- K Me.RecalculateAveragePrice() Me.RecalculateMinimumPrice() End Sub + Property Storage As Storage Get Return _Storage diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.Designer.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.Designer.vb index 96d58a7..8981603 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.Designer.vb +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.Designer.vb @@ -42,12 +42,7 @@ Partial Class StorageDateVC Me.aGenerateStorageDate.Caption = "aGenerate Storage Date" Me.aGenerateStorageDate.ConfirmationMessage = "Are you sure ?" Me.aGenerateStorageDate.Id = "aGenerateStorageDate" - Me.aGenerateStorageDate.ImageName = Nothing - Me.aGenerateStorageDate.Shortcut = Nothing - Me.aGenerateStorageDate.Tag = Nothing - Me.aGenerateStorageDate.TargetObjectsCriteria = Nothing Me.aGenerateStorageDate.TargetObjectType = GetType(Nuvolar.[Module].StorageDate) - Me.aGenerateStorageDate.TargetViewId = Nothing Me.aGenerateStorageDate.TargetViewType = DevExpress.ExpressApp.ViewType.ListView Me.aGenerateStorageDate.ToolTip = Nothing Me.aGenerateStorageDate.TypeOfView = GetType(DevExpress.ExpressApp.ListView) @@ -57,12 +52,7 @@ Partial Class StorageDateVC Me.aGenerateStorageDateClearingPrice.Caption = "aGenerate Storage Date Clearing Price" Me.aGenerateStorageDateClearingPrice.ConfirmationMessage = "Are you sure ?" Me.aGenerateStorageDateClearingPrice.Id = "aGenerateStorageDateClearingPrice" - Me.aGenerateStorageDateClearingPrice.ImageName = Nothing - Me.aGenerateStorageDateClearingPrice.Shortcut = Nothing - Me.aGenerateStorageDateClearingPrice.Tag = Nothing - Me.aGenerateStorageDateClearingPrice.TargetObjectsCriteria = Nothing Me.aGenerateStorageDateClearingPrice.TargetObjectType = GetType(Nuvolar.[Module].StorageDateClearingPrice) - Me.aGenerateStorageDateClearingPrice.TargetViewId = Nothing Me.aGenerateStorageDateClearingPrice.TargetViewType = DevExpress.ExpressApp.ViewType.ListView Me.aGenerateStorageDateClearingPrice.ToolTip = Nothing Me.aGenerateStorageDateClearingPrice.TypeOfView = GetType(DevExpress.ExpressApp.ListView) @@ -74,44 +64,26 @@ Partial Class StorageDateVC Me.aGenerateStorageDateClearingPrice_Products.Caption = "aGenerateStorageDateClearingPrice_Products" Me.aGenerateStorageDateClearingPrice_Products.ConfirmationMessage = Nothing Me.aGenerateStorageDateClearingPrice_Products.Id = "aGenerateStorageDateClearingPrice_Products" - Me.aGenerateStorageDateClearingPrice_Products.ImageName = Nothing - Me.aGenerateStorageDateClearingPrice_Products.Shortcut = Nothing - Me.aGenerateStorageDateClearingPrice_Products.Tag = Nothing - Me.aGenerateStorageDateClearingPrice_Products.TargetObjectsCriteria = Nothing Me.aGenerateStorageDateClearingPrice_Products.TargetObjectType = GetType(Nuvolar.[Module].StorageDateClearingPrice) - Me.aGenerateStorageDateClearingPrice_Products.TargetViewId = Nothing Me.aGenerateStorageDateClearingPrice_Products.ToolTip = Nothing - Me.aGenerateStorageDateClearingPrice_Products.TypeOfView = Nothing ' 'aStorageDateClearingPrice_ViewAttachments ' Me.aStorageDateClearingPrice_ViewAttachments.Caption = "aStorageDateClearingPrice_ViewAttachments" Me.aStorageDateClearingPrice_ViewAttachments.ConfirmationMessage = Nothing Me.aStorageDateClearingPrice_ViewAttachments.Id = "aStorageDateClearingPrice_ViewAttachments" - Me.aStorageDateClearingPrice_ViewAttachments.ImageName = Nothing Me.aStorageDateClearingPrice_ViewAttachments.SelectionDependencyType = DevExpress.ExpressApp.Actions.SelectionDependencyType.RequireSingleObject - Me.aStorageDateClearingPrice_ViewAttachments.Shortcut = Nothing - Me.aStorageDateClearingPrice_ViewAttachments.Tag = Nothing - Me.aStorageDateClearingPrice_ViewAttachments.TargetObjectsCriteria = Nothing Me.aStorageDateClearingPrice_ViewAttachments.TargetObjectType = GetType(Nuvolar.[Module].StorageDateClearingPrice) - Me.aStorageDateClearingPrice_ViewAttachments.TargetViewId = Nothing Me.aStorageDateClearingPrice_ViewAttachments.ToolTip = Nothing - Me.aStorageDateClearingPrice_ViewAttachments.TypeOfView = Nothing ' 'aStorageDateClearingPrice_DateAndValueReCalculate ' Me.aStorageDateClearingPrice_DateAndValueReCalculate.Caption = "aStorageDateClearingPrice_DateAndValueReCalculate" Me.aStorageDateClearingPrice_DateAndValueReCalculate.ConfirmationMessage = Nothing Me.aStorageDateClearingPrice_DateAndValueReCalculate.Id = "aStorageDateClearingPrice_DateAndValueReCalculate" - Me.aStorageDateClearingPrice_DateAndValueReCalculate.ImageName = Nothing Me.aStorageDateClearingPrice_DateAndValueReCalculate.SelectionDependencyType = DevExpress.ExpressApp.Actions.SelectionDependencyType.RequireSingleObject - Me.aStorageDateClearingPrice_DateAndValueReCalculate.Shortcut = Nothing - Me.aStorageDateClearingPrice_DateAndValueReCalculate.Tag = Nothing - Me.aStorageDateClearingPrice_DateAndValueReCalculate.TargetObjectsCriteria = Nothing Me.aStorageDateClearingPrice_DateAndValueReCalculate.TargetObjectType = GetType(Nuvolar.[Module].StorageDateClearingPrice) - Me.aStorageDateClearingPrice_DateAndValueReCalculate.TargetViewId = Nothing Me.aStorageDateClearingPrice_DateAndValueReCalculate.ToolTip = Nothing - Me.aStorageDateClearingPrice_DateAndValueReCalculate.TypeOfView = Nothing ' 'aStorageDateClearingPrice_ShowStorageOutDeliveryOutRows ' @@ -120,15 +92,10 @@ Partial Class StorageDateVC Me.aStorageDateClearingPrice_ShowStorageOutDeliveryOutRows.Caption = "aStorageDateClearingPrice_ShowStorageOutDeliveryOutRows" Me.aStorageDateClearingPrice_ShowStorageOutDeliveryOutRows.ConfirmationMessage = Nothing Me.aStorageDateClearingPrice_ShowStorageOutDeliveryOutRows.Id = "aStorageDateClearingPrice_ShowStorageOutDeliveryOutRows" - Me.aStorageDateClearingPrice_ShowStorageOutDeliveryOutRows.ImageName = Nothing Me.aStorageDateClearingPrice_ShowStorageOutDeliveryOutRows.SelectionDependencyType = DevExpress.ExpressApp.Actions.SelectionDependencyType.RequireSingleObject - Me.aStorageDateClearingPrice_ShowStorageOutDeliveryOutRows.Shortcut = Nothing - Me.aStorageDateClearingPrice_ShowStorageOutDeliveryOutRows.Tag = Nothing Me.aStorageDateClearingPrice_ShowStorageOutDeliveryOutRows.TargetObjectsCriteria = "IsNull(InvoiceRows)=False" Me.aStorageDateClearingPrice_ShowStorageOutDeliveryOutRows.TargetObjectType = GetType(Nuvolar.[Module].StorageDateClearingPrice) - Me.aStorageDateClearingPrice_ShowStorageOutDeliveryOutRows.TargetViewId = Nothing Me.aStorageDateClearingPrice_ShowStorageOutDeliveryOutRows.ToolTip = Nothing - Me.aStorageDateClearingPrice_ShowStorageOutDeliveryOutRows.TypeOfView = Nothing ' 'aStorageDateClearingPrice_GeneterateDate2Date ' @@ -137,14 +104,8 @@ Partial Class StorageDateVC Me.aStorageDateClearingPrice_GeneterateDate2Date.Caption = "aStorageDateClearingPrice_GeneterateDate2Date" Me.aStorageDateClearingPrice_GeneterateDate2Date.ConfirmationMessage = Nothing Me.aStorageDateClearingPrice_GeneterateDate2Date.Id = "aStorageDateClearingPrice_GeneterateDate2Date" - Me.aStorageDateClearingPrice_GeneterateDate2Date.ImageName = Nothing - Me.aStorageDateClearingPrice_GeneterateDate2Date.Shortcut = Nothing - Me.aStorageDateClearingPrice_GeneterateDate2Date.Tag = Nothing - Me.aStorageDateClearingPrice_GeneterateDate2Date.TargetObjectsCriteria = Nothing Me.aStorageDateClearingPrice_GeneterateDate2Date.TargetObjectType = GetType(Nuvolar.[Module].StorageDateClearingPrice) - Me.aStorageDateClearingPrice_GeneterateDate2Date.TargetViewId = Nothing Me.aStorageDateClearingPrice_GeneterateDate2Date.ToolTip = Nothing - Me.aStorageDateClearingPrice_GeneterateDate2Date.TypeOfView = Nothing ' 'aStorageDateClearingPrice_SetSIRPrice ' @@ -153,15 +114,10 @@ Partial Class StorageDateVC Me.aStorageDateClearingPrice_SetSIRPrice.Caption = "aStorageDateClearingPrice_SetSIRPrice" Me.aStorageDateClearingPrice_SetSIRPrice.ConfirmationMessage = Nothing Me.aStorageDateClearingPrice_SetSIRPrice.Id = "aStorageDateClearingPrice_SetSIRPrice" - Me.aStorageDateClearingPrice_SetSIRPrice.ImageName = Nothing Me.aStorageDateClearingPrice_SetSIRPrice.SelectionDependencyType = DevExpress.ExpressApp.Actions.SelectionDependencyType.RequireSingleObject - Me.aStorageDateClearingPrice_SetSIRPrice.Shortcut = Nothing - Me.aStorageDateClearingPrice_SetSIRPrice.Tag = Nothing Me.aStorageDateClearingPrice_SetSIRPrice.TargetObjectsCriteria = "IsNull(StorageInRows)=False" Me.aStorageDateClearingPrice_SetSIRPrice.TargetObjectType = GetType(Nuvolar.[Module].StorageDateClearingPrice) - Me.aStorageDateClearingPrice_SetSIRPrice.TargetViewId = Nothing Me.aStorageDateClearingPrice_SetSIRPrice.ToolTip = Nothing - Me.aStorageDateClearingPrice_SetSIRPrice.TypeOfView = Nothing ' 'aSetBonusHUF ' @@ -170,16 +126,23 @@ Partial Class StorageDateVC Me.aSetBonusHUF.Caption = "aSet Bonus HUF" Me.aSetBonusHUF.ConfirmationMessage = Nothing Me.aSetBonusHUF.Id = "aSetBonusHUF" - Me.aSetBonusHUF.ImageName = Nothing Me.aSetBonusHUF.SelectionDependencyType = DevExpress.ExpressApp.Actions.SelectionDependencyType.RequireMultipleObjects - Me.aSetBonusHUF.Shortcut = Nothing - Me.aSetBonusHUF.Tag = Nothing - Me.aSetBonusHUF.TargetObjectsCriteria = Nothing Me.aSetBonusHUF.TargetObjectType = GetType(Nuvolar.[Module].DeliveryNoteInRRFC) - Me.aSetBonusHUF.TargetViewId = Nothing Me.aSetBonusHUF.TargetViewType = DevExpress.ExpressApp.ViewType.ListView Me.aSetBonusHUF.ToolTip = Nothing Me.aSetBonusHUF.TypeOfView = GetType(DevExpress.ExpressApp.ListView) + ' + 'StorageDateVC + ' + Me.Actions.Add(Me.aGenerateStorageDate) + Me.Actions.Add(Me.aGenerateStorageDateClearingPrice) + Me.Actions.Add(Me.aGenerateStorageDateClearingPrice_Products) + Me.Actions.Add(Me.aStorageDateClearingPrice_ViewAttachments) + Me.Actions.Add(Me.aStorageDateClearingPrice_DateAndValueReCalculate) + Me.Actions.Add(Me.aStorageDateClearingPrice_ShowStorageOutDeliveryOutRows) + Me.Actions.Add(Me.aStorageDateClearingPrice_GeneterateDate2Date) + Me.Actions.Add(Me.aStorageDateClearingPrice_SetSIRPrice) + Me.Actions.Add(Me.aSetBonusHUF) End Sub Friend WithEvents aGenerateStorageDateClearingPrice As DevExpress.ExpressApp.Actions.SimpleAction diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.resx b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.resx index b76248c..7639917 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.resx +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.resx @@ -118,31 +118,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 17, 56 + 17, 17 - 17, 134 + 17, 56 - 17, 95 + 455, 17 - 17, 251 + 337, 95 - 17, 290 + 17, 134 - 17, 173 + 264, 56 - 17, 212 + 17, 95 - 430, 47 + 192, 17 - 361, 290 + 634, 95 False diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.vb index b301525..b9b944a 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.vb +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageDateVC.vb @@ -58,7 +58,11 @@ Public Class StorageDateVC _StorageDateClearingPrice = New StorageDateClearingPrice(_uow) _StorageDateClearingPrice.RowIndex = 0 _StorageDateClearingPrice.CustomersFrom = _DeliveryNoteInRRFC.RegistryRowsFinancialControlling.RegistryHeader.CustomersFrom - _StorageDateClearingPrice.DateExecution = _DeliveryNoteInRRFC.RegistryRowsFinancialControlling.RegistryHeader.F_DateExecution.Date + + '_StorageDateClearingPrice.DateExecution = _DeliveryNoteInRRFC.RegistryRowsFinancialControlling.RegistryHeader.F_DateExecution.Date + + _StorageDateClearingPrice.DateExecution = _DeliveryNoteInRRFC.DeliveryNoteInRows.DeliveryNoteInHeader.DateExecution.Date + _StorageDateClearingPrice.DeliveryNoteInRRFC = _DeliveryNoteInRRFC _StorageDateClearingPrice.Products = _DeliveryNoteInRRFC.DeliveryNoteInRows.Products _StorageDateClearingPrice.QTT_In = _DeliveryNoteInRRFC.QTT_Controlled @@ -186,7 +190,10 @@ Public Class StorageDateVC _StorageDateClearingPrice = New StorageDateClearingPrice(_uow) _StorageDateClearingPrice.RowIndex = 0 _StorageDateClearingPrice.CustomersFrom = _DeliveryNoteInRRFC.RegistryRowsFinancialControlling.RegistryHeader.CustomersFrom - _StorageDateClearingPrice.DateExecution = _DeliveryNoteInRRFC.RegistryRowsFinancialControlling.RegistryHeader.F_DateExecution.Date + + '_StorageDateClearingPrice.DateExecution = _DeliveryNoteInRRFC.RegistryRowsFinancialControlling.RegistryHeader.F_DateExecution.Date + _StorageDateClearingPrice.DateExecution = _DeliveryNoteInRRFC.DeliveryNoteInRows.DeliveryNoteInHeader.DateExecution.Date + _StorageDateClearingPrice.DeliveryNoteInRRFC = _DeliveryNoteInRRFC _StorageDateClearingPrice.Products = _DeliveryNoteInRRFC.DeliveryNoteInRows.Products _StorageDateClearingPrice.QTT_In = _DeliveryNoteInRRFC.QTT_Controlled @@ -614,7 +621,10 @@ Public Class StorageDateVC _StorageDateClearingPrice = New StorageDateClearingPrice(_uow) _StorageDateClearingPrice.RowIndex = 0 _StorageDateClearingPrice.CustomersFrom = _DeliveryNoteInRRFC.RegistryRowsFinancialControlling.RegistryHeader.CustomersFrom - _StorageDateClearingPrice.DateExecution = _DeliveryNoteInRRFC.RegistryRowsFinancialControlling.RegistryHeader.F_DateExecution.Date + '_StorageDateClearingPrice.DateExecution = _DeliveryNoteInRRFC.RegistryRowsFinancialControlling.RegistryHeader.F_DateExecution.Date + + _StorageDateClearingPrice.DateExecution = _DeliveryNoteInRRFC.DeliveryNoteInRows.DeliveryNoteInHeader.DateExecution.Date + _StorageDateClearingPrice.DeliveryNoteInRRFC = _DeliveryNoteInRRFC _StorageDateClearingPrice.Products = _DeliveryNoteInRRFC.DeliveryNoteInRows.Products _StorageDateClearingPrice.QTT_In = _DeliveryNoteInRRFC.QTT_Controlled diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageLocation.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageLocation.vb index bd63003..996d671 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageLocation.vb +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageLocation.vb @@ -43,6 +43,7 @@ Public Class StorageLocation SetPropertyValue("ShortName", _ShortName, value) End Set End Property + Property Storage As Storage Get Return _Storage diff --git a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageMoveType.vb b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageMoveType.vb index 8243b91..4ac3ad7 100644 --- a/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageMoveType.vb +++ b/Nuvolar.Module/BusinessObjects/Business/StorageTransactions/Storage/StorageMoveType.vb @@ -32,6 +32,7 @@ Public Class StorageMoveType '-- Mozg End Property + Property Storage As Storage Get Return _Storage diff --git a/Nuvolar.Module/BusinessObjects/Business/Worksheet/WorkPlace.vb b/Nuvolar.Module/BusinessObjects/Business/Worksheet/WorkPlace.vb index 9cf17ed..893e376 100644 --- a/Nuvolar.Module/BusinessObjects/Business/Worksheet/WorkPlace.vb +++ b/Nuvolar.Module/BusinessObjects/Business/Worksheet/WorkPlace.vb @@ -78,6 +78,7 @@ Public Class WorkPlace SetPropertyValue("Address", _Address, value) End Set End Property + Property CostPlace As CostPlace Get Return _CostPlace diff --git a/Nuvolar.Module/BusinessObjects/Business/Worksheet/Worksheet_Header.vb b/Nuvolar.Module/BusinessObjects/Business/Worksheet/Worksheet_Header.vb index 6b4762a..214c0b8 100644 --- a/Nuvolar.Module/BusinessObjects/Business/Worksheet/Worksheet_Header.vb +++ b/Nuvolar.Module/BusinessObjects/Business/Worksheet/Worksheet_Header.vb @@ -469,7 +469,8 @@ Public Class WorkSheet_Header SetPropertyValue("JobNumberObjects", _JobNumberObjects, value) End Set End Property - _ + + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects @@ -478,7 +479,8 @@ Public Class WorkSheet_Header SetPropertyValue("UniqueObjects", _UniqueObjects, value) End Set End Property - _ + + Property CostPlace As CostPlace Get Return _CostPlace diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Base/GLHeader.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Base/GLHeader.vb index 7a11082..26a10fa 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Base/GLHeader.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Base/GLHeader.vb @@ -518,7 +518,8 @@ Public Class GLHeader - Property row_CostPlace() As CostPlace + + Property row_CostPlace As CostPlace Get Return _row_CostPlace End Get @@ -529,6 +530,7 @@ Public Class GLHeader + Property row_CostHolder() As CostHolder Get Return _row_CostHolder @@ -540,6 +542,7 @@ Public Class GLHeader + Property row_UniqueObjects() As UniqueObjects Get Return _row_UniqueObjects @@ -551,6 +554,7 @@ Public Class GLHeader + Property row_JobNumberObjects() As JobNumberObjects Get Return _row_JobNumberObjects diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Base/GLRows.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Base/GLRows.vb index f5bdb5d..21d3244 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Base/GLRows.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Base/GLRows.vb @@ -294,7 +294,8 @@ Public Class GLRows End If End Set End Property - _ + + Property JobNumberObjects() As JobNumberObjects Get Return _JobNumberObjects @@ -303,7 +304,8 @@ Public Class GLRows SetPropertyValue("JobNumberObjects", _JobNumberObjects, value) End Set End Property - _ + + Property UniqueObjects() As UniqueObjects Get Return _UniqueObjects @@ -312,8 +314,9 @@ Public Class GLRows SetPropertyValue("UniqueObjects", _UniqueObjects, value) End Set End Property - _ - Property CostPlace() As CostPlace + + + Property CostPlace As CostPlace Get Return _CostPlace End Get @@ -321,7 +324,8 @@ Public Class GLRows SetPropertyValue("CostPlace", _CostPlace, value) End Set End Property - _ + + Property CostHolder() As CostHolder Get Return _CostHolder diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Base/Popup/GLRowsDivideH.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Base/Popup/GLRowsDivideH.vb index c534213..94670ae 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Base/Popup/GLRowsDivideH.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Base/Popup/GLRowsDivideH.vb @@ -227,9 +227,10 @@ Public Class GLRowsDivideH SetPropertyValue("row_Controlling", _row_Controlling, value) End Set End Property - _ - _ - _ + + + + Property row_CostHolder As CostHolder Get Return _row_CostHolder @@ -238,9 +239,10 @@ Public Class GLRowsDivideH SetPropertyValue("row_CostHolder", _row_CostHolder, value) End Set End Property - _ - _ - _ + + + + Property row_CostPlace As CostPlace Get Return _row_CostPlace @@ -249,9 +251,10 @@ Public Class GLRowsDivideH SetPropertyValue("row_CostPlace", _row_CostPlace, value) End Set End Property - _ - _ - _ + + + + Property row_JobNumberObjects As JobNumberObjects Get Return _row_JobNumberObjects @@ -260,9 +263,10 @@ Public Class GLRowsDivideH SetPropertyValue("row_JobNumberObjects", _row_JobNumberObjects, value) End Set End Property - _ - _ - _ + + + + Property row_UniqueObjects As UniqueObjects Get Return _row_UniqueObjects diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Base/Popup/GLRowsDivideR.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Base/Popup/GLRowsDivideR.vb index a51ae24..e3cc61b 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Base/Popup/GLRowsDivideR.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Base/Popup/GLRowsDivideR.vb @@ -123,6 +123,7 @@ Public Class GLRowsDivideR SetPropertyValue("CostHolder", _CostHolder, value) End Set End Property + Property CostPlace As CostPlace Get Return _CostPlace diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/BookEntry/BookEntryCheck.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/BookEntry/BookEntryCheck.vb index 3ce987c..6c6c4f1 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/BookEntry/BookEntryCheck.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/BookEntry/BookEntryCheck.vb @@ -10,12 +10,12 @@ Imports DevExpress.Persistent.BaseImpl Imports DevExpress.Persistent.Validation Imports DevExpress.ExpressApp.ConditionalAppearance - _ - _ - _ - _ - _ - _ + + + + + + Public Class BookEntryCheck 'Popup a csoportos módosításhoz, és könyvelhetõség beállításához Inherits BaseObject Public Sub New(ByVal session As Session) @@ -23,11 +23,11 @@ Public Class BookEntryCheck 'Popup a csoportos m End Sub Public Property ChartOfAccountsYear As ChartOfAccountsYear Public Property ChartOfAccounts As ChartOfAccounts - Public Property JobNumberObjects As JobNumberObjects - Public Property CostHolder As CostHolder - Public Property CostPlace As CostPlace - Public Property UniqueObjects As UniqueObjects - Public Property Controlling As Controlling + Public Property JobNumberObjects As JobNumberObjects + Public Property CostHolder As CostHolder + Public Property CostPlace As CostPlace + Public Property UniqueObjects As UniqueObjects + Public Property Controlling As Controlling Public Property IsManagerCheck As Boolean = False Public Property IsDateExecution As Boolean = False Public Property DateExecution As Date diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/BookEntry/GLAccountRowsforBookEntry.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/BookEntry/GLAccountRowsforBookEntry.vb index 74c8946..97e4b51 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/BookEntry/GLAccountRowsforBookEntry.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/BookEntry/GLAccountRowsforBookEntry.vb @@ -14,10 +14,10 @@ Imports System.Linq Imports System.Linq.Expressions Imports DevExpress.ExpressApp.ConditionalAppearance - _ - _ - _ - _ + + + + Public Class GLAccountRowsforBookEntry 'Fõkönyvi feladáshoz lista, ami alaplyán a könyvelõ tud ellenõrizni Inherits XPLiteObject Public Sub New(ByVal session As Session) @@ -51,7 +51,7 @@ Public Class GLAccountRowsforBookEntry 'F Public InvoiceHeader As InvoiceHeader Public WorkflowSystemSteps As WorkflowSystemSteps Public WorkflowMessage As String - + Public Sub findrows() Dim _RegistryTasks_coll As New XPCollection(GetType(RegistryTasks), CriteriaOperator.Parse("CurrentWorkflowSystemSteps.StepFinancialType=4 AND Status=0")) Dim _RegistryHeader_Oid_array As New ArrayList diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Fixed Assets/FixedAssets.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Fixed Assets/FixedAssets.vb index dc4ece0..7811844 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Fixed Assets/FixedAssets.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Fixed Assets/FixedAssets.vb @@ -65,7 +65,8 @@ Public Class FixedAssets End Set End Property ' _ - _ + + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects @@ -157,6 +158,7 @@ Public Class FixedAssets SetPropertyValue("CostHolder_Using", _CostHolder_Using, value) End Set End Property + Property CostPlace_Using As CostPlace Get Return _CostPlace_Using diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Fixed Assets/FixedAssetsCard.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Fixed Assets/FixedAssetsCard.vb index 713719b..33aaffc 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Fixed Assets/FixedAssetsCard.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Fixed Assets/FixedAssetsCard.vb @@ -112,7 +112,8 @@ Public Class FixedAssetsCard SetPropertyValue("Description", _Description, value) End Set End Property - _ + + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Fixed Assets/FixedAssetsUsingHeader.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Fixed Assets/FixedAssetsUsingHeader.vb index 7c90094..f0a26ed 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Fixed Assets/FixedAssetsUsingHeader.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Fixed Assets/FixedAssetsUsingHeader.vb @@ -106,6 +106,7 @@ Public Class FixedAssetsUsingHeader SetPropertyValue("CostHolder", _CostHolder, value) End Set End Property + Property CostPalce As CostPlace Get Return _CostPlace diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Popup/GLRowsCheck.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Popup/GLRowsCheck.vb index cf2c262..495a73d 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Popup/GLRowsCheck.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Popup/GLRowsCheck.vb @@ -12,12 +12,12 @@ Imports System.Data.SqlClient Imports System.Configuration Imports System.Linq Imports System.Linq.Expressions - _ - _ - _ - _ - _ - _ + + + + + + Public Class GLRowsCheck 'Popup a csoportos módosításhoz Inherits BaseObject @@ -28,7 +28,7 @@ Public Class GLRowsCheck 'Popup a csoportos módosításhoz Public Property Controlling As Controlling Public Property JobNumberObjects As JobNumberObjects Public Property CostHolder As CostHolder - Public Property CostPlace As CostPlace + Public Property CostPlace As CostPlace Public Property UniqueObjects As UniqueObjects Public Property DebitChartOfAccounts As ChartOfAccounts Public Property CreditChartOfAccounts As ChartOfAccounts diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/Card/GLCardsRows.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/Card/GLCardsRows.vb index efad135..9098458 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/Card/GLCardsRows.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/Card/GLCardsRows.vb @@ -217,6 +217,7 @@ Public Class GLCardsRows SetPropertyValue("ShortName", _ShortNameTo, value) End Set End Property + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects @@ -242,6 +243,7 @@ Public Class GLCardsRows SetPropertyValue("JobNumberObjects", _JobNumberObjects, value) End Set End Property + Property CostPlace As CostPlace Get Return _CostPlace diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/DTR/GLReportCashflowRows.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/DTR/GLReportCashflowRows.vb index 8994de1..c4ce8df 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/DTR/GLReportCashflowRows.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/DTR/GLReportCashflowRows.vb @@ -10,8 +10,8 @@ Imports DevExpress.Persistent.BaseImpl Imports DevExpress.Persistent.Validation Imports DevExpress.ExpressApp.ConditionalAppearance - _ - _ + + Public Class GLReportCashflowRows Inherits BaseObject Private _GLReportRowsState As eGLReportRowsState @@ -61,7 +61,7 @@ Public Class GLReportCashflowRows SetPropertyValue("GLReportRowsState", _GLReportRowsState, value) End Set End Property - _ + Property GLReportCashflowHeader As GLReportCashflowHeader Get Return _GLReportCashflowHeader @@ -87,6 +87,7 @@ Public Class GLReportCashflowRows SetPropertyValue("Controlling", _Controlling, value) End Set End Property + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects @@ -95,6 +96,7 @@ Public Class GLReportCashflowRows SetPropertyValue("UniqueObjects", _UniqueObjects, value) End Set End Property + Property CostHolder As CostHolder Get Return _CostHolder @@ -103,6 +105,7 @@ Public Class GLReportCashflowRows SetPropertyValue("CostHolder", _CostHolder, value) End Set End Property + Property CostPlace As CostPlace Get Return _CostPlace @@ -111,6 +114,7 @@ Public Class GLReportCashflowRows SetPropertyValue("CostPlace", _CostPlace, value) End Set End Property + Property JobNumberObjects As JobNumberObjects Get Return _JobNumberObjects diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/DTR/GLReportRows.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/DTR/GLReportRows.vb index d60ea05..5768598 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/DTR/GLReportRows.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/DTR/GLReportRows.vb @@ -141,6 +141,7 @@ Public Class GLReportRows SetPropertyValue("Controlling", _Controlling, value) End Set End Property + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects @@ -149,6 +150,7 @@ Public Class GLReportRows SetPropertyValue("UniqueObjects", _UniqueObjects, value) End Set End Property + Property CostHolder As CostHolder Get Return _CostHolder @@ -157,6 +159,7 @@ Public Class GLReportRows SetPropertyValue("CostHolder", _CostHolder, value) End Set End Property + Property CostPlace As CostPlace Get Return _CostPlace @@ -165,6 +168,7 @@ Public Class GLReportRows SetPropertyValue("CostPlace", _CostPlace, value) End Set End Property + Property JobNumberObjects As JobNumberObjects Get Return _JobNumberObjects diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/ProjectPlan/ProjectPlanRows.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/ProjectPlan/ProjectPlanRows.vb index 522e7ca..3338fcb 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/ProjectPlan/ProjectPlanRows.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/ProjectPlan/ProjectPlanRows.vb @@ -57,6 +57,7 @@ Public Class ProjectPlanRows SetPropertyValue("Controlling", _Controlling, value) End Set End Property + Property CostHolder As CostHolder Get Return _CostHolder @@ -65,6 +66,7 @@ Public Class ProjectPlanRows SetPropertyValue("CostHolder", _CostHolder, value) End Set End Property + Property CostPlace As CostPlace Get Return _CostPlace @@ -73,6 +75,7 @@ Public Class ProjectPlanRows SetPropertyValue("CostPlace", _CostPlace, value) End Set End Property + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects @@ -81,6 +84,7 @@ Public Class ProjectPlanRows SetPropertyValue("UniqueObjects", _UniqueObjects, value) End Set End Property + Property JobNumberObjects As JobNumberObjects Get Return _JobNumberObjects diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/Popup/RegistryRowsFinancialControllingPopupWindow.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/Popup/RegistryRowsFinancialControllingPopupWindow.vb index bf50648..020f3ae 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/Popup/RegistryRowsFinancialControllingPopupWindow.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/Popup/RegistryRowsFinancialControllingPopupWindow.vb @@ -49,6 +49,7 @@ Public Class RegistryRowsFinancialControllingPopupWindow 'Popup a csoportos dolg SetPropertyValue("Controlling", _Controlling, value) End Set End Property + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects @@ -57,6 +58,7 @@ Public Class RegistryRowsFinancialControllingPopupWindow 'Popup a csoportos dolg SetPropertyValue("UniqueObjects", _UniqueObjects, value) End Set End Property + Property CostHolder As CostHolder Get Return _CostHolder @@ -65,6 +67,7 @@ Public Class RegistryRowsFinancialControllingPopupWindow 'Popup a csoportos dolg SetPropertyValue("CostHolder", _CostHolder, value) End Set End Property + Property CostPlace As CostPlace Get Return _CostPlace diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/Popup/RegistryRowsFinancialControlling_ReInvoicePopupWindow.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/Popup/RegistryRowsFinancialControlling_ReInvoicePopupWindow.vb index d7fba79..4bb70e6 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/Popup/RegistryRowsFinancialControlling_ReInvoicePopupWindow.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/Popup/RegistryRowsFinancialControlling_ReInvoicePopupWindow.vb @@ -92,7 +92,8 @@ Public Class RegistryRowsFinancialControlling_ReInvoicePopupWindow Return Me.RegistryRowsFinancialControlling.ReInvoiceReason End Get End Property - _ + + Property CostHolder As CostHolder Get Return _CostHolder @@ -101,7 +102,8 @@ Public Class RegistryRowsFinancialControlling_ReInvoicePopupWindow SetPropertyValue("CostHolder", _CostHolder, value) End Set End Property - _ + + Property CostPlace As CostPlace Get Return _CostPlace @@ -110,7 +112,8 @@ Public Class RegistryRowsFinancialControlling_ReInvoicePopupWindow SetPropertyValue("CostPlace", _CostPlace, value) End Set End Property - _ + + Property JobNumberObjects As JobNumberObjects Get Return _JobNumberObjects @@ -119,7 +122,8 @@ Public Class RegistryRowsFinancialControlling_ReInvoicePopupWindow SetPropertyValue("JobNumberObjects", _JobNumberObjects, value) End Set End Property - _ + + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/Popup/RegistryTaskGoToNewtStepWithGLAccount.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/Popup/RegistryTaskGoToNewtStepWithGLAccount.vb index 58ccc73..a6e0ff8 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/Popup/RegistryTaskGoToNewtStepWithGLAccount.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/Popup/RegistryTaskGoToNewtStepWithGLAccount.vb @@ -10,8 +10,8 @@ Imports DevExpress.Persistent.BaseImpl Imports DevExpress.Persistent.Validation Imports DevExpress.ExpressApp.ConditionalAppearance - _ - _ + + Public Class RegistryTaskGoToNewtStepWithGLAccount Inherits BaseObject Public Sub New(ByVal session As Session) @@ -21,18 +21,18 @@ Public Class RegistryTaskGoToNewtStepWithGLAccount MyBase.AfterConstruction() End Sub - _ + Property CustomersFrom As CustomersFrom Property Controlling As Controlling - Property UniqueObjects As UniqueObjects - Property JobNumberObjects As JobNumberObjects - Property CostHolder As CostHolder - Property CostPlace As CostPlace - _ + Property UniqueObjects As UniqueObjects + Property JobNumberObjects As JobNumberObjects + Property CostHolder As CostHolder + Property CostPlace As CostPlace + Property IsReinvoice As Boolean = False - _ + Property SelectedTasks As ArrayList End Class diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryHeader.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryHeader.vb index a11a30b..3e5a17b 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryHeader.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryHeader.vb @@ -383,6 +383,7 @@ Public Class RegistryHeader '-- iktatórendszer SetPropertyValue("RegistryNumber", _RegistryNumber, value) End Set End Property + Property JobNumberObjects() As JobNumberObjects Get Return _JobNumberObjects @@ -391,6 +392,7 @@ Public Class RegistryHeader '-- iktatórendszer SetPropertyValue("JobNumberObjects", _JobNumberObjects, value) End Set End Property + Property UniqueObjects() As UniqueObjects Get Return _UniqueObjects @@ -895,6 +897,7 @@ Public Class RegistryHeader '-- iktatórendszer + Property row_RRFC_CostPlace As CostPlace Get Return _row_RRFC_CostPlace @@ -906,6 +909,7 @@ Public Class RegistryHeader '-- iktatórendszer + Property row_RRFC_CostHolder As CostHolder Get Return _row_RRFC_CostHolder @@ -917,6 +921,7 @@ Public Class RegistryHeader '-- iktatórendszer + Property row_RRFC_JobNumberObjects As JobNumberObjects Get Return _row_RRFC_JobNumberObjects @@ -928,6 +933,7 @@ Public Class RegistryHeader '-- iktatórendszer + Property row_RRFC_UniqueObjects As UniqueObjects Get Return _row_RRFC_UniqueObjects diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryRowsFinancialControlling/RegistryRowsFinancialControlling.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryRowsFinancialControlling/RegistryRowsFinancialControlling.vb index d013034..63b95fd 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryRowsFinancialControlling/RegistryRowsFinancialControlling.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryRowsFinancialControlling/RegistryRowsFinancialControlling.vb @@ -188,7 +188,8 @@ Public Class RegistryRowsFinancialControlling End If End Set End Property - _ + + Property CostHolder As CostHolder Get Return _CostHolder @@ -203,7 +204,8 @@ Public Class RegistryRowsFinancialControlling End If End Set End Property - _ + + Property CostPlace As CostPlace Get Return _CostPlace @@ -212,7 +214,8 @@ Public Class RegistryRowsFinancialControlling SetPropertyValue("CostPlace", _CostPlace, value) End Set End Property - _ + + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects @@ -227,7 +230,8 @@ Public Class RegistryRowsFinancialControlling End If End Set End Property - _ + + Property JobNumberObjects As JobNumberObjects Get Return _JobNumberObjects diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryTasks.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryTasks.vb index 7800631..a16422a 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryTasks.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/RegistryTasks.vb @@ -156,9 +156,10 @@ Public Class RegistryTasks '-- Registryhez task a feladatokhoz SetPropertyValue("row_RRFC_Controlling", _row_RRFC_Controlling, value) End Set End Property - _ - _ - _ + + + + Property row_RRFC_CostPlace As CostPlace Get Return _row_RRFC_CostPlace @@ -237,6 +238,7 @@ Public Class RegistryTasks '-- Registryhez task a feladatokhoz + Property row_RRFC_JobNumberObjects As JobNumberObjects Get Return _row_RRFC_JobNumberObjects @@ -248,6 +250,7 @@ Public Class RegistryTasks '-- Registryhez task a feladatokhoz + Property row_RRFC_UniqueObjects As UniqueObjects Get Return _row_RRFC_UniqueObjects diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/Telephone/RegistryTelephone.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/Telephone/RegistryTelephone.vb index a19cf5e..a658751 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/Telephone/RegistryTelephone.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Registry/Telephone/RegistryTelephone.vb @@ -68,6 +68,7 @@ Public Class RegistryTelephone SetPropertyValue("RegistryTelephoneParameters", _RegistryTelephoneParameters, value) End Set End Property + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/Controlling.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/Controlling.vb index 0ce5e4f..878c17c 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/Controlling.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/Controlling.vb @@ -39,7 +39,7 @@ Public Class Controlling Private _RequireCars As Boolean = False Private _RequireHRPerson As Boolean Private _RequirePhones As Boolean = False - + Private _IsActive As Boolean Public Sub New(ByVal session As Session) MyBase.New(session) If session.IsObjectsLoading = False And session.IsObjectsSaving = False Then @@ -78,7 +78,18 @@ Public Class Controlling Next Me.ReconfigureGroup(Nothing, Me, False) End Sub - + ''' + ''' Használatban van ? + ''' + ''' + Property IsActive As Boolean + Get + Return _IsActive + End Get + Set(value As Boolean) + SetPropertyValue("IsActive", _IsActive, value) + End Set + End Property Property ParentObject As Controlling diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/CostHolder.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/CostHolder.vb index 934b778..4faa4ed 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/CostHolder.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/CostHolder.vb @@ -13,11 +13,23 @@ Imports DevExpress.Persistent.Validation _ Public Class CostHolder Inherits HCategory + Private _IsActive As Boolean Public Sub New(ByVal session As Session) MyBase.New(session) End Sub - + ''' + ''' Használatban van ? + ''' + ''' + Property IsActive As Boolean + Get + Return _IsActive + End Get + Set(value As Boolean) + SetPropertyValue("IsActive", _IsActive, value) + End Set + End Property _ ReadOnly Property HRPersonCostHolder As XPCollection(Of HRPersonCostHolder) Get diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/CostPlace.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/CostPlace.vb index 512c90e..816424f 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/CostPlace.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/CostPlace.vb @@ -13,9 +13,22 @@ Imports DevExpress.Persistent.Validation _ Public Class CostPlace Inherits HCategory + Private _IsActive As Boolean Public Sub New(ByVal session As Session) MyBase.New(session) End Sub + ''' + ''' Használatban van ? + ''' + ''' + Property IsActive As Boolean + Get + Return _IsActive + End Get + Set(value As Boolean) + SetPropertyValue("IsActive", _IsActive, value) + End Set + End Property Property ParentObject As CostPlace diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/JobNumberObjects.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/JobNumberObjects.vb index 5afef27..aa87a03 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/JobNumberObjects.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/JobNumberObjects.vb @@ -13,10 +13,18 @@ Imports DevExpress.Persistent.Validation _ Public Class JobNumberObjects Inherits HCategory + Private _IsActive As Boolean Public Sub New(ByVal session As Session) MyBase.New(session) End Sub - + Property IsActive As Boolean + Get + Return _IsActive + End Get + Set(value As Boolean) + SetPropertyValue("IsActive", _IsActive, value) + End Set + End Property Property ParentObject As JobNumberObjects diff --git a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/UniqueObjects.vb b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/UniqueObjects.vb index 3e3ea55..a0223ca 100644 --- a/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/UniqueObjects.vb +++ b/Nuvolar.Module/BusinessObjects/Financial/FinancialObjects/Stocks/5D/UniqueObjects.vb @@ -9,20 +9,21 @@ Imports DevExpress.Persistent.Base Imports DevExpress.Persistent.BaseImpl Imports DevExpress.Persistent.Validation - _ - _ + + Public Class UniqueObjects Inherits HCategory Private _Cars As Cars Private _Phones As Phones Private _HRPerson As HRPerson + Private _IsActive As Boolean Public Sub New(ByVal session As Session) MyBase.New(session) End Sub - _ + Property Cars As Cars Get Return _Cars @@ -31,7 +32,7 @@ Public Class UniqueObjects SetPropertyValue("Cars", _Cars, value) End Set End Property - _ + Property Phones As Phones Get Return _Phones @@ -40,7 +41,7 @@ Public Class UniqueObjects SetPropertyValue("Phones", _Phones, value) End Set End Property - _ + Property HRPerson As HRPerson Get Return _HRPerson @@ -49,7 +50,18 @@ Public Class UniqueObjects SetPropertyValue("HRPerson", _HRPerson, value) End Set End Property - + ''' + ''' Használatban van ? + ''' + ''' + Property IsActive As Boolean + Get + Return _IsActive + End Get + Set(value As Boolean) + SetPropertyValue("IsActive", _IsActive, value) + End Set + End Property Property ParentObject As UniqueObjects @@ -60,9 +72,9 @@ Public Class UniqueObjects MyBase.Parent = value End Set End Property - _ - _ - _ + + + Private ReadOnly Property CollectionOfUniqueObjects As XPCollection(Of UniqueObjects) Get Dim _CollectionOfUniqueObjects As New XPCollection(Of UniqueObjects)(Session, CriteriaOperator.Parse("Oid != ?", Me.Oid)) diff --git a/Nuvolar.Module/BusinessObjects/GeneralObjects/Cars/Cars.vb b/Nuvolar.Module/BusinessObjects/GeneralObjects/Cars/Cars.vb index a419493..c44afe7 100644 --- a/Nuvolar.Module/BusinessObjects/GeneralObjects/Cars/Cars.vb +++ b/Nuvolar.Module/BusinessObjects/GeneralObjects/Cars/Cars.vb @@ -123,6 +123,7 @@ Public Class Cars End Set End Property + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects diff --git a/Nuvolar.Module/BusinessObjects/GeneralObjects/HR/HRPerson.vb b/Nuvolar.Module/BusinessObjects/GeneralObjects/HR/HRPerson.vb index 981bc8c..cf141c0 100644 --- a/Nuvolar.Module/BusinessObjects/GeneralObjects/HR/HRPerson.vb +++ b/Nuvolar.Module/BusinessObjects/GeneralObjects/HR/HRPerson.vb @@ -182,6 +182,7 @@ Public Class HRPerson SetPropertyValue("Post", _Post, value) End Set End Property + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects diff --git a/Nuvolar.Module/BusinessObjects/GeneralObjects/Phones/Phones.vb b/Nuvolar.Module/BusinessObjects/GeneralObjects/Phones/Phones.vb index da820e3..feb7718 100644 --- a/Nuvolar.Module/BusinessObjects/GeneralObjects/Phones/Phones.vb +++ b/Nuvolar.Module/BusinessObjects/GeneralObjects/Phones/Phones.vb @@ -108,7 +108,7 @@ Public Class Phones SetPropertyValue("UserCreated", _UserCreated, value) End Set End Property - + Property UniqueObjects As UniqueObjects Get Return _UniqueObjects diff --git a/Nuvolar.Module/Model.DesignedDiffs.xafml b/Nuvolar.Module/Model.DesignedDiffs.xafml index e8bdf4e..7365c1d 100644 --- a/Nuvolar.Module/Model.DesignedDiffs.xafml +++ b/Nuvolar.Module/Model.DesignedDiffs.xafml @@ -4571,8 +4571,8 @@ - - + + @@ -5449,7 +5449,7 @@ - + @@ -8712,8 +8712,8 @@ - + @@ -8737,8 +8737,8 @@ - + @@ -26627,7 +26627,7 @@ - + @@ -26653,7 +26653,7 @@ - + @@ -28515,8 +28515,8 @@ - + diff --git a/Nuvolar.Module/My Project/licenses.licx b/Nuvolar.Module/My Project/licenses.licx index eab008c..f1ab4b8 100644 --- a/Nuvolar.Module/My Project/licenses.licx +++ b/Nuvolar.Module/My Project/licenses.licx @@ -1 +1,3 @@ DevExpress.ExpressApp.ViewController, DevExpress.ExpressApp.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + +DevExpress.ExpressApp.SystemModule.SystemModule, DevExpress.ExpressApp.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/Nuvolar.Module/Updater.vb b/Nuvolar.Module/Updater.vb index 12f9f43..6ff09d2 100644 --- a/Nuvolar.Module/Updater.vb +++ b/Nuvolar.Module/Updater.vb @@ -233,30 +233,30 @@ Public Class Updater End If - SetDefaultStorage(ObjectSpace) - SetWorkflow(ObjectSpace) - SetCRM(ObjectSpace) - SetDefaultfixedAssets(ObjectSpace) + 'SetDefaultStorage(ObjectSpace) + 'SetWorkflow(ObjectSpace) + 'SetCRM(ObjectSpace) + 'SetDefaultfixedAssets(ObjectSpace) - '_2011_11_22(ObjectSpace, CurrentDBVersion) - _2012_03_01(ObjectSpace, CurrentDBVersion) - _2012_03_10(ObjectSpace, CurrentDBVersion) - _2012_04_13(ObjectSpace, CurrentDBVersion) - _2012_05_02(ObjectSpace, CurrentDBVersion) - _2012_05_08(ObjectSpace, CurrentDBVersion) - _2012_08_31(ObjectSpace, CurrentDBVersion) - _2012_10_29(ObjectSpace, CurrentDBVersion) - _2012_11_08(ObjectSpace, CurrentDBVersion) - _2013_04_17(ObjectSpace, CurrentDBVersion) - _2013_04_25(ObjectSpace, CurrentDBVersion) - _2013_07_23(ObjectSpace, CurrentDBVersion) - _2013_07_23_1(ObjectSpace, CurrentDBVersion) - _2014_02_14(ObjectSpace, CurrentDBVersion) - _2014_03_07(ObjectSpace, CurrentDBVersion) - _2016_01_28(ObjectSpace, CurrentDBVersion) - ProductsGant(ObjectSpace) + ''_2011_11_22(ObjectSpace, CurrentDBVersion) + '_2012_03_01(ObjectSpace, CurrentDBVersion) + '_2012_03_10(ObjectSpace, CurrentDBVersion) + '_2012_04_13(ObjectSpace, CurrentDBVersion) + '_2012_05_02(ObjectSpace, CurrentDBVersion) + '_2012_05_08(ObjectSpace, CurrentDBVersion) + '_2012_08_31(ObjectSpace, CurrentDBVersion) + '_2012_10_29(ObjectSpace, CurrentDBVersion) + '_2012_11_08(ObjectSpace, CurrentDBVersion) + '_2013_04_17(ObjectSpace, CurrentDBVersion) + '_2013_04_25(ObjectSpace, CurrentDBVersion) + '_2013_07_23(ObjectSpace, CurrentDBVersion) + '_2013_07_23_1(ObjectSpace, CurrentDBVersion) + '_2014_02_14(ObjectSpace, CurrentDBVersion) + '_2014_03_07(ObjectSpace, CurrentDBVersion) + '_2016_01_28(ObjectSpace, CurrentDBVersion) + 'ProductsGant(ObjectSpace) ' ZIPHUUpdate(ObjectSpace) - StorageOut_Storno_Regenerate(ObjectSpace) + 'StorageOut_Storno_Regenerate(ObjectSpace) 'RegistryHeader_UserCreated(ObjectSpace)