Version 1.4.4.3

MultiTool.Common/BaseClass.vb

@@ -0,0 +1,17 @@
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Logging
+
+Public Class BaseClass
+    Inherits DigitalData.Modules.Base.BaseClass
+
+    Friend Database As MSSQLServer
+
+    Public Sub New(pLogConfig As LogConfig)
+        MyBase.New(pLogConfig)
+    End Sub
+
+    Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer)
+        MyBase.New(pLogConfig)
+        Database = pDatabase
+    End Sub
+End Class

MultiTool.Common/Config.vb

@@ -5,4 +5,6 @@ Public Class Config
     Public Property ConnectionString As String = ""
     Public Property LastUsedMandator As String = ""
     Public Property Debug As Boolean = False
+    Public Property AutomaticPriceCalculation As Boolean = True
+    Public Property AutomaticLoadingOnFormOpen As Boolean = False
 End Class

MultiTool.Common/Constants.vb

@@ -1,8 +1,18 @@
 Public Class Constants
+    Public Const HTTP_REQUEST_TIMEOUT_IN_SECONDS = 60
+
     Public Const COLUMN_GUID = "GUID"
 
     Public Const FUNCTION_GLN = "GLN"
     Public Const FUNCTION_EAN = "EAN"
+    Public Const FUNCTION_PRICE = "PRICE"
+    Public Const FUNCTION_SQL = "SQL"
+    Public Const FUNCTION_FIELD = "FIELD"
+    Public Const FUNCTION_RUNNINGNUMBER = "RUNNINGNUMBER"
+    Public Const FUNCTION_ADDRESS = "ADDRESS"
+
+    Public Const PLACEHOLDER_CONST = "CONST"
+    Public Const PLACEHOLDER_FIELD = "FIELD"
 
     Public Const TEMPLATE_TYPE_DATE = "xs:date"
     Public Const TEMPLATE_TYPE_INTEGER = "xs:integer"
@@ -50,6 +60,42 @@
         [Boolean]
         [Decimal]
     End Enum
+
+    Public Enum FieldErrorType
+        None
+        MissingValue
+        AccountNotFound
+        ArticleNotFound
+        PriceNotCalculated
+        MissingParameter
+    End Enum
+
+    Public Class FieldError
+        Public Type As FieldErrorType
+        Public Message As String
+
+        Public Overrides Function ToString() As String
+            Return $"{Message} ({Type})"
+        End Function
+    End Class
+
+
+    Public Enum DocumentErrorType
+        MandatorNotFound
+        MissingXmlAttribute
+        AttributeValidationFailed
+        PriceNotCalculated
+    End Enum
+
+    Public Class DocumentError
+        Public Type As DocumentErrorType
+        Public Message As String
+
+        Public Overrides Function ToString() As String
+            Return $"{Message} ({Type})"
+        End Function
+    End Class
+
     Public Enum XmlFunction
         None = 0
         GLN = 1

MultiTool.Common/Documents/Document.vb

@@ -0,0 +1,108 @@
+Imports System.IO
+Imports MultiTool.Common.Constants
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Winline.Entities
+
+Namespace Documents
+    Public Class Document
+        Public File As FileInfo
+        Public Schema As Template
+        Public Mandator As Mandator
+
+        Public TemplateName As String
+        Public Property TemplateType As Integer
+        Public [Option] As Integer
+        Public PrintVoucher As Integer
+
+        ''' <summary>
+        ''' Original Values, read-only
+        ''' </summary>
+        Public Property Rows As New List(Of DocumentRow)
+
+        Public Property Imported As Boolean = False
+
+        ''' <summary>
+        ''' This is used for saving the selected state via checkbox, don't remove!
+        ''' </summary>
+        Public Property Selected As Boolean = False
+
+        Private DocumentErrors As New List(Of DocumentError)
+
+        Public ReadOnly Property HasErrors As Boolean
+            Get
+                Return Errors.Count > 0
+            End Get
+        End Property
+
+        Public ReadOnly Property Errors As List(Of String)
+            Get
+                Dim oRowErrors = Rows.
+                    SelectMany(Function(row) row.Errors, Function(row, err) err.ToString).
+                    ToList()
+
+                Dim oDocumentErrors As List(Of String) = DocumentErrors.
+                    Select(Function(err) err.ToString()).
+                    ToList()
+
+                Return oDocumentErrors.
+                    Concat(oRowErrors).
+                    ToList()
+            End Get
+        End Property
+
+        Public Sub AddDocumentError(pDocumentError As DocumentErrorType, pMessage As String)
+            DocumentErrors.Add(New DocumentError With {
+                .Type = pDocumentError,
+                .Message = pMessage
+            })
+        End Sub
+
+        Public ReadOnly Property MandatorId As String
+            Get
+                Return Mandator?.Id
+            End Get
+        End Property
+
+        Public ReadOnly Property CreatedAt As Date
+            Get
+                Return File?.CreationTime
+            End Get
+        End Property
+
+        Public ReadOnly Property FullName As String
+            Get
+                Return File?.FullName
+            End Get
+        End Property
+
+        Public ReadOnly Property FileName As String
+            Get
+                Return File?.Name
+            End Get
+        End Property
+
+        ''' <summary>
+        ''' Finds the first occurrence of Field and returns its value
+        ''' </summary>
+        Public Function GetFieldValue(pField As String) As String
+            For Each oRow In Rows
+                For Each oField In oRow.Fields
+                    If oField.Key = pField Then
+                        Return oField.Value.Final
+                    End If
+                Next
+            Next
+
+            Return Nothing
+        End Function
+
+        Public Overrides Function Equals(obj As Object) As Boolean
+            If obj Is Nothing Then
+                Return False
+            End If
+
+            Return FullName = DirectCast(obj, Document).FullName
+        End Function
+    End Class
+
+End Namespace

MultiTool.Common/Documents/DocumentCleaner.vb

@@ -1,18 +1,19 @@
 Imports System.IO
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared.Templates
+Imports DigitalData.Modules.Base
+Imports MultiTool.Common.Templates
 
 Namespace Documents
     Public Class DocumentCleaner
         Inherits BaseClass
 
         Private ReadOnly Template As Template
-        Private ReadOnly FileEx As DigitalData.Modules.Filesystem.File
+        Private ReadOnly FileEx As FilesystemEx
 
         Public Sub New(pLogConfig As LogConfig, pTemplate As Template)
             MyBase.New(pLogConfig)
             Template = pTemplate
-            FileEx = New DigitalData.Modules.Filesystem.File(LogConfig)
+            FileEx = New FilesystemEx(LogConfig)
         End Sub
 
         Public Function CleanImportedDocuments(pDocuments As List(Of Document)) As Boolean
@@ -22,11 +23,23 @@ Namespace Documents
                 Where(Function(doc) doc.Imported = True).
                 ToList()
 
+            If oImportedDocuments.Count = 0 Then
+                Logger.Debug("No exported files found. Skipping.")
+                Return True
+            End If
+
+            Logger.Debug("Cleaning [{0}] exported files, moving to [{1}]", oImportedDocuments.Count, oOutputDirectory)
+
+            Dim oRemovedDocuments As New List(Of Document)
+
             For Each oDocument As Document In oImportedDocuments
                 Try
                     Dim oFileinfo = New FileInfo(oDocument.FullName)
                     Dim oDestination = Path.Combine(oOutputDirectory, oFileinfo.Name)
                     File.Move(oFileinfo.FullName, oDestination)
+                    oRemovedDocuments.Add(oDocument)
+
+                    Logger.Debug("File [{0}] successfully moved.", oFileinfo.Name)
                 Catch ex As Exception
                     Logger.Warn("File [{0}] could not be moved to output directory!", oDocument.FullName)
                     Logger.Error(ex)
@@ -34,6 +47,12 @@ Namespace Documents
                 End Try
             Next
 
+            Logger.Debug("Moved [{0}] files successfully.", oRemovedDocuments.Count)
+
+            pDocuments = pDocuments.
+                Except(oRemovedDocuments).
+                ToList()
+
             Return oResult
         End Function
     End Class

MultiTool.Common/Documents/DocumentLoader.vb

@@ -0,0 +1,815 @@
+Imports System.IO
+Imports System.Text.RegularExpressions
+Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Language
+Imports MultiTool.Common.Exceptions
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Winline
+Imports MultiTool.Common.Winline.Entities
+Imports MultiTool.Common.Constants
+Imports DigitalData.Modules.Database
+Imports DevExpress.Utils.CommonDialogs
+Imports DigitalData.Modules.Base
+
+Namespace Documents
+    Public Class DocumentLoader
+        Inherits BaseClass
+
+        Private ReadOnly Winline As WinlineData
+        Private ReadOnly MappingConfig As MappingConfig
+        Private ReadOnly TemplateConfig As TemplateConfig
+        Private ReadOnly ApplicationConfig As Config
+        Private ReadOnly Patterns As Patterns
+
+        Public Property Files As New List(Of Document)
+
+        Public Property FilesTotal As Integer = 0
+        Public Property FilesLoaded As Integer = 0
+
+        Public Event FileLoadComplete As EventHandler(Of FileLoadInfo)
+        Public Event FileLoadProgress As EventHandler(Of FileLoadProgressInfo)
+
+        Public Class FileLoadInfo
+            Public FilesLoaded As Integer
+            Public FilesTotal As Integer
+
+            Public Sub New(pTotal As Integer, pLoaded As Integer)
+                FilesTotal = pTotal
+                FilesLoaded = pLoaded
+            End Sub
+        End Class
+
+        Public Class FileLoadProgressInfo
+            Inherits FileLoadInfo
+
+            Public RunningFunction As String
+
+            Public Sub New(pTotal As Integer, pLoaded As Integer)
+                MyBase.New(pTotal, pLoaded)
+            End Sub
+        End Class
+
+        Public Sub New(pLogConfig As LogConfig, pWinline As WinlineData, pDatabase As MSSQLServer, pMappingConfig As MappingConfig, pTemplateConfig As TemplateConfig, pGeneralConfig As GeneralConfig, pApplicationConfig As Config)
+            MyBase.New(pLogConfig, pDatabase)
+            Winline = pWinline
+            MappingConfig = pMappingConfig
+            TemplateConfig = pTemplateConfig
+            ApplicationConfig = pApplicationConfig
+            Patterns = New Patterns(pLogConfig, pGeneralConfig)
+        End Sub
+
+        Public Async Function LoadFiles(pTemplate As Template, pMandator As Mandator) As Task(Of Boolean)
+            Logger.Info("Loading files from directory [{0}]", pTemplate.InputDirectory)
+            Files.Clear()
+
+            Try
+                Dim oDirectory As New DirectoryInfo(pTemplate.InputDirectory)
+                Dim oFiles = oDirectory.GetFiles()
+                FilesTotal = oFiles.Count
+
+                Logger.Debug("Found [{0}] files in directory [{1}]", oFiles.Count, oDirectory)
+
+                For Each oFile In oFiles
+                    Logger.Info("Loading file [{0}]", oFile.Name)
+                    Dim oDocument = Await LoadFile(oFile, pTemplate, pMandator)
+                    Files.Add(oDocument)
+                    FilesLoaded = Files.Count
+
+                    Dim oInfo As New FileLoadInfo(FilesTotal, FilesLoaded)
+                    RaiseEvent FileLoadComplete(Me, oInfo)
+                Next
+
+                Return True
+
+            Catch ex As Exception
+                Logger.Error(ex)
+                Throw ex
+
+            End Try
+        End Function
+
+        Public Async Function LoadFile(pFileInfo As FileInfo, pTemplate As Template, pMandator As Mandator) As Task(Of Document)
+            Logger.Debug("Creating new Document object for file [{0}]", pFileInfo.Name)
+            Dim oDocument As New Document With {
+                .File = pFileInfo,
+                .Schema = pTemplate
+            }
+
+            Try
+                oDocument = LoadDocumentData(oDocument, pTemplate, TemplateConfig)
+
+            Catch ex As Exception
+                Logger.Error(ex)
+                Throw ex
+
+            End Try
+
+            Try
+                oDocument = Await MatchDataFromWinLine(oDocument, Winline.Mandators, pMandator, pTemplate)
+
+            Catch ex As Exception
+                Logger.Error(ex)
+                Throw ex
+
+            End Try
+
+            Try
+                oDocument = MarkRequiredFields(oDocument)
+
+            Catch ex As Exception
+                Logger.Error(ex)
+                Throw ex
+
+            End Try
+
+            Return oDocument
+        End Function
+
+        Public Function MarkRequiredFields(pDocument As Document) As Document
+            For Each oRow In pDocument.Rows
+                For Each oField In oRow.Fields
+                    If oField.Value.Final = String.Empty And oField.Value.IsRequired Then
+                        oField.Value.AddFieldError(FieldErrorType.MissingValue, $"Attribut '{oField.Key}' ist ein Pflichtfeld, wurde aber nicht gefüllt.")
+                    End If
+                Next
+            Next
+
+            Return pDocument
+        End Function
+
+        Public Sub ReplaceDocument(pDocument As Document)
+            Dim oIndex = Files.IndexOf(pDocument)
+            Files.Item(oIndex) = pDocument
+        End Sub
+
+
+        Private Function IncludeSchema(pDocument As Document, pTemplate As Template) As Document
+            Logger.Debug("Adding schema to Document object.")
+            pDocument.Schema = pTemplate
+            Return pDocument
+        End Function
+
+
+        ''' <summary>
+        ''' Loads a single document from the FullName Property in the Document Object
+        ''' </summary>
+        ''' <example>
+        ''' A document might look like this:
+        ''' <MESOWebService>
+        '''     <Row1></Row1>
+        '''     <Row2></Row2>
+        '''     <Row3></Row3>
+        ''' </MESOWebService>
+        ''' </example>
+        Private Function LoadDocumentData(pDocument As Document, pTemplate As Template, pTemplateConfig As TemplateConfig) As Document
+            Logger.Debug("Loading file contents")
+
+            Dim oText As String
+            Dim oDoc As XDocument
+
+            Try
+                Logger.Debug("Loading file from fs..")
+                oText = IO.File.ReadAllText(pDocument.FullName)
+
+                Logger.Debug("Parsing file..")
+                oDoc = XDocument.Parse(oText)
+            Catch ex As Exception
+                Logger.Error(ex)
+                Throw ex
+            End Try
+
+            Logger.Debug("File Loaded.")
+
+            Dim oRootElement As XElement = XmlData.GetElement(oDoc, "MESOWebService")
+            If oRootElement Is Nothing Then
+                pDocument.AddDocumentError(DocumentErrorType.MissingXmlAttribute, "Datei enthält kein MESOWebService-Attribut")
+            End If
+
+            Dim oTemplateName = XmlData.GetElementAttribute(oRootElement, "Template")
+            If oTemplateName Is Nothing Then
+                pDocument.AddDocumentError(DocumentErrorType.MissingXmlAttribute, "Datei enthält kein Template-Attribut")
+            End If
+
+            Dim oTemplateType = XmlData.GetElementAttribute(oRootElement, "TemplateType")
+            If oTemplateType Is Nothing Then
+                pDocument.AddDocumentError(DocumentErrorType.MissingXmlAttribute, "Datei enthält kein TemplateType-Attribut")
+            End If
+
+            Dim oOption = XmlData.GetElementAttribute(oRootElement, "option")
+            If oOption Is Nothing Then
+                pDocument.AddDocumentError(DocumentErrorType.MissingXmlAttribute, "Datei enthält kein option-Attribut")
+            End If
+
+            Dim oPrintVoucher = XmlData.GetElementAttribute(oRootElement, "printVoucher")
+            If oPrintVoucher Is Nothing Then
+                pDocument.AddDocumentError(DocumentErrorType.MissingXmlAttribute, "Datei enthält kein printVoucher-Attribut")
+            End If
+
+            ' The first level of Elements are the document Rows
+            Dim oTopLevelElements As List(Of XElement) = oRootElement.Elements.ToList
+            Dim oDocumentRows As New List(Of DocumentRow)
+            Dim oRowSortKey As Integer = 0
+
+            ' TODO: Somehow add all fields in the correct order
+            ' 
+            ' Right now, the method of 
+            ' - first the filled field from xml
+            ' - then the rest from schema
+            '
+            ' leads to unordered fields.
+            For Each oTopLevelElement As XElement In oTopLevelElements
+                Dim oColumnSortKey = 0
+                Dim oFields As New Dictionary(Of String, DocumentRow.FieldValue)
+                Dim oSubElements = oTopLevelElement.Descendants().ToList()
+                Dim oTable = pTemplate.Tables.
+                    Where(Function(t) t.Name = oTopLevelElement.Name).
+                    FirstOrDefault()
+
+                Logger.Debug("Creating fields from [{0}] columns for Table [{1}]", oTable.Columns.Count, oTable.Name)
+
+                For Each oColumn In oTable.Columns
+                    Dim oQuery = oSubElements.Where(Function(e) e.Name = oColumn.Name)
+                    Dim oElementCount = oQuery.Count()
+                    Dim oSubElement = oQuery.FirstOrDefault()
+
+                    If oElementCount > 1 Then
+                        Logger.Warn("Found [{0}] elements for column [{1}]. Using first occurrence.")
+                    End If
+
+                    If oSubElement IsNot Nothing Then
+                        Dim oRequired = oColumn.IsRequired
+                        Dim oValue = oSubElement.Value.Trim()
+
+                        Logger.Debug("Creating existing field from Element: [{0}]", oSubElement.Name.ToString)
+
+                        ' TODO: Needed when we have time for date times
+                        'If oTemplateField.DataType = Constants.ColumnType.Date Then
+                        '    Dim oDate = Date.ParseExact(oValue, "yyyy-MM-dd", CultureInfo.InvariantCulture)
+                        '    oValue = oDate.ToString("d")
+                        'End If
+
+                        Dim oFieldValue = GetFieldValueFromColumn(oColumn, oColumnSortKey)
+                        oFieldValue.SetOriginalValue(oValue)
+
+                        oFields.Add(oSubElement.Name.ToString, oFieldValue)
+                    Else
+                        Logger.Debug("Creating new field from Configuration: [{0}]", oColumn.Name)
+
+                        Dim oFieldValue = GetFieldValueFromColumn(oColumn, oColumnSortKey)
+
+                        If oColumn.Config?.IsRequired Then
+                            oFieldValue.AddFieldError(FieldErrorType.MissingValue, $"Attribut {oSubElement.Name} wird benötigt, ist aber nicht gefüllt.")
+                        End If
+
+                        oFields.Add(oColumn.Name, oFieldValue)
+                    End If
+
+                    oColumnSortKey += 1
+                Next
+
+                ' Create a DocumentRow object for each Top Level Element
+                Dim oRow = New DocumentRow With {
+                    .SortKey = oRowSortKey,
+                    .TableName = oTopLevelElement.Name.ToString,
+                    .Fields = oFields
+                }
+
+                oRowSortKey += 1
+                oDocumentRows.Add(oRow)
+            Next
+
+            ' Update the document
+            pDocument.TemplateName = oTemplateName
+            pDocument.TemplateType = oTemplateType
+            pDocument.Option = oOption
+            pDocument.PrintVoucher = oPrintVoucher
+            pDocument.Rows = oDocumentRows
+
+            Return pDocument
+        End Function
+
+        Public Function GetFieldValueFromColumn(pColumn As Template.Column, pSortKey As Integer) As DocumentRow.FieldValue
+            Return New DocumentRow.FieldValue(LogConfig) With {
+                .DataType = pColumn.DataType,
+                .IsRequired = pColumn.IsRequired,
+                .IsVirtual = pColumn.Config.IsVirtual,
+                .PreferExternalValue = pColumn.Config.PreferExternalValue,
+                .SortKey = pSortKey
+            }
+        End Function
+
+
+        Private Async Function MatchDataFromWinLine(pDocument As Document, pMandators As List(Of Mandator), pMandator As Mandator, pTemplate As Template) As Task(Of Document)
+            Dim oMandators As List(Of Mandator) = pMandators.
+                Where(Function(m) m.IsWhitelisted = True).
+                OrderBy(Function(m) m.Order).
+                ToList()
+
+            Dim oInfo As New FileLoadProgressInfo(FilesTotal, FilesLoaded) With {.RunningFunction = "Mandant finden"}
+            RaiseEvent FileLoadProgress(Me, oInfo)
+
+            Dim oMandator As Mandator = Nothing
+            If pMandator IsNot Nothing Then
+                oMandator = pMandator
+            Else
+                oMandator = Winline.FindMatchingMandatorFromOrder(pDocument)
+            End If
+
+            If oMandator Is Nothing Then
+                Logger.Warn("Mandator not found for File [{0}]", pDocument.File.Name)
+
+                ' Without mandator, we just exit, life is meaningless.
+                pDocument.AddDocumentError(DocumentErrorType.MandatorNotFound, "Mandant nicht gefunden. Verarbeitung wurde abgebrochen.")
+            Else
+                ' Set mandator befor applying any functions that depend on a valid mandator
+                pDocument.Mandator = oMandator
+
+                RaiseEvent FileLoadProgress(Me, New FileLoadProgressInfo(FilesTotal, FilesLoaded) With {.RunningFunction = "Winline-Funktionen"})
+
+                pDocument = Await ApplyDefinedItemFunctionsForImportAsync(pDocument, oMandator, pTemplate)
+                pDocument = ApplyDynamicItemFunctionsForImport(pDocument, oMandator)
+
+                RaiseEvent FileLoadProgress(Me, New FileLoadProgressInfo(FilesTotal, FilesLoaded) With {.RunningFunction = "Preis-Funktionen"})
+
+                If ApplicationConfig.AutomaticPriceCalculation = True Then
+                    ' These functions will only be applied if the document does not have errors
+                    pDocument = Await MaybeApplyPriceFunctions(pDocument, oMandator, pTemplate)
+                End If
+
+                RaiseEvent FileLoadProgress(Me, New FileLoadProgressInfo(FilesTotal, FilesLoaded) With {.RunningFunction = "Feld-Funktionen"})
+
+
+                pDocument = ApplySQLFunctionForImport(pDocument, TemplateConfig.SqlItems)
+
+                ' This function needs to be the last one because 
+                ' it can relate to any previously set value
+                pDocument = ApplyFieldFunctionForImport(pDocument, oMandator, pTemplate)
+            End If
+
+            Return pDocument
+        End Function
+
+        Private Function ApplySQLFunctionForImport(pDocument As Document, pSQLConfig As List(Of FieldConfig)) As Document
+            For Each oSQLConfigItem In pSQLConfig
+                For Each oFunction In oSQLConfigItem.Functions
+
+                    If Not oFunction.Name = FUNCTION_SQL Then
+                        Continue For
+                    End If
+
+                    ' FieldList is a list of fields that will be changed
+                    ' Example: Setting SQL for Article StorageLocation will invoke the sql for each row
+                    Dim oRowList = pDocument.Rows.
+                        Where(Function(row) row.Fields.Any(Function(field) field.Key = oSQLConfigItem.Name)).
+                        ToList()
+
+                    For Each oRow As DocumentRow In oRowList
+
+                        Dim oSQL = oFunction.Params
+                        Dim oField = oRow.Fields.
+                            Where(Function(field) field.Key = oSQLConfigItem.Name).
+                            SingleOrDefault()
+
+                        oSQL = Patterns.ReplaceForImport(pDocument, oRow, oSQL)
+
+                        Dim oValue = Database.GetScalarValue(oSQL)
+
+                        If oValue IsNot Nothing Then
+                            oField.Value.SetExternalValue(oValue)
+                        End If
+
+                    Next
+
+                Next
+
+            Next
+
+            Return pDocument
+        End Function
+
+
+        ''' <summary>
+        ''' Apply price calculation to the documents products
+        ''' 
+        ''' This needs to be strictly seperated from `ApplyDefinedItemFunctionsForImport`
+        ''' because prices can only be calculated if GLN and EAN functions were already (successfully) processed
+        ''' </summary>
+        Public Async Function MaybeApplyPriceFunctions(pDocument As Document, pMandator As Mandator, pTemplate As Template) As Task(Of Document)
+            If pDocument.HasErrors Then
+                pDocument.AddDocumentError(DocumentErrorType.PriceNotCalculated, "Der Preis konnte für mindestens eine Zeile nicht ermittelt werden, weil es noch Fehler im Dokument gibt")
+                Return pDocument
+            End If
+
+            For Each oRow As DocumentRow In pDocument.Rows
+                Dim oTable = pTemplate.Tables.Where(Function(table) table.Name = oRow.TableName).SingleOrDefault()
+
+                For Each oField In oRow.Fields
+                    If oTable Is Nothing Then
+                        Exit For
+                    End If
+
+                    Dim oColumn = oTable.Columns.Where(Function(c) c.Name = oField.Key).SingleOrDefault()
+                    If oColumn Is Nothing Then
+                        Continue For
+                    End If
+
+                    For Each oFunction As FieldConfig.ColumnFunction In oColumn.Config.Functions
+
+                        Dim oFunctionName = oFunction.Name
+                        Dim oFunctionParams = oFunction.Params
+
+
+
+                        If oFunctionName = String.Empty Then
+                            Continue For
+                        End If
+
+                        Logger.Debug("Running Function: [{0}]", oFunctionName)
+                        Logger.Debug("With Parameters: [{0}]", oFunctionParams)
+
+
+                        Dim oParamsDict = Parameters.Parse(oFunctionParams)
+
+                        If oFunctionName = Constants.FUNCTION_PRICE Then
+                            Await SetPrice(oRow, oField.Key, oParamsDict, pDocument, pMandator, pTemplate)
+                        End If
+                    Next
+                Next
+            Next
+
+            Return pDocument
+        End Function
+
+        Private Async Function ApplyDefinedItemFunctionsForImportAsync(pDocument As Document, pMandator As Mandator, pTemplate As Template) As Task(Of Document)
+            For Each oRow As DocumentRow In pDocument.Rows
+                Dim oTable = pTemplate.Tables.Where(Function(table) table.Name = oRow.TableName).SingleOrDefault()
+
+                For Each oField In oRow.Fields
+                    If oTable Is Nothing Then
+                        Exit For
+                    End If
+
+                    Dim oItemName As String = oField.Key
+
+                    Dim oColumn = oTable.Columns.Where(Function(c) c.Name = oItemName).SingleOrDefault()
+                    If oColumn Is Nothing Then
+                        Continue For
+                    End If
+
+                    For Each oFunction As FieldConfig.ColumnFunction In oColumn.Config.Functions
+
+                        Dim oFunctionName = oFunction.Name
+                        Dim oFunctionParams = oFunction.Params
+
+                        ' The code below needs a defined function
+                        If oFunctionName = String.Empty Then
+                            Continue For
+                        End If
+
+                        Dim oParamsDict = Parameters.Parse(oFunctionParams)
+
+                        ' The main identifier will be checked for String.empty and not required.
+                        ' This makes sure that optional fields do not generate errors.
+                        Dim oIdentifier As DocumentRow.FieldValue = oRow.Fields.GetOrDefault(oItemName)
+                        If oIdentifier.Original = String.Empty And oIdentifier.IsRequired = False Then
+                            Continue For
+                        End If
+
+                        Select Case oFunctionName
+                            Case FUNCTION_GLN
+                                SetAccountByGLN(oRow, pMandator, oItemName, Nothing, oParamsDict)
+
+                            Case FUNCTION_EAN
+                                SetArticleByEAN(oRow, pMandator, oItemName)
+
+                            Case FUNCTION_RUNNINGNUMBER
+                                Await SetVersionedRunningNumber(pDocument, oRow, pMandator, oItemName, oParamsDict)
+
+                            Case FUNCTION_ADDRESS
+                                Await SetAddressByAccountNumber(pDocument, oRow, pMandator, oItemName, oParamsDict)
+
+                        End Select
+
+                    Next
+
+                Next
+            Next
+
+            Return pDocument
+        End Function
+
+        Private Function ApplyFieldFunctionForImport(pDocument As Document, pMandator As Mandator, pTemplate As Template) As Document
+            For Each oRow As DocumentRow In pDocument.Rows
+                Dim oTable = pDocument.Schema.Tables.Where(Function(table) table.Name = oRow.TableName).SingleOrDefault()
+
+                For Each oField In oRow.Fields
+                    If oTable Is Nothing Then
+                        Logger.Warn("Table [{0}] was not found in the Schema. Exiting.", oRow.TableName)
+                        Exit For
+
+                    End If
+
+                    Dim oColumn = oTable.Columns.Where(Function(c) c.Name = oField.Key).SingleOrDefault()
+                    If oColumn Is Nothing Then
+                        Logger.Warn("Column [{0}] was not found in Table [{0}]. Skipping.", oField.Key, oTable.Name)
+                        Continue For
+
+                    End If
+
+                    For Each oFunction As FieldConfig.ColumnFunction In oColumn.Config.Functions
+
+                        Dim oFunctionName = oFunction.Name
+                        Dim oFunctionParams = oFunction.Params
+                        Dim oParamsDict = Parameters.Parse(oFunctionParams)
+
+                        If oFunctionName = FUNCTION_FIELD Then
+                            Try
+                                Logger.Debug("Applying function FIELD to field [{0}]", oField.Key)
+
+                                Dim oParam = oParamsDict.FirstOrDefault()
+
+                                If IsNothing(oParam) Then
+                                    Logger.Warn("Function FIELD needs exactly one parameter. Skipping")
+                                    Continue For
+
+                                End If
+
+                                Dim oFieldName = oParam.Key
+                                Dim oSubKey = oParam.Value
+
+                                Dim oReferencedField = oRow.Fields.
+                                Where(Function(field) field.Key = oFieldName).
+                                FirstOrDefault()
+
+                                If IsNothing(oReferencedField) = False Then
+                                    Dim oRawValue = oReferencedField.Value?.GetValue(oSubKey)
+                                    Dim oValue As String = ObjectEx.NotNull(oRawValue, String.Empty)
+
+                                    If oValue <> String.Empty Then
+                                        oField.Value.SetExternalValue(oValue)
+                                    End If
+
+                                Else
+                                    Logger.Warn("Referenced Field [{0}] was not found. Skipping.", oFieldName)
+                                    Continue For
+
+                                End If
+                            Catch ex As Exception
+                                Logger.Warn("Function FIELD could not be applied to field [{0}]. Skipping.", oField.Key)
+                                Continue For
+
+                            End Try
+                        End If
+                    Next
+
+
+                Next
+            Next
+
+            Return pDocument
+        End Function
+
+        ''' <summary>
+        ''' Execute Mappings defined in TBMT_MAPPING_CONFIG,
+        ''' for example mapping Article Numbers to Winline Mandators
+        ''' </summary>
+        Private Function ApplyDynamicItemFunctionsForImport(pDocument As Document, pMandator As Mandator) As Document
+            ' We only want the mapping config for things in the xml file.
+            ' that excludes things like setting the mandator.
+            Dim oFilteredMappingConfig = MappingConfig.Items.
+                Where(Function(item) item.DestinationItem <> String.Empty).
+                ToList()
+
+            For Each oMapping As MappingConfigItem In oFilteredMappingConfig
+
+                ' Get Source Value
+                Dim oField As KeyValuePair(Of String, DocumentRow.FieldValue) = pDocument.Rows.
+                    SelectMany(Function(row) row.Fields).
+                    Where(Function(field) field.Key = oMapping.SourceItem).
+                    FirstOrDefault()
+
+                ' Test on Regex
+                Dim oRegex As New Regex(oMapping.SourceRegex)
+
+                If oRegex.IsMatch(oField.Value.Final) Then
+
+                    pDocument.Rows.
+                        SelectMany(Function(row) row.Fields).
+                        Where(Function(field) field.Key = oMapping.DestinationItem).
+                        SetValue(Sub(field) field.Value.SetExternalValue(oMapping.DestinationValue))
+
+                Else
+                    ' don't do anything
+
+                End If
+            Next
+
+            Return pDocument
+        End Function
+
+        Private Async Function SetPrice(pRow As DocumentRow, pPriceField As String, pParamMap As Dictionary(Of String, String), pDocument As Document, pMandator As Mandator, pTemplate As Template) As Task
+            Dim oPriceItem As DocumentRow.FieldValue = pRow.Fields.GetOrDefault(pPriceField)
+
+            ' These fields are fetched from the current row
+            Const PARAMETER_ARTICLE = "Article"
+            Dim oArticleNumberField As String = pParamMap.GetOrDefault(PARAMETER_ARTICLE, Nothing)
+            If oArticleNumberField Is Nothing Then
+                Logger.Warn("Parameter '{0}' not found for Function PRICE", PARAMETER_ARTICLE)
+            End If
+
+            If pRow.Fields.ContainsKey(oArticleNumberField) = False Then
+                Logger.Warn("Value '{0}' for Parameter '{1}' not found for Function PRICE", oArticleNumberField, PARAMETER_ARTICLE)
+            End If
+            Dim oArticleNumber As String = pRow.Fields.Item(oArticleNumberField).Final
+
+            Const PARAMETER_QUANTITY = "Quantity"
+            Dim oQuantityField As String = pParamMap.GetOrDefault(PARAMETER_QUANTITY, Nothing)
+            If oQuantityField Is Nothing Then
+                Logger.Warn("Parameter '{0}' not found for Function PRICE", PARAMETER_QUANTITY)
+            End If
+
+            Dim oQuantity As Integer = 1
+            If Integer.TryParse(pRow.Fields.Item(oQuantityField).Final, oQuantity) = False Then
+                Logger.Warn("Value for parameter '{0}' could not be parsed. Setting to 1.", PARAMETER_QUANTITY)
+            End If
+
+            ' These fields a fetched from the head row, ie. the first row
+            Dim oAccountNumberField As String = pParamMap.GetOrDefault("Account", Nothing)
+            Dim oAccountNumber = pDocument.GetFieldValue(oAccountNumberField)
+
+            Dim oDocumentDateField As String = pParamMap.GetOrDefault("DocumentDate", Nothing)
+            Dim oDocumentDate = pDocument.GetFieldValue(oDocumentDateField)
+
+            Dim oDocumentKindField As String = pParamMap.GetOrDefault("DocumentKind", Nothing)
+            Dim oDocumentKind As Integer = 0
+            If Integer.TryParse(pDocument.GetFieldValue(oDocumentKindField), oDocumentKind) = False Then
+                Logger.Warn("Value for parameter DocumentKind could not be parsed. Setting to 0.")
+            End If
+
+            ' TODO: Add Field Names as Constants
+            ' TODO: Check for missing values
+
+            ' TODO: This function should not be hardcoded, but be replaced with virtual field or something..
+            ' It is related to customer SCHAUM and nothing general
+            Dim oWaitingDays As Integer = Await Winline.TryGetWaitingDaysAsync(oDocumentKind, pMandator)
+            ' END TODO
+
+            Dim oArticlePrice As Double = Await Winline.TryGetArticlePriceAsync(oArticleNumber, oAccountNumber, oQuantity, oDocumentDate, pMandator, pTemplate, oWaitingDays)
+
+            If oArticlePrice > 0 Then
+                oPriceItem.SetExternalValue(oArticlePrice)
+                Logger.Info("Price for Item [{0}] set to [{1}]", pPriceField, oArticlePrice)
+            Else
+                Logger.Warn("Price for Item [{0}] could not be found!", pPriceField)
+                oPriceItem.AddFieldError(FieldErrorType.PriceNotCalculated, "Der Preis für diese Position konnte nicht ermittelt werden.")
+            End If
+        End Function
+
+        Private Sub SetArticleByEAN(pRow As DocumentRow, pMandator As Mandator, pArticleField As String)
+            Dim oNumberItem As DocumentRow.FieldValue = pRow.Fields.GetOrDefault(pArticleField)
+
+            If oNumberItem Is Nothing Then
+                Exit Sub
+            End If
+
+            Dim oArticleNumber = Winline.TryGetArticleNumber(oNumberItem.Original, pMandator)
+
+            If oArticleNumber IsNot Nothing Then
+                oNumberItem.SetExternalValue(oArticleNumber)
+                Logger.Info("EAN [{0}] resolved to ArticleNumber [{1}]", oNumberItem.Original, oArticleNumber)
+            Else
+                oNumberItem.AddFieldError(FieldErrorType.ArticleNotFound, $"EAN in Attribut '{pArticleField}' konnte nicht aufgelöst werden.")
+                Logger.Warn("EAN [{0}] could not be resolved ArticleNumber", oNumberItem.Original)
+            End If
+        End Sub
+
+        Private Sub SetAccountByGLN(oRow As DocumentRow, pMandator As Mandator, pNumberField As String, pNameField As String, pParams As Dictionary(Of String, String))
+            Try
+                ' Try to read the Account number (which is a GLN really) and account Name
+                Dim oNumberItem As DocumentRow.FieldValue = oRow.Fields.GetOrDefault(pNumberField)
+                Dim oNameItem As DocumentRow.FieldValue = oRow.Fields.GetOrDefault(pNameField)
+                Dim oContainsAccountName As Boolean = Not IsNothing(oNameItem)
+
+                If oNumberItem Is Nothing Then
+                    Exit Sub
+                End If
+
+                ' Try to find an account that matches the GLN
+                Dim oAlternateField As String = pParams.GetOrDefault("AltField", String.Empty)
+                Dim oAccount As Account = Winline.TryGetAccount(oNumberItem.Original, pMandator, "c260", oAlternateField)
+
+                ' If an account was found, set it for External and Final value
+                If oAccount IsNot Nothing Then
+                    oNumberItem.SetExternalValue(oAccount.Id)
+
+                    If oContainsAccountName Then
+                        oNameItem.SetExternalValue(oAccount.Name)
+                    Else
+                        ' TODO: What to to if name field is missing or not set?
+                        'oRow.Fields.Add(pNameField, New DocumentRow.FieldValue() With {
+                        '    .External = oAccount.Name,
+                        '    .Final = oAccount.Name
+                        '})
+                    End If
+                Else
+                    ' If no account was found, mark it as error. 
+                    oNumberItem.AddFieldError(FieldErrorType.AccountNotFound, $"GLN in Attribut '{pNumberField}' konnte nicht aufgelöst werden.")
+
+                End If
+            Catch ex As Exception
+                Logger.Error(ex)
+                Throw ex
+            End Try
+        End Sub
+
+        Public Async Function SetVersionedRunningNumber(pDocument As Document, pRow As DocumentRow, pMandator As Mandator, pNumberField As String, pParams As Dictionary(Of String, String)) As Task
+            Try
+                Const PARAMETER_ACCOUNT = "Account"
+                Dim oAccountField As String = pParams.GetOrDefault(PARAMETER_ACCOUNT, Nothing)
+                If oAccountField Is Nothing Then
+                    Logger.Warn("Parameter '{0}' not found for Function RUNNINGNUMBER", PARAMETER_ACCOUNT)
+                End If
+
+                Dim oRunningNumberItem As DocumentRow.FieldValue = pRow.Fields.GetOrDefault(pNumberField)
+                Dim oRunningNumber = oRunningNumberItem.Original
+
+                ' We use the Final value to work with the actual account number, not the GLN
+                Dim oAccountNumberItem As DocumentRow.FieldValue = pRow.Fields.GetOrDefault(oAccountField)
+                Dim oAccountNumber = oAccountNumberItem.Final
+
+                Dim oVersionedNumber = Await Winline.GetVersionedRunningNumberAsync(pDocument, pMandator, oAccountNumber, oRunningNumber)
+
+                If oVersionedNumber <> oRunningNumber Then
+                    oRunningNumberItem.SetExternalValue(oVersionedNumber)
+                End If
+
+            Catch ex As Exception
+                Logger.Error(ex)
+                Throw ex
+            End Try
+        End Function
+
+        Public Function SetAddressByAccountNumber(pDocument As Document, pRow As DocumentRow, pMandator As Mandator, pAccountField As String, pParams As Dictionary(Of String, String)) As Task
+            Try
+                Const PARAMETER_NAME = "Name"
+                Const PARAMETER_STREET = "Street"
+                Const PARAMETER_ZIP = "Zip"
+                Const PARAMETER_CITY = "City"
+
+
+                Dim oAccountNumberItem As DocumentRow.FieldValue = pRow.Fields.GetOrDefault(pAccountField)
+                Dim oAccountNumber = oAccountNumberItem.Final
+
+                Dim oNameField As String = pParams.GetOrDefault(PARAMETER_NAME, Nothing)
+                Dim oNameFieldItem As DocumentRow.FieldValue = pRow.Fields.GetOrDefault(oNameField)
+                If oNameField Is Nothing Then
+                    Logger.Warn("Parameter '{0}' not found for Function ADDRESS", PARAMETER_NAME)
+                    oAccountNumberItem.AddFieldError(FieldErrorType.MissingParameter, $"Parameter '{PARAMETER_NAME}' wurde nicht gefüllt.")
+                End If
+
+                Dim oStreetField As String = pParams.GetOrDefault(PARAMETER_STREET, Nothing)
+                Dim oStreetFieldItem As DocumentRow.FieldValue = pRow.Fields.GetOrDefault(oStreetField)
+                If oStreetField Is Nothing Then
+                    Logger.Warn("Parameter '{0}' not found for Function ADDRESS", PARAMETER_STREET)
+                    oAccountNumberItem.AddFieldError(FieldErrorType.MissingParameter, $"Parameter '{PARAMETER_STREET}' wurde nicht gefüllt.")
+
+                End If
+
+                Dim oZipField As String = pParams.GetOrDefault(PARAMETER_ZIP, Nothing)
+                Dim oZipFieldItem As DocumentRow.FieldValue = pRow.Fields.GetOrDefault(oZipField)
+                If oZipField Is Nothing Then
+                    Logger.Warn("Parameter '{0}' not found for Function ADDRESS", PARAMETER_ZIP)
+                    oAccountNumberItem.AddFieldError(FieldErrorType.MissingParameter, $"Parameter '{PARAMETER_ZIP}' wurde nicht gefüllt.")
+
+                End If
+
+                Dim oCityField As String = pParams.GetOrDefault(PARAMETER_CITY, Nothing)
+                Dim oCityFieldItem As DocumentRow.FieldValue = pRow.Fields.GetOrDefault(oCityField)
+                If oCityField Is Nothing Then
+                    Logger.Warn("Parameter '{0}' not found for Function ADDRESS", PARAMETER_CITY)
+                    oAccountNumberItem.AddFieldError(FieldErrorType.MissingParameter, $"Parameter '{PARAMETER_CITY}' wurde nicht gefüllt.")
+
+                End If
+
+                Dim oAccount = Winline.Accounts.Where(Function(a) a.Id = oAccountNumber And a.Mandator.Equals(pMandator)).SingleOrDefault()
+                If oAccount Is Nothing Then
+                    Logger.Warn("Account with Id [{0}] in Mandator [{1}] could not be found.", oAccountNumber, pMandator.Id)
+                End If
+
+                oNameFieldItem.SetExternalValue(oAccount.Name)
+                oStreetFieldItem.SetExternalValue(oAccount.StreetName)
+                oZipFieldItem.SetExternalValue(oAccount.ZipCode)
+                oCityFieldItem.SetExternalValue(oAccount.CityName)
+
+            Catch ex As Exception
+                Logger.Error(ex)
+                Throw ex
+            End Try
+
+            Return Task.CompletedTask
+        End Function
+
+
+    End Class
+
+End Namespace

MultiTool.Common/Documents/DocumentRow.vb

@@ -0,0 +1,208 @@
+Imports System.Text.RegularExpressions
+Imports DigitalData.Modules.Logging
+Imports MultiTool.Common.Constants
+
+Namespace Documents
+    Public Class DocumentRow
+        Implements IComparable
+
+        ''' <summary>
+        ''' GUID to match DocumentRow with Row from Grid/DataTable
+        ''' </summary>
+        Public Property Id As New Guid
+        ''' <summary>
+        ''' Counter to ensure consistency and order when writing XML
+        ''' </summary>
+        Public Property SortKey As Integer
+
+        ''' <summary>
+        ''' Tabellen/Elementname aus XML
+        ''' </summary>
+        Public Property TableName As String
+
+        ''' <summary>
+        ''' List of Row Values
+        ''' </summary>
+        ''' <returns></returns>
+        Public Property Fields As Dictionary(Of String, FieldValue)
+
+        Public ReadOnly Property HasErrors As Boolean
+            Get
+                If Errors.Count > 0 Then
+                    Return True
+                Else
+                    Return False
+                End If
+            End Get
+        End Property
+
+        Public ReadOnly Property Errors As List(Of FieldError)
+            Get
+                Return Fields.
+                    Where(Function(f) f.Value.HasError).
+                    SelectMany(Function(f) f.Value.Errors).ToList()
+            End Get
+        End Property
+
+        Public Sub New()
+            Id = Guid.NewGuid()
+        End Sub
+
+        Public Function CompareTo(other As Object) As Integer Implements IComparable.CompareTo
+            Return SortKey.CompareTo(DirectCast(other, DocumentRow).SortKey)
+        End Function
+
+        ''' <summary>
+        ''' TODO: Use this class to 
+        ''' </summary>
+        Public Class Field
+            Public ReadOnly Property Name
+            Public Property Value As FieldValue
+
+            Public Sub New(pName As String)
+                Name = pName
+            End Sub
+        End Class
+
+        Public Class FieldValue
+            Private _Final As String = ""
+            Private _External As String = ""
+            Private _Original As String = ""
+            Private Logger As Logger
+
+            Public Property DataType As ColumnType = ColumnType.String
+
+            Public Property Errors As New List(Of FieldError)
+
+            Public ReadOnly Property Original As String
+                Get
+                    Return FormatValue(_Original, DataType)
+                End Get
+            End Property
+
+            Public ReadOnly Property External As String
+                Get
+                    Return FormatValue(_External, DataType)
+                End Get
+            End Property
+
+            Public ReadOnly Property Final As String
+                Get
+                    Return FormatValue(_Final, DataType)
+                End Get
+            End Property
+
+            Public Property IsRequired As Boolean = False
+            Public Property IsVirtual As Boolean = False
+            Public Property PreferExternalValue As Boolean = True
+            Public Property SortKey As Integer = 0
+
+            Public Sub New(pLogConfig As LogConfig)
+                Logger = pLogConfig.GetLogger()
+            End Sub
+
+            Public Function GetValue(pValueType As String) As String
+                Select Case pValueType
+                    Case "Original"
+                        Return Original
+                    Case "External"
+                        Return External
+                    Case "Final"
+                        Return Final
+                    Case Else
+                        Return Nothing
+                End Select
+            End Function
+
+            Public Sub SetValue(pValueType As String, pValue As String)
+                Select Case pValueType
+                    Case "Original"
+                        _Original = pValue
+                    Case "External"
+                        _External = pValue
+                    Case "Final"
+                        _Final = pValue
+                    Case Else
+                        ' Noop
+                End Select
+            End Sub
+
+            Public Sub AddFieldError(pType As FieldErrorType, pMessage As String)
+                Errors.Add(New FieldError() With {
+                    .Type = pType,
+                    .Message = pMessage
+                })
+            End Sub
+
+            Public Sub SetExternalValue(pValue As String)
+                _External = pValue
+
+                ' Set the external value as the final value, overriding the original / previous external value
+                ' if the external value should be preferred
+                If PreferExternalValue = True Then
+                    Logger.Debug("Setting Final value to [{0}] because PreferExternalValue is True", pValue)
+                    _Final = pValue
+                End If
+
+                ' If there is no Original value (because the field is virtual),
+                ' set the external value as the final value regardless of the PreferExternalValue setting
+                If _Original = String.Empty Then
+                    Logger.Debug("Setting Final value to [{0}] because Original value is empty", pValue)
+                    _Final = pValue
+                End If
+            End Sub
+
+            Public Sub SetOriginalValue(pValue As String)
+                _Original = pValue
+                _Final = pValue
+            End Sub
+
+            Public ReadOnly Property HasError As Boolean
+                Get
+                    ' Required check was moved to DocumentLoader
+                    Return Errors.Count > 0 'Or (IsRequired And Final = String.Empty)
+                End Get
+            End Property
+
+            Public Overrides Function ToString() As String
+                Return Final
+            End Function
+
+            Private Function FormatValue(pValue As String, pType As ColumnType) As String
+                Select Case pType
+                    Case ColumnType.Decimal
+                        Return FormatDecimalValue(pValue)
+
+                    Case Else
+                        Return pValue
+                End Select
+            End Function
+
+            ''' <summary>
+            ''' This function will capture values like below and format them according to winline format values
+            ''' 
+            ''' 1000
+            ''' 1.000
+            ''' 1.000,00
+            ''' </summary>
+            ''' <param name="pValue">A string value that represents a number</param>
+            ''' <returns>A string value which contains at dot (.) as the decimal divider, ex. 1000.00</returns>
+            Private Function FormatDecimalValue(pValue As String) As String
+                If Not pValue.Contains(","c) Then
+                    Return pValue
+                End If
+
+                Dim oRegex = New Regex("(?<Value>\d+(?:\.\d+)*(?:,\d+)?)")
+                Dim oMatch = oRegex.Match(pValue)
+
+                If oMatch.Success Then
+                    Dim oValue = oMatch.Groups.Item("Value").Value
+                    Return oValue.Replace(","c, "."c)
+                Else
+                    Return pValue
+                End If
+            End Function
+        End Class
+    End Class
+
+End Namespace

MultiTool.Common/Exceptions.vb

@@ -57,18 +57,12 @@
             MyBase.New(message)
         End Sub
     End Class
-    Public Class NoMandatorException
+
+    Public Class LengthExceededException
         Inherits MultiToolException
 
-        Public Sub New(message As String)
-            MyBase.New(message)
-        End Sub
-    End Class
-    Public Class MalformedXmlException
-        Inherits MultiToolException
-
-        Public Sub New(message As String)
-            MyBase.New(message)
+        Public Sub New(attribute As String)
+            MyBase.New(attribute)
         End Sub
     End Class
 

MultiTool.Common/Mapper.vb

@@ -3,7 +3,7 @@ Imports System.Text.RegularExpressions
 Imports AutoMapper
 Imports AutoMapper.Configuration
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared.Documents.DocumentRow
+Imports MultiTool.Common.Documents.DocumentRow
 
 Public Class Mapper
     Private MapperConfig As MapperConfiguration

MultiTool.Common/MultiTool.Common.vbproj

@@ -6,12 +6,13 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>MultiTool.Shared</RootNamespace>
-    <AssemblyName>MultiTool.Shared</AssemblyName>
+    <RootNamespace>MultiTool.Common</RootNamespace>
+    <AssemblyName>MultiTool.Common</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -19,7 +20,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>MultiTool.Shared.xml</DocumentationFile>
+    <DocumentationFile>MultiTool.Common.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -28,7 +29,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>MultiTool.Shared.xml</DocumentationFile>
+    <DocumentationFile>MultiTool.Common.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -50,27 +51,29 @@
     <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.DataAccess.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Filesystem">
-      <HintPath>..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Interfaces">
-      <HintPath>..\..\DDMonorepo\Modules.Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Interfaces, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Language">
-      <HintPath>..\..\DDMonorepo\Modules.Language\bin\Release\DigitalData.Modules.Language.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\DDMonorepo\Modules.Logging\bin\Release\DigitalData.Modules.Logging.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.1.0\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -100,14 +103,11 @@
     <Compile Include="BaseClass.vb" />
     <Compile Include="Config.vb" />
     <Compile Include="Constants.vb" />
-    <Compile Include="DataRowEx.vb" />
     <Compile Include="Documents\Document.vb" />
     <Compile Include="Documents\DocumentCleaner.vb" />
     <Compile Include="Documents\DocumentRow.vb" />
-    <Compile Include="Documents\DocumentType.vb" />
     <Compile Include="Documents\DocumentLoader.vb" />
     <Compile Include="Exceptions.vb" />
-    <Compile Include="Helpers.vb" />
     <Compile Include="IDictionaryEx.vb" />
     <Compile Include="IEnumerableEx.vb" />
     <Compile Include="Mapper.vb" />
@@ -127,8 +127,11 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="Parameters.vb" />
     <Compile Include="Patterns.vb" />
     <Compile Include="Report\ReportGenerator.vb" />
+    <Compile Include="Templates\FilterConfig.vb" />
+    <Compile Include="Templates\FilterConfigItem.vb" />
     <Compile Include="Templates\GeneralConfig.vb" />
     <Compile Include="Templates\MandatorConfig.vb" />
     <Compile Include="Templates\MandatorConfigItem.vb" />
@@ -137,7 +140,8 @@
     <Compile Include="Report\ReportHead.vb" />
     <Compile Include="Report\ReportPosition.vb" />
     <Compile Include="Report\ReportSource.vb" />
-    <Compile Include="Winline\Entities\Document.vb" />
+    <Compile Include="Winline\Entities\ExportDocument.vb" />
+    <Compile Include="Winline\Entities\PackingUnit.vb" />
     <Compile Include="Winline\Entities\Response.vb" />
     <Compile Include="Templates\Template.vb" />
     <Compile Include="Templates\TemplateLoader.vb" />
@@ -149,7 +153,7 @@
     <Compile Include="Winline\Entities\Contact.vb" />
     <Compile Include="Winline\Entities\DocumentKind.vb" />
     <Compile Include="Winline\Entities\Mandator.vb" />
-    <Compile Include="Templates\TemplateConfigItem.vb" />
+    <Compile Include="Templates\FieldConfig.vb" />
     <Compile Include="Winline\WebServiceData.vb" />
     <Compile Include="XmlData.vb" />
   </ItemGroup>

MultiTool.Common/My Project/AssemblyInfo.vb

@@ -8,12 +8,12 @@ Imports System.Runtime.InteropServices
 
 ' Werte der Assemblyattribute überprüfen
 
-<Assembly: AssemblyTitle("MultiTool.Shared")>
+<Assembly: AssemblyTitle("MultiTool.Common")>
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("MultiTool.Shared")>
-<Assembly: AssemblyCopyright("Copyright © 2021")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyProduct("MultiTool.Common")>
+<Assembly: AssemblyCopyright("Copyright © 2024")>
+<Assembly: AssemblyTrademark("1.0.0.0")>
 
 <Assembly: ComVisible(False)>
 

MultiTool.Common/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("MultiTool.Shared.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("MultiTool.Common.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan

MultiTool.Common/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -64,9 +64,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.MultiTool.[Shared].My.MySettings
+        Friend ReadOnly Property Settings() As Global.MultiTool.Common.My.MySettings
             Get
-                Return Global.MultiTool.[Shared].My.MySettings.Default
+                Return Global.MultiTool.Common.My.MySettings.Default
             End Get
         End Property
     End Module

MultiTool.Common/Parameters.vb

@@ -0,0 +1,49 @@
+Imports DigitalData.Modules.Logging
+
+Public Class Parameters
+    ''' <summary>
+    ''' Parse a list of parameters and return a directory of the parsed parameters.
+    ''' </summary>
+    ''' <remarks>The special case of SQL Parameters is NOT handled by this function.</remarks>
+    Public Shared Function Parse(pParameters As String) As Dictionary(Of String, String)
+        Try
+            Dim oParamsDict As New Dictionary(Of String, String)
+
+            If pParameters <> String.Empty Then
+                Dim oParamList = pParameters.Split("|").ToList()
+
+                For Each oParam In oParamList
+                    Dim oParamSplit = oParam.Split("=")
+
+                    If oParamSplit.Count = 2 Then
+                        oParamsDict.Add(oParamSplit(0), oParamSplit(1))
+                    End If
+                Next
+            End If
+
+            Return oParamsDict
+        Catch ex As Exception
+            Return New Dictionary(Of String, String)
+        End Try
+    End Function
+
+    Public Shared Function TryGet(pParameters As String, pName As String) As Tuple(Of String, String)
+        Try
+            Dim pParamDict = Parse(pParameters)
+
+            If pParamDict.Count = 0 Then
+                Return Nothing
+            End If
+
+            If Not pParamDict.ContainsKey(pName) Then
+                Return Nothing
+            End If
+
+            Dim oValue = pParamDict.Item(pName)
+            Return New Tuple(Of String, String)(pName, oValue)
+
+        Catch ex As Exception
+            Return Nothing
+        End Try
+    End Function
+End Class

MultiTool.Common/Patterns.vb

@@ -0,0 +1,167 @@
+Imports System.Text.RegularExpressions
+Imports DigitalData.Modules.Logging
+Imports MultiTool.Common.Documents
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Constants
+Imports MultiTool.Common.Winline.Entities
+
+Public Class Patterns
+    Inherits BaseClass
+
+    Private ReadOnly GeneralConfig As GeneralConfig
+    Private ReadOnly Regex As New Regex("{#(\w+)#([\w\s_-]+)}+")
+
+    Public Sub New(pLogConfig As LogConfig, pGeneralConfig As GeneralConfig)
+        MyBase.New(pLogConfig)
+        GeneralConfig = pGeneralConfig
+    End Sub
+
+    ''' <summary>
+    ''' Replaces placeholders in an sql marked as final sql in the template.
+    ''' </summary>
+    ''' <remarks>
+    ''' This SQL does not replace field-value placeholders! 
+    ''' This is a globally applied function!
+    ''' </remarks>
+    Public Function ReplaceForImportFinalSQL(pDocument As Document, pReportFileName As String, pString As String) As String
+        Dim oMatches As MatchCollection = Regex.Matches(pString)
+
+        For Each oMatch As Match In oMatches
+            Dim oPlaceholderString As String = oMatch.Groups.Item(0)?.Value
+            Dim oPlaceholderType As String = oMatch.Groups.Item(1)?.Value
+            Dim oPlaceholderValue As String = oMatch.Groups.Item(2)?.Value
+
+            Select Case oPlaceholderType.ToUpper
+                Case PLACEHOLDER_CONST
+                    Dim oValue = ""
+
+                    Select Case oPlaceholderValue.ToUpper
+                        Case "FILENAME"
+                            oValue = pDocument.FileName
+
+                        Case "FILENAME_REPORT"
+                            oValue = pReportFileName
+
+                        Case Else
+                            oValue = ReplaceBasicValues(oPlaceholderValue, pDocument.Mandator)
+
+                    End Select
+
+                    If oValue <> "" Then
+                        pString = pString.Replace(oPlaceholderString, oValue)
+                    End If
+            End Select
+        Next
+
+        Return pString
+    End Function
+
+    ''' <summary>
+    ''' 
+    ''' </summary>
+    ''' <param name="pDocument"></param>
+    ''' <param name="pRow"></param>
+    ''' <param name="pString"></param>
+    ''' <returns></returns>
+    Public Function ReplaceForImport(pDocument As Document, pRow As DocumentRow, pString As String)
+        Dim oMatches As MatchCollection = Regex.Matches(pString)
+
+        For Each oMatch As Match In oMatches
+            Dim oPlaceholderString As String = oMatch.Groups.Item(0)?.Value
+            Dim oPlaceholderType As String = oMatch.Groups.Item(1)?.Value
+            Dim oPlaceholderValue As String = oMatch.Groups.Item(2)?.Value
+
+            Select Case oPlaceholderType.ToUpper
+                Case PLACEHOLDER_FIELD
+                    Dim oFieldName = oPlaceholderValue
+                    Dim oTargetField = pRow.Fields.
+                       Where(Function(field) field.Key = oFieldName).
+                       SingleOrDefault()
+
+                    pString = pString.Replace(oPlaceholderString, oTargetField.Value.Final)
+
+                Case PLACEHOLDER_CONST
+                    Dim oValue = ""
+
+                    Select Case oPlaceholderValue.ToUpper
+                        Case "FILENAME"
+                            oValue = pDocument.FileName
+
+                        Case Else
+                            oValue = ReplaceBasicValues(oPlaceholderValue, pDocument.Mandator)
+
+                    End Select
+
+                    If oValue <> "" Then
+                        pString = pString.Replace(oPlaceholderString, oValue)
+                    End If
+            End Select
+        Next
+
+        Return pString
+    End Function
+
+    Public Function ReplaceForExport(pDocument As ExportDocument, pMandator As Mandator, oString As String)
+        Dim oMatches As MatchCollection = Regex.Matches(oString)
+
+        For Each oMatch As Match In oMatches
+            Dim oPlaceholderString As String = oMatch.Groups.Item(0)?.Value
+            Dim oPlaceholderType As String = oMatch.Groups.Item(1)?.Value
+            Dim oPlaceholderValue As String = oMatch.Groups.Item(2)?.Value
+
+            Select Case oPlaceholderType.ToUpper
+                Case PLACEHOLDER_CONST
+                    Dim oValue = ""
+
+                    Select Case oPlaceholderValue.ToUpper
+                        Case "FILENAME"
+                            oValue = pDocument.FilenameExport
+
+                        Case "ACCOUNTNUMBER"
+                            oValue = pDocument.Account.Id
+
+                        Case "RUNNINGNUMBER"
+                            oValue = pDocument.RunningNumber
+
+
+                        Case Else
+                            oValue = ReplaceBasicValues(oPlaceholderValue, pMandator)
+
+                    End Select
+
+                    If oValue <> "" Then
+                        oString = oString.Replace(oPlaceholderString, oValue)
+                    End If
+            End Select
+        Next
+
+        Return oString
+    End Function
+
+    ''' <summary>
+    ''' Replaces basic values in the CONST namespace that only depend on the current mandator
+    ''' </summary>
+    ''' <returns>Value that will be used to replaced the placeholder</returns>
+    Public Function ReplaceBasicValues(pPlaceholderValue As String, pMandator As Mandator) As String
+        Select Case pPlaceholderValue.ToUpper
+            Case "MESOYEAR"
+                Return GeneralConfig.GetWinLineYear()
+
+            Case "MESOCOMP"
+                Return pMandator.Id
+
+            Case "USERNAME"
+                Return Environment.UserName
+
+            Case "MANDATORDB"
+                Return pMandator.Database
+
+            Case "CURRENTDATE"
+                Return Now.ToString()
+
+            Case Else
+                Return String.Empty
+
+        End Select
+    End Function
+End Class

MultiTool.Common/Report/ReportGenerator.vb

@@ -1,20 +1,21 @@
 Imports System.Text.RegularExpressions
 Imports DevExpress.XtraReports
+Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared.Documents
-Imports MultiTool.Shared.Documents.DocumentRow
-Imports MultiTool.Shared.Report
-Imports MultiTool.Shared.Templates
+Imports MultiTool.Common.Documents
+Imports MultiTool.Common.Documents.DocumentRow
+Imports MultiTool.Common.Report
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Winline.Entities
 
 Public Class ReportGenerator(Of TReport As IReport)
     Inherits BaseClass
 
-    Private ReadOnly Database As MSSQLServer
     Private ReadOnly TemplateConfig As TemplateConfig
     Private ReadOnly GeneralConfig As GeneralConfig
     Private ReadOnly Patterns As Patterns
-    Private ReadOnly FileEx As DigitalData.Modules.Filesystem.File
+    Private ReadOnly FileEx As FilesystemEx
 
     Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer, pTemplateConfig As TemplateConfig, pGeneralConfig As GeneralConfig)
         MyBase.New(pLogConfig)
@@ -22,7 +23,7 @@ Public Class ReportGenerator(Of TReport As IReport)
         GeneralConfig = pGeneralConfig
         TemplateConfig = pTemplateConfig
         Patterns = New Patterns(pLogConfig, pGeneralConfig)
-        FileEx = New DigitalData.Modules.Filesystem.File(LogConfig)
+        FileEx = New FilesystemEx(LogConfig)
     End Sub
 
     Public Function GetReportFilePath(pDocument As Document, pTemplate As Template)
@@ -32,8 +33,8 @@ Public Class ReportGenerator(Of TReport As IReport)
         Return oFilePath
     End Function
 
-    Public Function GenerateReport(pDocument As Document) As TReport
-
+    Public Function GenerateReport(pDocument As Document, pTemplate As Template) As ReportResult(Of TReport)
+        Dim oFilePath = GetReportFilePath(pDocument, pTemplate)
         Dim oMapperConfig As New Mapper(LogConfig)
         Dim oHeadMapper = oMapperConfig.GetMapper(Of ReportHead)(New Dictionary(Of String, String) From {
             {"Fakt_Kontoname", "Text1"},
@@ -45,7 +46,7 @@ Public Class ReportGenerator(Of TReport As IReport)
 
         Dim oPositionMapper = oMapperConfig.GetMapper(Of ReportPosition)(New Dictionary(Of String, String) From {
             {"Artikelnummer", "Text1"},
-            {"Lieferantenartikelnummer", "Text2"},
+            {"Positionstext", "Text2"},
             {"Bezeichnung", "Text3"},
             {"Menge_bestellt", "Text4"},
             {"Menge_geliefert", "Text5"},
@@ -56,22 +57,18 @@ Public Class ReportGenerator(Of TReport As IReport)
             {"Lagerstand", "Text10"}
         })
 
-        Dim oSQLConfig = TemplateConfig.Items.
-            Where(Function(item) item.Function.Name = "SQL").
-            ToList()
-
-        FillFieldValuesFromSQL(pDocument, oSQLConfig)
+        pDocument = FillFieldValuesFromSQL(pDocument, TemplateConfig.SqlItems, oFilePath)
 
         Dim oHeadRow = pDocument.Rows.
-            Where(Function(r) r.Name.EndsWith("T025")).
+            Where(Function(r) r.TableName.EndsWith("T025")).
             Select(Function(r) r.Fields).
             FirstOrDefault()
         Dim oPositionRows = pDocument.Rows.
-            Where(Function(r) r.Name.EndsWith("T026")).
+            Where(Function(r) r.TableName.EndsWith("T026")).
             ToList()
 
         Dim oReportHead = oHeadMapper.Map(Of Dictionary(Of String, FieldValue), ReportHead)(oHeadRow)
-        oReportHead.Title = "EDI Bestellung (orders)"
+        oReportHead.Title = pTemplate.Name
         oReportHead.Subtitle = "Schaum"
         oReportHead.Filename = pDocument.FileName
 
@@ -99,11 +96,16 @@ Public Class ReportGenerator(Of TReport As IReport)
         oDataSource.Fill()
         oReport.DataSource = oDataSource
 
-        Return oReport
+        Dim oResult = New ReportResult(Of TReport) With {
+            .Report = oReport,
+            .FileName = oFilePath
+        }
+
+        Return oResult
     End Function
 
-    Private Sub FillFieldValuesFromSQL(pDocument As Document, oSQLConfig As List(Of TemplateConfigItem))
-        For Each oSQLConfigItem In oSQLConfig
+    Private Function FillFieldValuesFromSQL(pDocument As Document, pSQLConfig As List(Of FieldConfig), pReportFileName As String) As Document
+        For Each oSQLConfigItem In pSQLConfig
             ' FieldList is a list of fields that will be changed
             ' Example: Setting SQL for Article StorageLocation will invoke the sql for each row
             Dim oRowList = pDocument.Rows.
@@ -111,19 +113,29 @@ Public Class ReportGenerator(Of TReport As IReport)
                 ToList()
 
             For Each oRow As DocumentRow In oRowList
-                Dim oField = oRow.Fields.
-                    Where(Function(field) field.Key = oSQLConfigItem.Name).
-                    SingleOrDefault()
+                For Each oFunction In oSQLConfigItem.Functions
+                    Dim oSQL = oFunction.Params
+                    Dim oField = oRow.Fields.
+                        Where(Function(field) field.Key = oSQLConfigItem.Name).
+                        SingleOrDefault()
 
-                Dim oSQL = oSQLConfigItem.Function.Params
-                oSQL = Patterns.ReplaceForImport(pDocument, oRow, oSQL)
+                    oSQL = Patterns.ReplaceForImportFinalSQL(pDocument, pReportFileName, oSQL)
 
-                Dim oValue = Database.GetScalarValue(oSQL)
+                    Dim oValue = Database.GetScalarValue(oSQL)
 
-                If oValue IsNot Nothing Then
-                    oField.Value.Final = oValue
-                End If
+                    If oValue IsNot Nothing Then
+                        oField.Value.SetExternalValue(oValue)
+                    End If
+                Next
             Next
         Next
-    End Sub
-End Class
+
+        Return pDocument
+    End Function
+
+    Public Structure ReportResult(Of T)
+        Public Report As T
+        Public FileName As String
+    End Structure
+
+End Class

MultiTool.Common/Templates/FieldConfig.vb

@@ -1,7 +1,9 @@
-Imports MultiTool.Shared.Constants
+Imports MultiTool.Common.Constants
+Imports DigitalData.Modules.Language
 
 Namespace Templates
-    Public Class TemplateConfigItem
+    Public Class FieldConfig
+        Public Property Id As Integer
         Public Property Name As String
         Public Property Table As String
         Public Property Type As ColumnType
@@ -13,8 +15,9 @@ Namespace Templates
         Public Property IsVisible As Boolean
         Public Property IsRequired As Boolean
         Public Property IsVirtual As Boolean
+        Public Property PreferExternalValue As Boolean
 
-        Public Property [Function] As ColumnFunction
+        Public Property Functions As New List(Of ColumnFunction)
 
         Public Class ColumnFunction
             Public Id As XmlFunction

MultiTool.Common/Templates/FilterConfig.vb

@@ -0,0 +1,5 @@
+Namespace Templates
+    Public Class FilterConfig
+        Public Property Items As New List(Of FilterConfigItem)
+    End Class
+End Namespace

MultiTool.Common/Templates/FilterConfigItem.vb

@@ -0,0 +1,10 @@
+Namespace Templates
+    Public Class FilterConfigItem
+        Public Property Guid As Integer
+        Public Property SQLCommand As String
+        Public Property TableId As Integer
+        Public Property TableName As String
+        Public Property ColumnId As Integer
+        Public Property ColumnName As String
+    End Class
+End Namespace

MultiTool.Common/Templates/Template.vb

@@ -0,0 +1,138 @@
+Imports DigitalData.Modules.Base
+Imports MultiTool.Common.Winline.WinlineData
+
+Namespace Templates
+
+    Public Class Template
+        Public Property Guid As Integer
+        Public Property Name As String
+        Public Property FileName As String
+        Public Property Description As String
+        Public Property IsImport As Boolean
+        Public Property Parameter1 As String
+        Public Property Parameter2 As String
+        Public Property FinalSQL As String
+
+        ''' <summary>
+        ''' Tabledata from XSD
+        ''' </summary>
+        Public Property Tables As New List(Of Table)
+
+        Public Property InputDirectory As String
+        Public Property OutputDirectory As String
+        Public Property ArchiveDirectory As String
+
+        ''' <summary>
+        ''' Last modified date of the template file
+        ''' </summary>
+        Public Property LastModified As Date
+
+        Public ReadOnly Property DocType As DocumentType
+            Get
+                Dim oDocType As String = GetParameter("DOCTYPE")
+                Dim oPreselectedDocType As Integer = 0
+
+                If oDocType IsNot Nothing Then
+                    Integer.TryParse(oDocType, oPreselectedDocType)
+                End If
+
+                Return [Enum].Parse(GetType(DocumentType), oPreselectedDocType)
+            End Get
+        End Property
+
+        Public ReadOnly Property PrintDocument As Boolean
+            Get
+                Dim oPrintDocument = GetParameter("PRINT")
+                Dim oDefaultValue = True
+
+                If oPrintDocument IsNot Nothing Then
+                    oDefaultValue = IIf(oPrintDocument = "0", False, True)
+                End If
+
+                Return oDefaultValue
+            End Get
+        End Property
+
+        Public ReadOnly Property DocTypeCategory As DocumentTypeCategory
+            Get
+                Select Case DocType
+                    Case DocumentType.IncomingOffer,
+                         DocumentType.IncomingOrder,
+                         DocumentType.IncomingDeliveryNote,
+                         DocumentType.IncomingInvoice
+                        Return DocumentTypeCategory.Outgoing
+
+                    Case DocumentType.OutgoingOffer,
+                         DocumentType.OutgoingOrder,
+                         DocumentType.OutgoingDeliveryNote,
+                         DocumentType.OutgoingInvoice
+                        Return DocumentTypeCategory.Incoming
+
+                    Case Else
+                        Return DocumentTypeCategory.Undefined
+
+                End Select
+            End Get
+        End Property
+
+        Public ReadOnly Property OutputReportDirectory
+            Get
+                Return IO.Path.Combine(OutputDirectory, "Reports")
+            End Get
+        End Property
+
+        Public ReadOnly Property OutputWebserviceDirectory
+            Get
+                Return IO.Path.Combine(OutputDirectory, "WebService")
+            End Get
+        End Property
+
+        Public ReadOnly Property OutputXmlFileDirectory
+            Get
+                Return IO.Path.Combine(OutputDirectory, "XmlFiles")
+            End Get
+        End Property
+
+
+        Public Function GetParameter(pName As String) As String
+            Dim oParam1 As String = ObjectEx.NotNull(Parameter1, String.Empty)
+            Dim oParam2 As String = ObjectEx.NotNull(Parameter2, String.Empty)
+
+            Dim oParamValue1 = Parameters.TryGet(oParam1, pName)
+            Dim oParamValue2 = Parameters.TryGet(oParam2, pName)
+
+            If oParamValue1 IsNot Nothing AndAlso oParamValue1.Item1 = pName Then
+                Return oParamValue1.Item2
+            End If
+
+            If oParamValue2 IsNot Nothing AndAlso oParamValue2.Item1 = pName Then
+                Return oParamValue2.Item2
+            End If
+
+            Return Nothing
+        End Function
+
+        ''' <summary>
+        ''' Table from XSD
+        ''' </summary>
+        Class Table
+            Public Property Name As String
+            Public Property Columns As New List(Of Column)
+        End Class
+
+        Class Column
+            Public Property Name As String
+            Public Property DataType As Constants.ColumnType
+            ''' <summary>
+            ''' Required value from Schema. This value will be written in the ColumnConfig and is not relevant from that point on.
+            ''' </summary>
+            Public Property IsRequired As Boolean
+            Public Property Config As FieldConfig
+
+            Public Overrides Function ToString() As String
+                Return Name
+            End Function
+        End Class
+    End Class
+End Namespace
+

MultiTool.Common/Templates/TemplateConfig.vb

@@ -1,14 +1,22 @@
 
-Imports MultiTool.Shared.Winline
+Imports MultiTool.Common.Winline
 
 Namespace Templates
     ''' <summary>
     ''' Class for loading column/field config from database
     ''' </summary>
     Public Class TemplateConfig
-        Public Property Items As List(Of TemplateConfigItem)
+        Public Property Items As List(Of FieldConfig)
 
-        Public Function GetColumn(pName As String, pTable As String) As TemplateConfigItem
+        Public ReadOnly Property SqlItems As List(Of FieldConfig)
+            Get
+                Return Items.
+                    Where(Function(item) item.Functions.Any(Function(f) f.Name = Constants.FUNCTION_SQL)).
+                    ToList()
+            End Get
+        End Property
+
+        Public Function GetColumn(pName As String, pTable As String) As FieldConfig
             Return Items.
                 Where(Function(c) c.Name = pName And c.Table = pTable).
                 FirstOrDefault()

MultiTool.Common/Templates/TemplateLoader.vb

@@ -1,6 +1,7 @@
 Imports System.IO
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Base
 
 Namespace Templates
     Public Class TemplateLoader
@@ -9,27 +10,56 @@ Namespace Templates
         Private ReadOnly ns As XNamespace = "http://www.w3.org/2001/XMLSchema"
 
         Public Property TemplateList As List(Of Template)
+
         Public Property TemplateConfiguration As New TemplateConfig
         Public Property MappingConfiguration As New MappingConfig
         Public Property MandatorConfiguration As New MandatorConfig
         Public Property GeneralConfiguration As New GeneralConfig
+        Public Property FilterConfiguration As New FilterConfig
 
-        Private ReadOnly Database As MSSQLServer
-
-        Private Const SQL_VWEDI_XML_ITEMS = "SELECT * FROM [DD_ECM].[dbo].[VWEDI_XML_ITEMS]"
-        Private Const SQL_VWEDI_XML_MAPPING = "SELECT * FROM [DD_ECM].[dbo].[VWEDI_XML_MAPPING]"
-        Private Const SQL_TBEDI_XML_MANDATORS = "SELECT * FROM [DD_ECM].[dbo].[TBEDI_XML_MANDATORS] ORDER BY ORDER_KEY"
-        Private Const SQL_TBEDI_XML_CONFIG = "SELECT * FROM [DD_ECM].[dbo].[TBEDI_XML_CONFIG]"
-        Private Const SQL_TBEDI_XML_TEMPLATES = "SELECT * FROM [DD_ECM].[dbo].[TBEDI_XML_TEMPLATES]"
+        Private Const SQL_TBMT_FILTERS = "SELECT * FROM [DD_ECM].[dbo].[VWMT_FILTERS]"
+        Private Const SQL_VWMT_ITEMS = "SELECT * FROM [DD_ECM].[dbo].[VWMT_ITEMS] ORDER BY TEMPLATE_NAME, TABLE_NAME"
+        Private Const SQL_VWMT_FUNCTIONS = "SELECT * FROM [DD_ECM].[dbo].[VWMT_FUNCTIONS] ORDER BY ITEM_ID, SEQUENCE"
+        Private Const SQL_VWMT_MAPPING = "SELECT * FROM [DD_ECM].[dbo].[VWMT_MAPPING]"
+        Private Const SQL_TBMT_MANDATORS = "SELECT * FROM [DD_ECM].[dbo].[TBMT_MANDATORS] ORDER BY ORDER_KEY"
+        Private Const SQL_TBMT_CONFIG = "SELECT * FROM [DD_ECM].[dbo].[TBMT_CONFIG]"
+        Private Const SQL_TBMT_TEMPLATES = "SELECT * FROM [DD_ECM].[dbo].[TBMT_TEMPLATES] WHERE ACTIVE = 1"
 
         Public Sub New(pLogConfig As LogConfig, pMSSQL As MSSQLServer)
-            MyBase.New(pLogConfig)
-            Database = pMSSQL
+            MyBase.New(pLogConfig, pMSSQL)
         End Sub
 
+        Public Async Function LoadFilterConfiguration() As Task(Of Boolean)
+            Try
+                Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_TBMT_FILTERS)
+                Dim oFilters As New List(Of FilterConfigItem)
+
+                For Each oRow As DataRow In oTable.Rows
+                    Dim oFilter As New FilterConfigItem With {
+                        .Guid = oRow.Item("GUID"),
+                        .SQLCommand = oRow.ItemEx("SQL_COMMAND", String.Empty),
+                        .TableId = oRow.ItemEx("TABLE_ID", 0),
+                        .TableName = oRow.ItemEx("TABLE_NAME", String.Empty),
+                        .ColumnId = oRow.ItemEx("ITEM_ID", 0),
+                        .ColumnName = oRow.ItemEx("ITEM_NAME", String.Empty)
+                    }
+
+                    oFilters.Add(oFilter)
+                Next
+
+                FilterConfiguration.Items = oFilters
+
+                Return True
+            Catch ex As Exception
+                Logger.Error(ex)
+                Return False
+
+            End Try
+        End Function
+
         Public Async Function LoadTemplates() As Task(Of Boolean)
             Try
-                Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_TBEDI_XML_TEMPLATES)
+                Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_TBMT_TEMPLATES)
                 Dim oTemplates As New List(Of Template)
 
                 For Each oRow As DataRow In oTable.Rows
@@ -44,6 +74,8 @@ Namespace Templates
                         .Parameter2 = oRow.ItemEx("PARAMETER_2", String.Empty)
                     }
 
+                    Logger.Debug("Loading Template [{0}]", oTemplate.Name)
+
                     oTemplates.Add(oTemplate)
                 Next
 
@@ -59,7 +91,7 @@ Namespace Templates
 
         Public Async Function LoadGeneralConfiguration() As Task(Of Boolean)
             Try
-                Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_TBEDI_XML_CONFIG)
+                Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_TBMT_CONFIG)
                 Dim oGeneralConfig As New GeneralConfig
 
                 For Each oRow As DataRow In oTable.Rows
@@ -102,7 +134,7 @@ Namespace Templates
 
         Public Async Function LoadMappingConfiguration() As Task(Of Boolean)
             Try
-                Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_VWEDI_XML_MAPPING)
+                Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_VWMT_MAPPING)
                 Dim oMappingConfig As New MappingConfig
 
                 For Each oRow As DataRow In oTable.Rows
@@ -131,7 +163,7 @@ Namespace Templates
 
         Public Async Function LoadMandatorConfiguration() As Task(Of Boolean)
             Try
-                Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_TBEDI_XML_MANDATORS)
+                Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_TBMT_MANDATORS)
                 Dim oMandatorConfig As New MandatorConfig
 
                 For Each oRow As DataRow In oTable.Rows
@@ -155,28 +187,28 @@ Namespace Templates
 
         Public Async Function LoadTemplateConfiguration() As Task(Of Boolean)
             Try
-                Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_VWEDI_XML_ITEMS)
-                Dim oItems As New List(Of TemplateConfigItem)
+                Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_VWMT_ITEMS)
+                Dim oItems As New List(Of FieldConfig)
 
                 For Each oRow As DataRow In oTable.Rows
-                    Dim oColumn As New TemplateConfigItem() With {
+                    Dim oColumn As New FieldConfig() With {
+                        .Id = oRow.ItemEx("ITEM_ID", 0),
                         .Template = oRow.ItemEx("TEMPLATE_NAME", String.Empty),
-                        .Table = oRow.ItemEx("XML_TABLE", String.Empty),
-                        .Name = oRow.ItemEx("XML_ITEM", String.Empty),
-                        .Type = TemplateConfigItem.ConvertType(ItemEx(oRow, "DATA_TYPE", String.Empty)),
+                        .Table = oRow.ItemEx("TABLE_NAME", String.Empty),
+                        .Name = oRow.ItemEx("ITEM_NAME", String.Empty),
+                        .Type = FieldConfig.ConvertType(ItemEx(oRow, "DATA_TYPE", String.Empty)),
                         .OrderKey = oRow.ItemEx("ORDER_KEY", 0),
                         .IsReadOnly = oRow.ItemEx("IS_READ_ONLY", False),
                         .IsVisible = oRow.ItemEx("IS_VISIBLE", True),
                         .IsRequired = oRow.ItemEx("IS_REQUIRED", False),
                         .IsVirtual = oRow.ItemEx("IS_VIRTUAL", False),
                         .IsHead = oRow.ItemEx("IS_HEAD", True),
-                        .[Function] = New TemplateConfigItem.ColumnFunction With {
-                            .Id = oRow.ItemEx("FUNCTION_ID", 0),
-                            .Name = oRow.ItemEx("FUNCTION_NAME", String.Empty),
-                            .Params = oRow.ItemEx("FUNCTION_PARAMETERS", String.Empty)
-                        }
+                        .PreferExternalValue = oRow.ItemEx("PREFER_EXTERNAL", True),
+                        .Functions = New List(Of FieldConfig.ColumnFunction)
                     }
 
+                    Logger.Debug("Creating Template Item for Table [{0}]: [{1}]", oColumn.Table, oColumn.Name)
+
                     oItems.Add(oColumn)
                 Next
 
@@ -193,6 +225,37 @@ Namespace Templates
             End Try
         End Function
 
+        Public Async Function LoadTemplateFunctions() As Task(Of Boolean)
+            Try
+                Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_VWMT_FUNCTIONS)
+                Dim oItems As New List(Of FieldConfig)
+
+                For Each oRow As DataRow In oTable.Rows
+                    Dim oTemplateItemId = oRow.ItemEx("ITEM_ID", 0)
+                    Dim oTemplateItem = TemplateConfiguration.Items.SingleOrDefault(Function(i) i.Id = oTemplateItemId)
+
+                    If oTemplateItem Is Nothing Then
+                        Logger.Warn("Function configuration could not be assigned to an existing template item, item id was [{0}]", oTemplateItemId)
+                        Continue For
+                    End If
+
+                    oTemplateItem.Functions.Add(New FieldConfig.ColumnFunction With {
+                        .Id = oRow.ItemEx("FUNCTION_ID", 0),
+                        .Name = oRow.ItemEx("FUNCTION_NAME", String.Empty),
+                        .Params = oRow.ItemEx("FUNCTION_PARAMETERS", String.Empty)
+                    })
+                Next
+
+                Return True
+
+            Catch ex As Exception
+                Logger.Error(ex)
+                Return False
+            End Try
+        End Function
+
+
+
         Public Function UpdateTemplateFromFile(pTemplate As Template, pInputDirectory As String) As Template
             Dim oFullPath = Path.Combine(pInputDirectory, pTemplate.FileName)
 
@@ -237,15 +300,18 @@ Namespace Templates
 
         Public Function UpdateTemplateTablesFromDatabase(pTemplate As Template, pTemplateConfig As TemplateConfig) As Template
             If pTemplateConfig Is Nothing Then
+                Logger.Warn("Template config is empty. Skipping.")
                 Return pTemplate
             End If
 
-            For Each oTable In pTemplate.Tables
+            Dim oTemplate = CreateVirtualColumns(pTemplate, pTemplateConfig)
+
+            For Each oTable In oTemplate.Tables
                 For Each oColumn As Template.Column In oTable.Columns
-                    Dim oConfig = pTemplateConfig.GetColumn(oColumn.Name, oTable.Name)
+                    Dim oConfig As FieldConfig = pTemplateConfig.GetColumn(oColumn.Name, oTable.Name)
 
                     If oConfig Is Nothing Then
-                        oConfig = New TemplateConfigItem With {
+                        oConfig = New FieldConfig With {
                             .IsRequired = oColumn.IsRequired,
                             .Name = oColumn.Name
                         }
@@ -255,12 +321,41 @@ Namespace Templates
                 Next
             Next
 
+            Return oTemplate
+        End Function
+
+        Private Function CreateVirtualColumns(pTemplate As Template, pTemplateConfig As TemplateConfig) As Template
+            Dim oTemplateItems = pTemplateConfig.Items.
+                Where(Function(item) item.Template = pTemplate.Name).
+                ToList()
+
+            For Each oItem In oTemplateItems
+                ' Find the table that relates to this config item
+                Dim oTable = pTemplate.Tables.Where(Function(table) table.Name = oItem.Table).FirstOrDefault()
+
+                If oTable Is Nothing Then
+                    Logger.Warn("Table [{0}] for item [{1}] does not exist in this Template!", oItem.Table, oItem.Name)
+                    Continue For
+                End If
+
+                Dim oColumnExists = oTable.Columns.Any(Function(column) column.Name = oItem.Name)
+
+                If oColumnExists = False And oItem.IsVirtual = True Then
+                    oTable.Columns.Add(New Template.Column() With {
+                        .Name = oItem.Name,
+                        .Config = oItem,
+                        .DataType = Constants.ColumnType.String,
+                        .IsRequired = False
+                    })
+                End If
+            Next
+
             Return pTemplate
         End Function
 
         Public Function UpdateTemplateFromDatabase(pTemplate As Template) As Template
             Try
-                Dim oTable As DataTable = Database.GetDatatable($"{SQL_TBEDI_XML_CONFIG} WHERE TEMPLATE_ID = {pTemplate.Guid}")
+                Dim oTable As DataTable = Database.GetDatatable($"{SQL_TBMT_CONFIG} WHERE TEMPLATE_ID = {pTemplate.Guid}")
                 Dim oGeneralConfig As New GeneralConfig
 
                 For Each oRow As DataRow In oTable.Rows

MultiTool.Common/Winline/Entities/ExportDocument.vb

@@ -1,5 +1,7 @@
-Namespace Winline.Entities
-    Public Class Document
+Imports MultiTool.Common.Winline.WinlineData
+
+Namespace Winline.Entities
+    Public Class ExportDocument
         Public Property Schema As Templates.Template
 
         Public Property Account As Account
@@ -18,7 +20,7 @@
         Public Property GrossAmount As Double
 
         Public Property IsSelected As Boolean = False
-        Public Property IsExported As Boolean = False
+        Public Property IsExported As Boolean
 
         Public Property FilenameExport As String
         Public Property ExportedWhen As Date

MultiTool.Common/Winline/Entities/PackingUnit.vb

@@ -0,0 +1,25 @@
+Namespace Winline.Entities
+    Public Class PackingUnit
+        Public Property Name As String
+        Public Property Description As String
+        Public Property Description2 As String
+        Public Property Unit As Integer
+        Public Property Factor As Decimal
+        Public Property Flag As Integer
+
+        Public Property Mandator As Mandator
+
+        Public Overrides Function GetHashCode() As Integer
+            Return Name.GetHashCode()
+        End Function
+
+        Public Overrides Function Equals(obj As Object) As Boolean
+            Return DirectCast(obj, PackingUnit).Name = Name
+        End Function
+
+        Public Overrides Function ToString() As String
+            Return Name
+        End Function
+    End Class
+
+End Namespace

MultiTool.Common/Winline/WebServiceData.vb

@@ -0,0 +1,564 @@
+Imports System.Collections.Specialized
+Imports System.Net.Http
+Imports System.Text
+Imports System.Xml
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Logging
+Imports MultiTool.Common.Documents
+Imports MultiTool.Common.Exceptions
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Templates.GeneralConfig
+Imports MultiTool.Common.Winline.Entities
+
+Namespace Winline
+    Public Class WebServiceData
+        Inherits BaseClass
+
+        Private ReadOnly Config As WebServiceConfig
+        Private ReadOnly Filters As FilterConfig
+        Private ReadOnly Serializer As Serializer
+        Private ReadOnly Winline As WinlineData
+        Private ReadOnly FileEx As FilesystemEx
+        Private ReadOnly Patterns As Patterns
+
+        Public Event WebServiceProgress As EventHandler(Of String)
+
+        Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer, pWinline As WinlineData, pWebserviceConfig As WebServiceConfig, pGeneralConfig As GeneralConfig, pFilterConfig As FilterConfig)
+            MyBase.New(pLogConfig, pDatabase)
+            Serializer = New Serializer(pLogConfig)
+            Config = pWebserviceConfig
+            Filters = pFilterConfig
+            Patterns = New Patterns(pLogConfig, pGeneralConfig)
+            FileEx = New FilesystemEx(LogConfig)
+            Winline = pWinline
+        End Sub
+
+        Public Sub RaiseWebServiceProgress(pMessage As String)
+            RaiseEvent WebServiceProgress(Me, pMessage)
+        End Sub
+
+#Region "Import"
+        ''' <summary>
+        ''' Transfers a document to winline via Webservices
+        ''' </summary>
+        ''' <param name="pDocument"></param>
+        ''' <param name="pTemplate"></param>
+        ''' <param name="pMandator"></param>
+        ''' <param name="pIsTest"></param>
+        ''' <exception cref="HttpRequestException"></exception>
+        ''' <exception cref="WebServiceException"></exception>
+        ''' <exception cref="TaskCanceledException"></exception>
+        ''' <returns>True if request was successful.</returns>
+        Public Async Function TransferDocumentToWinline(pDocument As Documents.Document, pTemplate As Template, pMandator As Mandator, Optional pIsTest As Boolean = False) As Task(Of Boolean)
+            Dim oWS = Config
+
+            RaiseEvent WebServiceProgress(Me, "Einstellungen laden")
+            Logger.Debug("Loading setting and creating directories")
+
+            ' --- Build all teh filenamez and pathz
+            Dim oBaseFileName As String = FileEx.GetDateTimeString()
+            Dim oFileName = $"{pTemplate.Name}-{oBaseFileName}-Request.xml"
+
+            ' --- Get and create path for request/response files
+            Dim oOutputDirectory = FileEx.CreateDateDirectory(pTemplate.OutputWebserviceDirectory)
+            Dim oOutputFilePath = IO.Path.Combine(oOutputDirectory, oFileName)
+
+            ' Generate absolute path to copy xml file to
+            Dim oAbsolutePath = IO.Path.Combine(oWS.ImportBasePath, oWS.ImportRelativePath)
+            oAbsolutePath = FileEx.CreateDateDirectory(oAbsolutePath)
+            Dim oImportAbsoluteFilePath = IO.Path.Combine(oAbsolutePath, oFileName)
+
+            ' Generate relative path to supply to winline
+            Dim oRelativePath = IO.Path.Combine(oWS.ImportRelativePath)
+            oRelativePath = FileEx.GetDateDirectory(oRelativePath)
+            Dim oImportRelativeFilePath = IO.Path.Combine(oRelativePath, oFileName)
+
+            RaiseEvent WebServiceProgress(Me, "Dateien schreiben")
+            Logger.Debug("Writing request file to [{oOutputFilePath}]")
+
+            ' If configured, prevent printing the document and instead create it as a draft in the "Nicht gedruckt" section
+            If pTemplate.PrintDocument = False Then
+                pDocument.PrintVoucher = 0
+            End If
+
+            ' --- Serialize Data into XML string
+            Dim oBytes As Byte() = GetBytesFromDocument(pDocument)
+            IO.File.WriteAllBytes(oOutputFilePath, oBytes)
+
+            ' --- Copy file to Winline Import Directory
+            Try
+                Logger.Debug("Copying request file to [{oImportAbsoluteFilePath}]")
+                IO.File.Copy(oOutputFilePath, oImportAbsoluteFilePath, True)
+            Catch ex As Exception
+                Logger.Error(ex)
+                Throw ex
+            End Try
+
+            ' --- Prepare URL and HTTP Client
+            Dim oTemplateType = pDocument.TemplateType
+            Dim oTemplateName = pDocument.TemplateName
+            Logger.Debug("Using Template [{0}/{1}]", oTemplateName, oTemplateType)
+
+            ' ActionCode: Should this be a test or not?
+            ' 0 = Test call
+            ' 1 = Real call
+            Dim oActionCode = 1
+            If pIsTest = True Then
+                oActionCode = 0
+            End If
+            Logger.Debug("Using ActionCode [{0}]", oActionCode)
+
+            ' Byref: Should data be supplied as file or as string?
+            ' 0 = As String
+            ' 1 = As File (relative to Winline Server directory)
+            Dim oByref = 1
+
+            Dim oParams As New NameValueCollection() From {
+                {"User", oWS.Username},
+                {"Password", oWS.Password},
+                {"Company", pMandator.Id},
+                {"Type", oTemplateType},
+                {"Vorlage", oTemplateName},
+                {"ActionCode", oActionCode},
+                {"Byref", oByref},
+                {"Data", oImportRelativeFilePath}
+            }
+
+            Dim oURL As String = $"{oWS.BaseUrl}/ewlservice/import{ToQueryString(oParams)}"
+            'Dim oURL As String = $"{oWS.BaseUrl}/ewlservice/import?User={oWS.Username}&Password={oWS.Password}&Company={pMandator.Id}&Type={oTemplateType}&Vorlage={oTemplateName}&ActionCode={oActionCode}&Byref={oByref}&Data={oImportRelativeFilePath}"
+            Dim oClient As New HttpClient With {
+                .Timeout = TimeSpan.FromSeconds(Constants.HTTP_REQUEST_TIMEOUT_IN_SECONDS)
+            }
+
+            Logger.Info("Creating HTTP Request to [{0}]", oWS.BaseUrl)
+
+            RaiseEvent WebServiceProgress(Me, "Anfrage absenden")
+
+            ' --- Bring the action!
+            Try
+                Dim oResponse As HttpResponseMessage = Await oClient.GetAsync(oURL)
+                Logger.Debug("HTTP Response recevied!")
+
+                Await HandleImportResponse(oResponse, pTemplate, oBaseFileName)
+
+                Return True
+            Catch ex As Exception
+                Logger.Error(ex)
+                Throw ex
+            Finally
+                oClient.Dispose()
+            End Try
+        End Function
+
+        Private Async Function HandleImportResponse(pResponse As HttpResponseMessage, pTemplate As Template, pBaseFileName As String) As Task
+            pResponse.EnsureSuccessStatusCode()
+            Dim oResponseBody As String = Await pResponse.Content.ReadAsStringAsync()
+            Dim oContentType = pResponse.Content.Headers.ContentType.MediaType
+            Dim oSerializer = Serializer.GetSerializer(GetType(Templates.Entities.MESOWebServiceResult))
+            Dim oOutputDirectory = FileEx.CreateDateDirectory(pTemplate.OutputWebserviceDirectory)
+
+            RaiseEvent WebServiceProgress(Me, "Antwort verarbeiten")
+
+            Logger.Debug("Response ContentType: [{0}]", oContentType)
+
+            Select Case oContentType
+                Case "text/xml"
+                    Logger.Debug("Got XML Response. Checking.")
+
+                    WriteResponseFile(oOutputDirectory, oResponseBody, $"{pTemplate.Name}-{pBaseFileName}-Response.xml")
+
+                    Dim oBytes As Byte() = Encoding.UTF8.GetBytes(oResponseBody)
+                    Using oStream As New IO.MemoryStream(oBytes)
+                        Dim oResponseObject As Templates.Entities.MESOWebServiceResult = oSerializer.Deserialize(oStream)
+                        Dim oErrorStrings As New List(Of String)
+
+                        If oResponseObject.ResultDetails IsNot Nothing Then
+                            For Each oDetails As Templates.Entities.MESOWebServiceResultResultDetails In oResponseObject.ResultDetails
+
+                                If oDetails.Success = True Then
+                                    Logger.Debug("KeyValue: [{0}]", oDetails.KeyValue)
+                                    Logger.Debug("VoucherNumber: [{0}]", oDetails.VoucherNumber)
+                                Else
+                                    Logger.Warn("ErrorCode: [{0}]", oDetails.ErrorCode)
+                                    Logger.Warn("ErrorText: [{0}]", oDetails.ErrorText)
+                                    oErrorStrings.Add($"[{oDetails.ErrorCode}] {oDetails.ErrorText}")
+                                End If
+                            Next
+                        End If
+
+                        If oResponseObject.OverallSuccess = False Then
+                            Dim oMessage = $"Request to Webservice was unsuccessful:{vbNewLine}{vbNewLine}{String.Join(vbNewLine, oErrorStrings.ToArray)}"
+
+                            Logger.Warn("Overall Success was [false]")
+
+                            Throw New WebServiceException(oMessage)
+                        End If
+                    End Using
+
+                Case "text/html"
+                    Logger.Debug("Got TEXT/HTML Response. Throwing.")
+                    WriteResponseFile(oOutputDirectory, oResponseBody, $"{pTemplate.Name}-{pBaseFileName}-Response.xml")
+
+                    Throw New WebServiceException(oResponseBody)
+
+                Case Else
+                    Logger.Debug("Unknown Response ContentType: [{0}]", oContentType)
+
+                    Throw New WebServiceException(oResponseBody)
+
+            End Select
+        End Function
+
+        Private Function GetBytesFromDocument(pDocument As Documents.Document) As Byte()
+            Using oStream As New IO.MemoryStream()
+                Dim w = XmlWriter.Create(oStream)
+
+                w.WriteStartDocument()
+                w.WriteStartElement("MESOWebService")
+                w.WriteAttributeString("Template", pDocument.TemplateName)
+                w.WriteAttributeString("TemplateType", pDocument.TemplateType)
+                w.WriteAttributeString("option", pDocument.Option)
+                w.WriteAttributeString("printVoucher", pDocument.PrintVoucher)
+
+                pDocument.Rows.Sort()
+
+                For Each oRow In pDocument.Rows
+                    w.WriteStartElement(oRow.TableName)
+
+                    For Each oField As KeyValuePair(Of String, DocumentRow.FieldValue) In oRow.Fields
+                        If oField.Value.Final = String.Empty Then
+                            Continue For
+                        End If
+
+                        If oField.Value.IsVirtual Then
+                            Continue For
+                        End If
+
+                        w.WriteStartElement(oField.Key)
+                        w.WriteValue(oField.Value.Final)
+                        w.WriteEndElement() ' Field
+                    Next
+
+                    w.WriteEndElement() ' Row
+                Next
+                w.WriteEndElement() ' MESOWebService
+                w.WriteEndDocument() ' Document
+                w.Close()
+
+                Return oStream.ToArray()
+            End Using
+        End Function
+
+#End Region
+
+#Region "Export"
+        Async Function ExportDocumentFromWinline(pDocument As ExportDocument, pTemplate As Template, pMandator As Mandator, Optional pIsTest As Boolean = False) As Task(Of Boolean)
+            Dim oWS = Config
+
+            Logger.Info("Exporting document from Winline")
+
+            ' --- Build all teh filenamez and pathz
+            Dim oBaseFileName As String = FileEx.GetDateTimeString()
+            Dim oFileName = $"{pTemplate.Name}-{oBaseFileName}.xml"
+            'Dim oFileName = FileEx.GetFilenameWithPrefix(oBaseFileName, pTemplate.Name, "xml")
+
+            Logger.Info("Filename will be [{0}]", oFileName)
+
+            ' Save the filename to the document
+            pDocument.FilenameExport = oFileName
+
+            RaiseEvent WebServiceProgress(Me, "Abfrage vorbereiten")
+
+            Logger.Debug("Preparing WebService call")
+
+            ' --- Prepare URL and HTTP Client
+            Dim oTemplateType = 30
+            Dim oTemplateName = pDocument.Schema.Name
+            Dim oKey = $"{pDocument.Account.Id}-{pDocument.RunningNumber}"
+
+            ' ActionCode: Should this be a test or not?
+            ' 0 = Test call
+            ' 1 = Real call
+            Dim oActionCode = 1
+            If pIsTest = True Then
+                oActionCode = 0
+            End If
+
+            Logger.Debug("This is a test: [{0}]", pIsTest)
+
+            Dim oURL As String = $"{oWS.BaseUrl}/ewlservice/export?User={oWS.Username}&Password={oWS.Password}&Company={pMandator.Id}&Type={oTemplateType}&Vorlage={oTemplateName}&ActionCode={oActionCode}&Key={oKey}"
+            Dim oClient As New HttpClient()
+
+            Logger.Info("Creating HTTP Request to [{0}]", oWS.BaseUrl)
+
+            RaiseEvent WebServiceProgress(Me, "Anfrage absenden")
+
+            ' --- Bring the action!
+            Try
+                Dim oResponse As HttpResponseMessage = Await oClient.GetAsync(oURL)
+                Logger.Info("Request ended with code: [{0}]", oResponse.StatusCode)
+
+                Await HandleExportResponse(oResponse, pDocument, pTemplate, pMandator, oBaseFileName)
+
+                Return True
+
+            Catch ex As Exception
+                Logger.Error(ex)
+                Throw ex
+
+            Finally
+                oClient.Dispose()
+
+            End Try
+        End Function
+
+        Private Async Function HandleExportResponse(pResponse As HttpResponseMessage, pDocument As Entities.ExportDocument, pTemplate As Template, pMandator As Mandator, pBaseFileName As String) As Task
+            pResponse.EnsureSuccessStatusCode()
+
+            Dim oResponseBody As String = Await pResponse.Content.ReadAsStringAsync()
+            Dim oContentType = pResponse.Content.Headers.ContentType.MediaType
+            Dim oSerializer = Serializer.GetSerializer(GetType(Templates.Entities.MESOWebServiceResult))
+
+            RaiseEvent WebServiceProgress(Me, "Antwort verarbeiten")
+
+            Logger.Debug("Processing response with type '{0}'", oContentType)
+
+            Select Case oContentType
+                Case "text/xml"
+                    Dim oXmlResponse = oResponseBody
+                    Dim oDoc = ConvertStringToDocument(oXmlResponse)
+
+                    Logger.Debug("Applying Item Filters")
+                    oDoc = ApplyItemFiltersForExport(pDocument, pTemplate, pMandator, oDoc)
+
+                    Logger.Debug("Applying Item Functions")
+                    oDoc = ApplyItemFunctionsForExport(pDocument, pTemplate, pMandator, oDoc)
+
+                    Dim oXml = ConvertDocumentToString(oDoc)
+
+                    ' Webservice
+                    WriteResponseFile(pTemplate.OutputWebserviceDirectory, oXml, $"{pTemplate.Name}-{pBaseFileName}-Response.xml")
+                    ' XML
+                    WriteResponseFile(pTemplate.OutputXmlFileDirectory, oXml, $"{pTemplate.Name}-{pBaseFileName}.xml")
+                    ' Archive
+                    WriteResponseFile(FileEx.CreateDateDirectory(pTemplate.ArchiveDirectory), oXml, $"{pTemplate.Name}-{pBaseFileName}.xml")
+
+                Case "text/html"
+                    WriteResponseFile(pTemplate.OutputWebserviceDirectory, oResponseBody, $"{pTemplate.Name}-{pBaseFileName}-Response.txt")
+
+                    Throw New ApplicationException(oResponseBody)
+
+                Case Else
+                    Throw New ApplicationException(oResponseBody)
+            End Select
+        End Function
+
+        Private Function ConvertStringToDocument(pXmlString As String) As XmlDocument
+            Dim oDoc As New XmlDocument()
+            oDoc.LoadXml(pXmlString)
+            Return oDoc
+        End Function
+
+        Private Function ConvertDocumentToString(pXmlDocument As XmlDocument) As String
+            Dim oArray As Byte()
+            Using oStream As New IO.MemoryStream
+                pXmlDocument.Save(oStream)
+                oArray = oStream.ToArray()
+            End Using
+
+            Return System.Text.Encoding.UTF8.GetString(oArray)
+        End Function
+
+        Private Function ApplyItemFunctionsForExport(pDocument As Entities.ExportDocument, pTemplate As Template, pMandator As Mandator, oXMLDocument As XmlDocument) As XmlDocument
+            For Each oTable In pTemplate.Tables
+                Logger.Debug("Processing Table [{0}]", oTable.Name)
+
+                For Each oColumn As Template.Column In oTable.Columns
+                    Dim oTableName As String = oTable.Name
+                    Dim oItemName As String = oColumn.Name
+
+                    Logger.Debug("Processing item [{0}]", oItemName)
+
+                    For Each oFunction As FieldConfig.ColumnFunction In oColumn.Config.Functions
+
+                        Dim oFunctionName = oFunction.Name
+                        Dim oFunctionParams = oFunction.Params
+
+                        Dim oPath = $"//MESOWebService/{oTableName}/{oItemName}"
+                        Dim oNodes As XmlNodeList = oXMLDocument.SelectNodes(oPath)
+
+                        Logger.Debug("Calling function [{0}] on node [{1}]", oFunctionName, oPath)
+
+                        For Each oNode As XmlNode In oNodes
+                            If oFunctionName = Constants.FUNCTION_GLN Then
+                                Dim oGLN = Winline.TryGetGLN(oNode.InnerText, pMandator)
+
+                                If oGLN Is Nothing Then
+                                    Throw New MissingAttributeException(Constants.FUNCTION_GLN)
+                                End If
+
+                                oNode.InnerText = oGLN
+
+                            ElseIf oFunctionName = Constants.FUNCTION_EAN Then
+                                Dim oEAN = Winline.TryGetEAN(oNode.InnerText, pMandator)
+
+                                If oEAN Is Nothing Then
+                                    ' 21.04.2022: Relax the EAN Check 
+                                    ' Since it is possible to have articles without a proper EAN in export,
+                                    ' we dont throw here, but leave the original value in case of a failure.
+                                    ' Throw New Exceptions.MissingAttributeException("EAN")
+                                    Logger.Warn("EAN could not be retrieved for Node {0}. Skipping.", oNode.Name)
+                                    Continue For
+                                End If
+
+                                oNode.InnerText = oEAN
+
+                            ElseIf oFunctionName = Constants.FUNCTION_SQL Then
+                                Dim oSQL = Patterns.ReplaceForExport(pDocument, pMandator, oFunctionParams)
+                                Dim oValue = Database.GetScalarValue(oSQL)
+
+                                If oValue Is Nothing Then
+                                    Throw New MissingAttributeException(Constants.FUNCTION_SQL)
+                                End If
+
+                                oNode.InnerText = oValue
+
+                            End If
+                        Next
+                    Next
+
+
+                Next
+            Next
+
+            Return oXMLDocument
+        End Function
+
+        Private Function ApplyItemFiltersForExport(pDocument As ExportDocument, pTemplate As Template, pMandator As Mandator, oXMLDocument As XmlDocument) As XmlDocument
+            Dim oTableNames = pDocument.Schema.Tables.
+                Select(Function(table) table.Name).
+                ToList()
+            Dim oFilters = Filters.Items.
+                Where(Function(filter) oTableNames.Contains(filter.TableName)).
+                ToList()
+
+            Logger.Info("Applying [{0}] filters before exporting.", oFilters.Count)
+
+            For Each oFilter As FilterConfigItem In oFilters
+                Dim oTableName = oFilter.TableName
+
+                Logger.Debug("Applying filter for Table [{0}]", oTableName)
+
+                If String.IsNullOrEmpty(oFilter.SQLCommand) Then
+                    Logger.Warn("SQL Command for filter is empty. Continuing.")
+                    Continue For
+                End If
+
+                Logger.Debug("Executing SQL Command: [{0}]", oFilter.SQLCommand)
+
+                Dim oSQLResult = Database.GetDatatable(oFilter.SQLCommand)
+
+                If oSQLResult Is Nothing Then
+                    Logger.Warn("SQL Command for filter returned nothing: {0}. Continuing.", oFilter.SQLCommand)
+                    Continue For
+                End If
+
+                Dim oResultList = oSQLResult.AsEnumerable.
+                    Select(Function(row) row.ItemEx(0, String.Empty).Trim).
+                    ToList()
+
+                Logger.Debug("Filterlist contains [{0}] items", oResultList.Count)
+
+                Dim oTableNodes = oXMLDocument.SelectNodes($"//{oTableName}")
+
+                Logger.Debug("Table contains [{0}] elements", oTableNodes.Count)
+
+                For Each oElementNode As XmlNode In oTableNodes
+                    Dim oPath As String = $"./{oFilter.ColumnName}"
+                    Dim oSubNode = oElementNode.SelectSingleNode(oPath)
+
+                    If oSubNode Is Nothing Then
+                        Logger.Warn("Column [{0}] was not found in element.", oFilter.ColumnName)
+                        Continue For
+                    End If
+
+                    Dim oNodeValue = oSubNode.InnerText.Trim
+                    Logger.Debug("Element Value is [{0}]", oNodeValue)
+
+                    If Not oResultList.Contains(oNodeValue) Then
+                        Logger.Warn("Element for Column [{0}] was not found in filterlist.", oFilter.ColumnName)
+                        Continue For
+                    End If
+
+                    Logger.Info("Removing node [{0}] containing value [{1}]", oPath, oNodeValue)
+                    oElementNode.ParentNode.RemoveChild(oElementNode)
+                Next
+            Next
+
+            Return oXMLDocument
+        End Function
+#End Region
+
+
+        Private Function WriteResponseFileWithSuffix(pPath As String, pBaseFileName As String, pResponseBody As String, pExtension As String, pSuffix As String) As Boolean
+            Try
+                Dim oRequestFileName As String = FileEx.GetFilenameWithSuffix(pBaseFileName, pSuffix, pExtension)
+                Dim oFilePath As String = IO.Path.Combine(pPath, oRequestFileName)
+                IO.File.WriteAllText(oFilePath, pResponseBody)
+
+                Return True
+            Catch ex As Exception
+                Logger.Error(ex)
+                Return False
+            End Try
+        End Function
+
+        Private Function WriteResponseFileWithPrefix(pPath As String, pBaseFileName As String, pResponseBody As String, pExtension As String, pPrefix As String) As Boolean
+            Try
+                Dim oRequestFileName As String = FileEx.GetFilenameWithPrefix(pBaseFileName, pPrefix, pExtension)
+                Dim oFilePath As String = IO.Path.Combine(pPath, oRequestFileName)
+                IO.File.WriteAllText(oFilePath, pResponseBody)
+
+                Return True
+            Catch ex As Exception
+                Logger.Error(ex)
+                Return False
+            End Try
+        End Function
+
+        Private Function WriteResponseFile(pPath As String, pResponseBody As String, pFileName As String) As Boolean
+            Try
+                Dim oFilePath As String = IO.Path.Combine(pPath, pFileName)
+                IO.File.WriteAllText(oFilePath, pResponseBody)
+
+                Return True
+            Catch ex As Exception
+                Logger.Error(ex)
+                Return False
+            End Try
+        End Function
+
+        Private Function ToQueryString(ByVal nvc As NameValueCollection) As String
+            Dim sb As StringBuilder = New StringBuilder("?")
+            Dim first As Boolean = True
+
+            For Each key As String In nvc.AllKeys
+
+                For Each value As String In nvc.GetValues(key)
+
+                    If Not first Then
+                        sb.Append("&")
+                    End If
+
+                    sb.AppendFormat("{0}={1}", Uri.EscapeDataString(key), Uri.EscapeDataString(value))
+                    first = False
+                Next
+            Next
+
+            Return sb.ToString()
+        End Function
+    End Class
+
+
+End Namespace

MultiTool.Common/Winline/WinlineData.vb

@@ -1,54 +1,84 @@
-Imports DigitalData.Modules.Logging
+Imports System.Text.RegularExpressions
+Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Database
-Imports MultiTool.Shared.Winline.Entities
-Imports System.Text.RegularExpressions
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Constants
-Imports DigitalData.Modules.Language
+Imports DigitalData.Modules.Base
+Imports MultiTool.Common.Winline.Entities
+Imports MultiTool.Common.Constants
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Exceptions
+Imports MultiTool.Common.Documents
+Imports System.Data.SqlClient
 
 Namespace Winline
     Public Class WinlineData
         Inherits BaseClass
 
-        Private ReadOnly Property Database As MSSQLServer
         Private ReadOnly Property Config As GeneralConfig
         Private ReadOnly Property MandatorConfig As MandatorConfig
         Private ReadOnly Property MappingConfig As MappingConfig
         Private ReadOnly Property Patterns As Patterns
+        Private ReadOnly Property FileEx As FilesystemEx
 
         Public Property Articles As New List(Of Article)
         Public Property Accounts As New List(Of Account)
+        Public Property PackingUnits As New List(Of PackingUnit)
         Public Property Mandators As New List(Of Mandator)
         Public Property DocumentKinds As New List(Of DocumentKind)
 
-        Public Years As List(Of Integer)
+        Public Property Years As List(Of Integer)
 
         Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer, pConfig As GeneralConfig, pMappingConfig As MappingConfig, pMandatorConfig As MandatorConfig)
-            MyBase.New(pLogConfig)
+            MyBase.New(pLogConfig, pDatabase)
             Patterns = New Patterns(pLogConfig, pConfig)
-            Database = pDatabase
             Config = pConfig
             MandatorConfig = pMandatorConfig
             MappingConfig = pMappingConfig
+            FileEx = New FilesystemEx(pLogConfig)
+            Years = LoadEconomicYears()
         End Sub
 
+        ''' <summary>
+        ''' Winline Doctype.
+        ''' 
+        ''' Used for filtering Documents when exporting and determining the type of document (sales/purchasing)
+        ''' </summary>
         Public Enum DocumentType
-            Offer = 1
-            Order = 2
-            DeliverySlip = 3
-            Invoice = 4
+            Undefined = 0
+            OutgoingOffer = 1
+            OutgoingOrder = 2
+            OutgoingDeliveryNote = 3
+            OutgoingInvoice = 4
+            IncomingOffer = 5
+            IncomingOrder = 6
+            IncomingDeliveryNote = 7
+            IncomingInvoice = 8
+        End Enum
+
+        Public Enum DocumentTypeCategory
+            Undefined = 0
+            Outgoing = 1
+            Incoming = 2
         End Enum
 
         Public Class GetDocumentArgs
             Public Property Account As Account
-            Public Property Kind As DocumentKind
+            Public Property Kinds As List(Of DocumentKind)
             Public Property DateFrom As Date
             Public Property DateTo As Date
+            Public Property DocNumberFrom As String
+            Public Property DocNumberTo As String
             Public Property ShowExported As Boolean
+            Public Property Year As Integer
         End Class
 
+        Private Function LoadEconomicYears() As IEnumerable(Of Integer)
+            Dim oCurrentYear = Now.Year
+            Dim oRange As IEnumerable(Of Integer) = Enumerable.Range(oCurrentYear - 10, 12).ToList()
+            Return oRange
+        End Function
 
-        Public Async Function LoadArticles(pMandator As Mandator) As Task
+
+        Public Async Function LoadArticlesAsync(pMandator As Mandator) As Task
             Logger.Info("Loading Articles for Mandator [{0}]", pMandator)
             Dim oYear = Config.GetWinLineYear()
 
@@ -60,8 +90,8 @@ Namespace Winline
                     [c075] -- EAN
                     FROM [{pMandator.Server}].[{pMandator.Database}].[dbo].[v021] 
                     WHERE 
-                    mesocomp = '{pMandator.Id}'
-                    AND mesoyear = {oYear}"
+                    c038 IS NULL -- Nur Aktive Artikel
+                    AND mesocomp = '{pMandator.Id}' AND mesoyear = {oYear}"
 
                 Dim oTable = Await Database.GetDatatableAsync(oSQL)
                 Dim oArticles As New List(Of Article)
@@ -87,7 +117,58 @@ Namespace Winline
             End Try
         End Function
 
-        Public Async Function LoadAccounts(pMandator As Mandator) As Task
+        Public Async Function LoadPackingUnitsAsync(pMandator As Mandator) As Task
+            Logger.Info("Loading Packing Units for Mandator [{0}]", pMandator)
+            Dim oYear = Config.GetWinLineYear()
+
+            Try
+                Dim oSQL = $"
+                    SELECT DISTINCT 
+                    [c002], -- Name 
+                    [c003], -- Description
+                    [c004], -- Description 2
+                    [c005], -- Unit
+                    [c006], -- Value/Factor
+                    [c007] -- Flag (?)
+                    FROM [{pMandator.Server}].[{pMandator.Database}].[dbo].[t346]
+                    WHERE
+                    mesocomp = '{pMandator.Id}'
+                    AND mesoyear = {oYear}"
+                Dim oTable = Await Database.GetDatatableAsync(oSQL)
+                Dim oPackingUnits As New List(Of PackingUnit)
+
+                For Each oRow As DataRow In oTable.Rows
+                    Dim oName As String = ItemEx(oRow, "c002", String.Empty)
+                    Dim oDescription As String = ItemEx(oRow, "c003", String.Empty)
+                    Dim oDescription2 As String = ItemEx(oRow, "c004", String.Empty)
+                    Dim oUnit As Decimal = ItemEx(oRow, "c005", 0.0)
+                    Dim oFactor As Decimal = ItemEx(oRow, "c006", 0.0)
+                    Dim oFlag As Integer = ItemEx(oRow, "c007", 0)
+
+                    oPackingUnits.Add(New PackingUnit With {
+                        .Name = oName,
+                        .Description = oDescription,
+                        .Description2 = oDescription2,
+                        .Unit = oUnit,
+                        .Factor = oFactor,
+                        .Flag = oFlag,
+                        .Mandator = pMandator
+                    })
+                Next
+                PackingUnits.AddRange(oPackingUnits)
+
+                If oPackingUnits.Count = 0 Then
+                    Logger.Warn("No Packing Units loaded for Mandator [{0}]", pMandator)
+                End If
+
+                Logger.Info("[{0}] Packing Units loaded for Mandator [{1}]", oPackingUnits.Count, pMandator)
+            Catch ex As Exception
+                Logger.Warn("Could not load Packing Units for Mandator [{0}]", pMandator)
+                Logger.Error(ex)
+            End Try
+        End Function
+
+        Public Async Function LoadAccountsAsync(pMandator As Mandator) As Task
             Logger.Info("Loading Accounts for Mandator [{0}]", pMandator)
             Dim oYear = Config.GetWinLineYear()
 
@@ -102,7 +183,8 @@ Namespace Winline
                     [c260] -- GLN
                     FROM [{pMandator.Server}].[{pMandator.Database}].[dbo].[v050] 
                     WHERE 
-                    c139 IS NULL
+                    c139 IS NULL -- Kontentyp
+                    AND c105 IS NULL -- Inaktiv
                     AND mesocomp = '{pMandator.Id}'
                     AND mesoyear = {oYear}"
                 Dim oTable = Await Database.GetDatatableAsync(oSQL)
@@ -128,6 +210,10 @@ Namespace Winline
                 Next
                 Accounts.AddRange(oAccounts)
 
+                If oAccounts.Count = 0 Then
+                    Logger.Warn("No Accounts loaded for Mandator [{0}]", pMandator)
+                End If
+
                 Logger.Info("[{0}] Accounts loaded for Mandator [{1}]", oAccounts.Count, pMandator)
             Catch ex As Exception
                 Logger.Warn("Could not load Accounts for Mandator [{0}]", pMandator)
@@ -135,7 +221,7 @@ Namespace Winline
             End Try
         End Function
 
-        Public Async Function LoadMandators() As Task
+        Public Async Function LoadMandatorsAsync() As Task
             Try
                 Dim oSQL = "SELECT [c000], [c003], [c004] FROM [cwlsystem].[dbo].[T001SRV] (NOLOCK)"
                 Dim oTable = Await Database.GetDatatableAsync(oSQL)
@@ -169,13 +255,9 @@ Namespace Winline
             End Try
         End Function
 
-        Public Sub LoadEconomicYears()
-            Dim oCurrentYear = Now.Year
-            Dim oRange As IEnumerable(Of Integer) = Enumerable.Range(oCurrentYear - 10, 12).ToList()
-            Years = oRange
-        End Sub
 
-        Public Async Function LoadDocumentKinds(pMandator As Mandator) As Task
+
+        Public Async Function LoadDocumentKindsAsync(pMandator As Mandator) As Task
             Dim oYear As Integer = Config.GetWinLineYear()
 
             Try
@@ -190,6 +272,7 @@ Namespace Winline
                             [c001] LIKE 'Werk%(VK)' OR 
                             [c001] LIKE 'Werk%(WK)'
                         ) 
+                        AND c129 IS NULL -- Inaktiv
                         AND [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {oYear}"
                 Dim oTable As DataTable = Await Database.GetDatatableAsync(oSQL)
                 Dim oKinds As New List(Of DocumentKind)
@@ -212,8 +295,16 @@ Namespace Winline
         End Function
 
         Public Function TryGetAccount(pGLN As String, pMandator As Mandator) As Account
+            Return TryGetAccount(pGLN, pMandator, "c260", String.Empty)
+        End Function
+
+        Public Function TryGetAccount(pGLN As String, pMandator As Mandator, pSearchField As String) As Account
+            Return TryGetAccount(pGLN, pMandator, pSearchField, String.Empty)
+        End Function
+
+        Public Function TryGetAccount(pIdentifier As String, pMandator As Mandator, pSearchField As String, pAlternativeField As String) As Account
             Try
-                If pGLN Is Nothing OrElse pGLN = String.Empty Then
+                If pIdentifier Is Nothing OrElse pIdentifier = String.Empty Then
                     Return Nothing
                 End If
 
@@ -224,23 +315,24 @@ Namespace Winline
                     [c003], -- Kundenname
                     [c050], -- Straße
                     [c052], -- Ort
-                    [c051] -- PLZ
+                    [c051], -- PLZ
+                    * -- Everything else
                     FROM [{pMandator.Database}].[dbo].[v050]
                     WHERE [c004] IN (2, 3) -- KontoTyp Debitor/Kreditor
-                    AND [c260] = '{pGLN}'
+                    AND [{pSearchField}] = '{pIdentifier}'
                     AND [mesocomp] = '{pMandator.Id}' and [mesoyear] = {oYear}"
                 Dim oTable As DataTable = Database.GetDatatable(oSQL)
 
                 ' GLN not found in this Mandator, continue to next one
                 If oTable.Rows.Count = 0 Then
-                    Logger.Debug("GLN [{0}] was not found in Mandator: [{1}]", pGLN, pMandator.Id)
+                    Logger.Debug("GLN [{0}] was not found in Mandator: [{1}]", pIdentifier, pMandator.Id)
                     Return Nothing
 
                 End If
 
                 ' Duplicate GLN, exit and do nothing about this number
                 If oTable.Rows.Count > 1 Then
-                    Logger.Warn("GLN [{0}] was found more than once in Mandator: [{1}]", pGLN, pMandator.Id)
+                    Logger.Warn("GLN [{0}] was found more than once in Mandator: [{1}]", pIdentifier, pMandator.Id)
                     Return Nothing
 
                 End If
@@ -252,6 +344,15 @@ Namespace Winline
                 Dim oZipCode As String = ItemEx(oRow, V50_ZIPCODE, String.Empty)
                 Dim oCityName As String = ItemEx(oRow, V50_CITYNAME, String.Empty)
 
+
+                If pAlternativeField <> String.Empty Then
+                    Dim oAlternativeValue = ItemEx(oRow, pAlternativeField, String.Empty)
+
+                    If oAlternativeValue <> String.Empty Then
+                        Return TryGetAccount(oAlternativeValue, pMandator, "c002")
+                    End If
+                End If
+
                 Return New Account With {
                     .Id = oAccountNumber,
                     .Name = oAccountName,
@@ -261,7 +362,7 @@ Namespace Winline
                     .Mandator = pMandator
                 }
             Catch ex As Exception
-                Logger.Warn("Error while trying to get account for GLN [{0}]", pGLN)
+                Logger.Warn("Error while trying to get account for GLN [{0}]", pIdentifier)
                 Logger.Error(ex)
                 Return Nothing
             End Try
@@ -298,8 +399,134 @@ Namespace Winline
             End Try
         End Function
 
+        Public Async Function TryGetArticlePriceAsync(pArticle As String, pAccountNumber As String, pQuantity As String, pDocumentDate As Date, pMandator As Mandator, pTemplate As Template) As Task(Of Double)
+            Return Await TryGetArticlePriceAsync(pArticle, pAccountNumber, pQuantity, pDocumentDate, pMandator, pTemplate, 0)
+        End Function
+
+        Public Async Function TryGetArticlePriceAsync(pArticle As String, pAccountNumber As String, pQuantity As String, pDocumentDate As Date, pMandator As Mandator, pTemplate As Template, pWaitingDays As Integer) As Task(Of Double)
+            Try
+                Dim oUserName = Environment.UserName
+                Dim oYear As Integer = Config.GetWinLineYear()
+                Dim oDebug = Convert.ToInt32(LogConfig.Debug)
+
+                ' TODO: pGroupPropertyID in config
+                ' TODO: pTempTableSuffix in config (nice to have)
+
+                Dim oDateFrom = pDocumentDate.AddDays(pWaitingDays * -1)
+                Dim oDateTo = pDocumentDate
+
+                Dim oSQL As String = $"
+                SET SHOWPLAN_ALL OFF; 
+                SET NOCOUNT ON; 
+                SET ARITHABORT ON; 
+                EXEC [{pMandator.Database}].[dbo].[PRCUST_GET_ACCOUNT_PRICE_CONDITION_VALUES] 
+                    @pAccountNr = '{pAccountNumber}',
+                    @pGroupNr = '*',
+                    @pProductNr = '{pArticle}',
+                    @pProductQuantity = '<={pQuantity}',
+                    @pProductPriceDateFrom = '{oDateFrom:dd.MM.yyyy}',
+                    @pProductPriceDateTo = '{oDateTo:dd.MM.yyyy}',
+                    @pmesocomp = '{pMandator.Id}',
+                    @pmesoyear = {oYear},
+                    @pGroupPropertyID = 1008,
+                    @pTempTableSuffix = 'MT_USER_{oUserName}',
+                    @pBatchID = NULL,
+                    @pPrintDebug = 0,
+                    @pLog2DB = {oDebug},
+                    @pComment = 'Multitool/{pTemplate.Name}',
+                    @pResultType = 'CalcPricing';
+                SET NOCOUNT OFF;
+                "
+
+                Dim oTable As DataTable
+                Using oConnection As SqlConnection = Database.GetConnection()
+                    oTable = Await Database.GetDatatableWithConnectionObjectAsync(oSQL, oConnection, MSSQLServer.TransactionMode.NoTransaction)
+                End Using
+
+                If oTable.Rows.Count = 0 Then
+                    Logger.Debug("Price for article [{0}] and Account [{1}] was not found in Mandator: [{2}]", pArticle, pAccountNumber, pMandator.Id)
+                    Return Nothing
+
+                End If
+
+                Dim oRow As DataRow = oTable.Rows.Item(0)
+                Dim oPrice As Double = oRow.Item("PRICE")
+                Dim oPackingUnit As PackingUnit = MaybeGetPackingUnit(pTemplate, oRow, pMandator)
+
+                If oPackingUnit IsNot Nothing AndAlso oPackingUnit.Factor > 0 Then
+                    oPrice *= oPackingUnit.Factor
+                End If
+
+                Return oPrice
+
+            Catch ex As Exception
+                Logger.Warn("Error while trying to get Price for Article [{0}] and Account [{1}]", pArticle, pAccountNumber)
+                Logger.Error(ex)
+                Return Nothing
+
+            End Try
+        End Function
+
+        Private Function MaybeGetPackingUnit(pTemplate As Template, oRow As DataRow, pMandator As Mandator) As PackingUnit
+            Dim oPackingUnit As PackingUnit = Nothing
+
+            Select Case pTemplate.DocTypeCategory
+                Case DocumentTypeCategory.Incoming
+                    Dim oPackingUnitPurchasingName = oRow.ItemEx("PACKINGUNIT_PURCHASING", "")
+                    Dim oPackingUnitPurchasing = PackingUnits.
+                        Where(Function(unit) unit.Name.Equals(oPackingUnitPurchasingName) And unit.Mandator.Equals(pMandator)).
+                        FirstOrDefault()
+
+                    oPackingUnit = oPackingUnitPurchasing
+
+                Case DocumentTypeCategory.Outgoing
+                    Dim oPackingUnitSalesName = oRow.ItemEx("PACKINGUNIT_SALES", "")
+                    Dim oPackingUnitSales = PackingUnits.
+                        Where(Function(unit) unit.Name.Equals(oPackingUnitSalesName) And unit.Mandator.Equals(pMandator)).
+                        FirstOrDefault()
+
+                    oPackingUnit = oPackingUnitSales
+            End Select
+
+            Return oPackingUnit
+        End Function
+
+        ''' <summary>
+        ''' This function is completely SCHAUM related.
+        ''' </summary>
+        Public Async Function TryGetWaitingDaysAsync(pDocumentKind As Integer, pMandator As Mandator) As Task(Of Integer)
+            Try
+                Dim oSql = $"
+                    SELECT [Karenztage].[u012] FROM [{pMandator.Database}].[dbo].[t670] As [Werksdefinition]
+                    INNER JOIN [{pMandator.Database}].[dbo].[t670] AS [Werkszuordnung] ON [Werksdefinition].[u007] = [Werkszuordnung].[u007]
+                    INNER JOIN [{pMandator.Database}].[dbo].[t670] AS [Karenztage] ON [Werksdefinition].[u000] = [Karenztage].[u032]
+                    WHERE [Werksdefinition].[u011] In ({pDocumentKind},{pDocumentKind}*10)
+                    AND [Werkszuordnung].[u006] = '%ConditionAccountNr%'
+                    AND [Karenztage].[u002] = 'Karenztage'
+                "
+                Dim oWaitingDays As Integer = Await Database.GetScalarValueAsync(oSql)
+
+                If IsNothing(oWaitingDays) Then
+                    oWaitingDays = 0
+                End If
+
+                Return oWaitingDays
+
+            Catch ex As Exception
+                Logger.Error(ex)
+                Return 0
+
+            End Try
+        End Function
+
         Public Function TryGetArticleNumber(pEAN As String, pMandator As Mandator) As String
             Try
+                If pEAN = String.Empty Then
+                    Logger.Warn("Could not get ArticleNumber, EAN is empty.")
+                    Return Nothing
+
+                End If
+
                 Dim oYear As Integer = Config.GetWinLineYear()
                 Dim oSQL As String = $"
                 SELECT 
@@ -308,11 +535,13 @@ Namespace Winline
                     [c075], -- EAN-Nummer 
                     [c123]  -- Ersatzartikelnummer
                     FROM [{pMandator.Database}].[dbo].[v021]
-                    WHERE [c075] = '{pEAN}'
+                    WHERE 
+                    [c075] = '{pEAN}'
+                    AND [c038] IS NULL -- Nur Aktive Artikel
                     AND [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {oYear}"
                 Dim oTable As DataTable = Database.GetDatatable(oSQL)
 
-                ' EAN not found in this Mandator, continue to next one
+                ' EAN not found in this Mandator
                 If oTable.Rows.Count = 0 Then
                     Logger.Debug("EAN [{0}] was not found in Mandator: [{1}]", pEAN, pMandator.Id)
                     Return Nothing
@@ -328,6 +557,8 @@ Namespace Winline
 
                 Dim oRow As DataRow = oTable.Rows.Item(0)
                 Dim oArticleNumber As String = ItemEx(oRow, V21_MAINARTICLENUMBER, String.Empty)
+                Logger.Info("Found ArticleNumber [{0}] in Column [{1}]", oArticleNumber, V21_MAINARTICLENUMBER)
+
                 Return oArticleNumber
 
             Catch ex As Exception
@@ -346,7 +577,7 @@ Namespace Winline
                     FROM [{pMandator.Database}].[dbo].[v021]
                     WHERE [c011] = '{pArticleNumber}'
                     AND [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {oYear}"
-                Dim oEAN As String = Database.GetScalarValue(oSQL)
+                Dim oEAN As String = ObjectEx.NotNull(Database.GetScalarValue(oSQL), Nothing)
 
                 ' EAN not found in this Mandator, continue to next one
                 If oEAN Is Nothing Then
@@ -411,6 +642,7 @@ Namespace Winline
                     [c123]  -- Ersatzartikelnummer
                     FROM [{pMandator.Database}].[dbo].[v021]
                     WHERE [c011] = '{pArticleNumber}'
+                    AND c038 IS NULL -- Nur Aktive Artikel
                     AND [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {oYear}"
                 Dim oTable As DataTable = Database.GetDatatable(oSQL)
 
@@ -444,7 +676,7 @@ Namespace Winline
 
         Public Function FindMatchingMandatorFromOrder(pData As Documents.Document) As Mandator
             Dim oPositions = pData.Rows.
-                Where(Function(r) r.Name.ToUpper.EndsWith("T026")).
+                Where(Function(r) r.TableName.ToUpper.EndsWith("T026")).
                 ToList()
             Dim oEANNumbers = oPositions.
                 Select(Function(p)
@@ -475,6 +707,7 @@ Namespace Winline
                         [c123]  -- Ersatzartikelnummer
                         FROM [{oMandator.Database}].[dbo].[v021]
                         WHERE [c075] = '{oEANNumber}'
+                        AND [c038] IS NULL
                         AND [mesocomp] = '{oMandator.Id}' AND [mesoyear] = {oYear}"
                     Dim oTable As DataTable = Database.GetDatatable(oSQL)
 
@@ -498,6 +731,8 @@ Namespace Winline
                         Where(Function(item) item.DestinationName = "MANDATOR" And item.DestinationValue = oMandator.Id And item.SourceName = "ARTICLE").
                         ToList()
 
+                    Logger.Debug("Processing [{0}] Mappings for Articlenumber [{1}]", oMappingConfigItems.Count, oArticleNumber)
+
                     ' If not match was found, continune to next mandator.
                     ' For a catch all mandator, a regex like ".+" is needed.
                     For Each oItem In oMappingConfigItems
@@ -522,72 +757,152 @@ Namespace Winline
             Return Nothing
         End Function
 
-        Public Function GetDocuments(pMandator As Mandator, pTemplate As Template, pDocumentType As DocumentType, pOptions As GetDocumentArgs) As List(Of Document)
+        Public Function GetDocuments(pMandator As Mandator, pTemplate As Template, pDocumentType As DocumentType, pOptions As GetDocumentArgs) As List(Of ExportDocument)
             Try
                 Dim oYear As Integer = Config.GetWinLineYear()
 
+                If pOptions.Year > 0 Then
+                    oYear = Config.GetWinLineYear(pOptions.Year)
+                End If
+
+                Dim oTypeConstraint, oTypeNumberColumn As String
+                Select Case pDocumentType
+                    Case DocumentType.OutgoingOffer
+                        oTypeConstraint = $"T.c137 = 2 AND c139 = 1 AND "
+                        oTypeNumberColumn = "T.c043"
+
+                    Case DocumentType.OutgoingOrder
+                        oTypeConstraint = $"T.c137 = 2 AND c139 = 2 AND "
+                        oTypeNumberColumn = "T.c044"
+
+                    Case DocumentType.OutgoingDeliveryNote
+                        oTypeConstraint = $"T.c137 = 2 AND (c139 = 3 OR c139 = -3) AND "
+                        oTypeNumberColumn = "T.c045"
+
+                    Case DocumentType.OutgoingInvoice
+                        oTypeConstraint = $"T.c137 = 2 AND c139 = 4 AND "
+                        oTypeNumberColumn = "T.c055"
+
+                    Case DocumentType.IncomingOffer
+                        oTypeConstraint = $"T.c137 = 3 AND c139 = 1 AND "
+                        oTypeNumberColumn = "T.c043"
+
+                    Case DocumentType.IncomingOrder
+                        oTypeConstraint = $"T.c137 = 3 AND c139 = 2 AND "
+                        oTypeNumberColumn = "T.c044"
+
+                    Case DocumentType.IncomingDeliveryNote
+                        oTypeConstraint = $"T.c137 = 3 AND c139 = 3 AND "
+                        oTypeNumberColumn = "T.c045"
+
+                    Case DocumentType.IncomingInvoice
+                        oTypeConstraint = $"T.c137 = 3 AND c139 = 4 AND "
+                        oTypeNumberColumn = "T.c055"
+
+                    Case Else
+                        oTypeConstraint = ""
+                        oTypeNumberColumn = ""
+                End Select
+
                 Dim oAccountConstraint = ""
                 If pOptions.Account IsNot Nothing Then
-                    oAccountConstraint = $"c021 = '{pOptions.Account.Id}' AND "
+                    oAccountConstraint = $"T.c021 = '{pOptions.Account.Id}' AND "
                 End If
 
                 Dim oKindConstraint = ""
-                If pOptions.Kind IsNot Nothing Then
-                    oKindConstraint = $"c035 = {pOptions.Kind.Id} AND "
+                If pOptions.Kinds IsNot Nothing AndAlso pOptions.Kinds.Count > 0 Then
+                    Dim oKindIdList = pOptions.Kinds.Select(Function(kind) kind.Id)
+                    Dim oKindIdString = String.Join(",", oKindIdList)
+
+                    oKindConstraint = $"T.c035 IN ({oKindIdString}) AND "
                 End If
 
-                Dim oDateConstraint = ""
-                If pOptions.DateFrom <> Date.MinValue And pOptions.DateTo <> Date.MinValue Then
-                    oDateConstraint = $""
+                Dim oDateFromConstraint = ""
+                If pOptions.DateFrom <> Date.MinValue Then
+                    oDateFromConstraint = $"T2.DATE >= CAST('{pOptions.DateFrom:yyyy-MM-dd}' as date) AND "
                 End If
 
-                Dim oExportedConstraint = "U010 = 0 AND"
+                Dim oDateToConstraint = ""
+                If pOptions.DateTo <> Date.MinValue Then
+                    oDateToConstraint = $"T2.DATE <= CAST('{pOptions.DateTo:yyyy-MM-dd}' as date) AND "
+                End If
+
+                Dim oDocNumberConstraint = ""
+                If pDocumentType <> DocumentType.Undefined Then
+                    If pOptions.DocNumberFrom <> String.Empty Then
+                        oDocNumberConstraint &= $"{oTypeNumberColumn} >= '{pOptions.DocNumberFrom}' AND "
+                    End If
+                    If pOptions.DocNumberTo <> String.Empty Then
+                        oDocNumberConstraint &= $"{oTypeNumberColumn} <= '{pOptions.DocNumberTo}' AND "
+                    End If
+                Else
+                    oDocNumberConstraint &= $"
+                        (T.c043 >= '{pOptions.DocNumberFrom}' AND T.c043 <= '{pOptions.DocNumberTo}') OR
+                        (T.c044 >= '{pOptions.DocNumberFrom}' AND T.c044 <= '{pOptions.DocNumberTo}') OR
+                        (T.c045 >= '{pOptions.DocNumberFrom}' AND T.c045 <= '{pOptions.DocNumberTo}') OR
+                        (T.c055 >= '{pOptions.DocNumberFrom}' AND T.c055 <= '{pOptions.DocNumberTo}')
+                    "
+                End If
+
+                ' Build the constraint so that the default view will show all documents that do not have an exported
+                ' flag set to the current document type. 
+                ' Ex. Search for orders will not show exported flag = 2 by default
+                Dim oDocType As Integer = Math.Abs(Convert.ToInt32(pDocumentType))
+                Dim oExportedConstraint = $"(T.U010 IS NULL OR T.U010 <> {oDocType}) AND"
                 If pOptions.ShowExported Then
                     oExportedConstraint = ""
                 End If
 
-                Dim oDocumentType As Integer = pDocumentType
                 Dim oSql = $"
-                    SELECT 
-                    c139 DOCUMENT_TYPE,
-                    c035 DOCUMENT_KIND,
-
-                    c021 ACCOUNT_NUMBER, 
-                    c022 RUNNING_NUMBER,
-
-                    c043 OFFER_NUMBER,
-                    c027 OFFER_DATE,
-
-                    c044 ORDER_NUMBER,
-                    c028 ORDER_DATE,
-
-                    c045 DELIVERY_NUMBER,
-                    c029 DELIVERY_DATE,
-
-                    c055 INVOICE_NUMBER,
-                    c032 INVOICE_DATE,
-
-                    c100 GROSS_AMOUNT,
-                    c114 NET_AMOUNT,
-
-                    U010 ALREADY_EXPORTED,
-                    U011 EXPORTED_WHO,
-                    U012 EXPORTED_WHEN,
-                    U013 EXPORTED_FILE
-
-                    FROM [{pMandator.Database}].[dbo].[T025]
+                    SELECT
+                    T2.DATE,
+                    T.c139 DOCUMENT_TYPE,
+                    T.c035 DOCUMENT_KIND,
+                    T.c021 ACCOUNT_NUMBER, 
+                    T.c022 RUNNING_NUMBER,
+                    T.c043 OFFER_NUMBER,
+                    T.c027 OFFER_DATE,
+                    T.c044 ORDER_NUMBER,
+                    T.c028 ORDER_DATE,
+                    T.c045 DELIVERY_NUMBER,
+                    T.c029 DELIVERY_DATE,
+                    T.c055 INVOICE_NUMBER,
+                    T.c032 INVOICE_DATE,
+                    T.c100 GROSS_AMOUNT,
+                    T.c114 NET_AMOUNT,
+                    T.U010 ALREADY_EXPORTED,
+                    T.U011 EXPORTED_WHO,
+                    T.U012 EXPORTED_WHEN,
+                    T.U013 EXPORTED_FILE
+                    FROM [{pMandator.Database}].[dbo].[T025] T
+                    INNER JOIN (SELECT * FROM (
+	                    SELECT c021, c022, mesoyear, mesocomp, c027 [DATE] FROM [{pMandator.Database}].[dbo].[T025]
+	                    WHERE c139 = 1 OR c139 = -1
+	                    UNION
+	                    SELECT c021, c022, mesoyear, mesocomp, c028 [DATE] FROM [{pMandator.Database}].[dbo].[T025]
+	                    WHERE c139 = 2 OR c139 = -2
+	                    UNION
+	                    SELECT c021, c022, mesoyear, mesocomp, c029 [DATE] FROM [{pMandator.Database}].[dbo].[T025]
+	                    WHERE c139 = 3 OR c139 = -3
+	                    UNION
+	                    SELECT c021, c022, mesoyear, mesocomp, c032 [DATE] FROM [{pMandator.Database}].[dbo].[T025]
+	                    WHERE c139 = 4 OR c139 = -4
+                    ) QUERY) T2 ON T.c021 = T2.c021 AND T.c022 = T2.c022 AND T.mesoyear = T2.mesoyear AND T.mesocomp = T2.mesocomp           
                     WHERE 
-                    c139 = {oDocumentType} AND
+                    {oTypeConstraint}
                     {oAccountConstraint}
                     {oKindConstraint}
                     {oExportedConstraint}
-                    [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {oYear}"
+                    {oDocNumberConstraint}
+                    {oDateFromConstraint}
+                    {oDateToConstraint}
+                    T.[mesocomp] = '{pMandator.Id}' AND T.[mesoyear] = {oYear}"
                 Dim oTable As DataTable = Database.GetDatatable(oSql)
-                Dim oDocuments As New List(Of Document)
+                Dim oDocuments As New List(Of ExportDocument)
 
                 For Each oRow As DataRow In oTable.Rows
                     Try
-                        Dim oDocument = GetDocumentFromDataRow(oRow)
+                        Dim oDocument = GetDocumentFromDataRow(oRow, pDocumentType)
                         oDocument.Schema = pTemplate
                         oDocuments.Add(oDocument)
 
@@ -607,9 +922,72 @@ Namespace Winline
             End Try
         End Function
 
-        Public Async Function ExecuteFinalSQL(pDocument As Document, pTemplate As Template, pMandator As Mandator) As Task(Of Boolean)
+        Private ReadOnly RunningNumberVersionRegex As Regex = New Regex("~\d{1,3}$")
+        Private ReadOnly RunningNumberMaximumLength As Integer = 20
+
+        Public Async Function GetVersionedRunningNumberAsync(pDocument As Document, pMandator As Mandator, pAccountNumber As String, pRunningNumber As String) As Task(Of String)
             Try
-                Dim oSql As String = Patterns.ReplaceForExport(pTemplate, pDocument, pMandator, pTemplate.FinalSQL)
+                Dim oYear As Integer = Config.GetWinLineYear()
+                Dim oSql As String = $"
+                    SELECT COUNT(*) FROM [{pMandator.Database}].[dbo].[v250]
+                    WHERE 
+                    [c021] = '{pAccountNumber}' AND -- Account '
+                    [c022] = '{pRunningNumber}' AND -- Running Number '
+                    --[c035] = '4711' -- Belegart, needed?
+                    [c144] IS NULL AND -- Stornonummer Angebot
+                    [c145] IS NULL AND -- Stornonummer Auftrag
+                    [c146] IS NULL AND -- Stornonummer Lieferschein
+                    [c147] IS NULL AND -- Stornonummer Faktura
+                    [mesocomp] = '{pMandator.Id}' --AND [mesoyear] = {oYear}
+                "
+
+                Dim oExistingCount = Await Database.GetScalarValueAsync(oSql)
+
+                If oExistingCount = 0 Then
+                    Logger.Debug("Running number [{0}] does not exist yet. Returning.", pRunningNumber)
+                    Return pRunningNumber
+                Else
+                    Logger.Debug("Running number [{0}] already exists. Checking again.", pRunningNumber)
+                    Dim oVersionResult = FileEx.GetVersionedString(pRunningNumber)
+                    Dim oNewVersion = oVersionResult.Item2 + 1
+                    Dim oFinalLength As Integer = oVersionResult.Item1.Count + oNewVersion.ToString.Count + 1
+
+                    If oFinalLength > RunningNumberMaximumLength Then
+                        Logger.Warn("Running number is too long ({0} chars total) and cannot be versioned. Versioning needs at least 2 characters.", oFinalLength)
+                        pDocument.AddDocumentError(DocumentErrorType.AttributeValidationFailed, "Das Feld Laufnummer hat die zulässige Länge überschritten.")
+                        Return pRunningNumber
+                    End If
+
+                    Return Await GetVersionedRunningNumberAsync(pDocument, pMandator, pAccountNumber, $"{oVersionResult.Item1}~{oNewVersion}")
+                End If
+
+            Catch ex As MultiToolException
+                Logger.Error(ex)
+                Throw ex
+
+            Catch ex As Exception
+                Logger.Warn("Error while getting versioned running number for mandator [{0}] and running number [{1}]", pMandator, pRunningNumber)
+                Logger.Error(ex)
+                Return Nothing
+            End Try
+        End Function
+
+        Public Function VersionNumber(pNumber As String) As String
+            Dim oRunningNumberBase As String
+
+            If RunningNumberVersionRegex.IsMatch(pNumber) Then
+                Dim oSplitNumber = pNumber.Split("~")
+                oRunningNumberBase = oSplitNumber.First()
+                Dim oRunningNumberVersion As Integer = Integer.Parse(oSplitNumber.Last())
+                Return $"{oRunningNumberBase}~{oRunningNumberVersion + 1}"
+            Else
+                Return $"{pNumber}~2"
+            End If
+        End Function
+
+        Public Async Function ExecuteFinalSQLForExport(pDocument As ExportDocument, pTemplate As Template, pMandator As Mandator) As Task(Of Boolean)
+            Try
+                Dim oSql As String = Patterns.ReplaceForExport(pDocument, pMandator, pTemplate.FinalSQL)
                 Return Await Database.ExecuteNonQueryAsync(oSql)
 
             Catch ex As Exception
@@ -618,17 +996,30 @@ Namespace Winline
             End Try
         End Function
 
-        Private Function GetDocumentFromDataRow(pDataRow As DataRow) As Document
+        Public Async Function ExecuteFinalSQLForImport(pDocument As Document, pTemplate As Template, pReportFilename As String) As Task(Of Boolean)
+            Try
+                Dim oSql As String = Patterns.ReplaceForImportFinalSQL(pDocument, pReportFilename, pTemplate.FinalSQL)
+                Return Await Database.ExecuteNonQueryAsync(oSql)
+
+            Catch ex As Exception
+                Logger.Error(ex)
+                Return False
+            End Try
+        End Function
+
+        Private Function GetDocumentFromDataRow(pDataRow As DataRow, pDocumentType As DocumentType) As ExportDocument
             Dim oAccountNumber = pDataRow.Item("ACCOUNT_NUMBER")
             Dim oRunningNumber As String = pDataRow.Item("RUNNING_NUMBER")
             Dim oDocumentType As Integer = pDataRow.Item("DOCUMENT_TYPE")
             Dim oDocumentKind As Integer = pDataRow.Item("DOCUMENT_KIND")
             Dim oGrossAmount As Double = pDataRow.Item("GROSS_AMOUNT")
             Dim oNetAmount As Double = pDataRow.Item("NET_AMOUNT")
-            Dim oExported As Boolean = pDataRow.ItemEx("ALREADY_EXPORTED", False)
+
+            Dim oExportedType As Integer = pDataRow.ItemEx("ALREADY_EXPORTED", 0)
             Dim oExportedWho As String = pDataRow.ItemEx("EXPORTED_WHO", "")
             Dim oExportedWhen As Date = pDataRow.ItemEx(Of Date)("EXPORTED_WHEN", Nothing)
-            Dim oExportFile As String = pDataRow.ItemEx("EXPORTED_FILE", "")
+            Dim oExportedFile As String = pDataRow.ItemEx("EXPORTED_FILE", "")
+            Dim oIsExported As Boolean = GetIsExported(oExportedType, pDocumentType)
 
             Dim oDocumentNumber As String = Nothing
             Dim oDocumentDate As Date = Nothing
@@ -643,26 +1034,29 @@ Namespace Winline
                 FirstOrDefault()
 
             Select Case oDocumentType
-                Case 1
+                Case 1, -1
                     oDocumentNumber = pDataRow.Item("OFFER_NUMBER")
                     oDocumentDate = pDataRow.Item("OFFER_DATE")
                     oDocumentDateColumn = "c027"
-                Case 2
+
+                Case 2, -2
                     oDocumentNumber = pDataRow.Item("ORDER_NUMBER")
                     oDocumentDate = pDataRow.Item("ORDER_DATE")
                     oDocumentDateColumn = "c028"
-                Case 3
+
+                Case 3, -3
                     oDocumentNumber = pDataRow.Item("DELIVERY_NUMBER")
                     oDocumentDate = pDataRow.Item("DELIVERY_DATE")
                     oDocumentDateColumn = "c029"
-                Case 4
+
+                Case 4, -4
                     oDocumentNumber = pDataRow.Item("INVOICE_NUMBER")
                     oDocumentDate = pDataRow.Item("INVOICE_DATE")
                     oDocumentDateColumn = "c032"
 
             End Select
 
-            Dim oDocument As New Document With {
+            Dim oDocument As New ExportDocument With {
                 .Account = oAccount,
                 .RunningNumber = oRunningNumber,
                 .Number = oDocumentNumber,
@@ -671,15 +1065,31 @@ Namespace Winline
                 .Kind = oKind,
                 .GrossAmount = oGrossAmount,
                 .NetAmount = oNetAmount,
-                .IsExported = oExported,
                 .ExportedWhen = oExportedWhen,
                 .ExportedWho = oExportedWho,
-                .FilenameExport = oExportFile
+                .FilenameExport = oExportedFile,
+                .IsExported = oIsExported
             }
 
             Return oDocument
         End Function
 
+        Private Function GetIsExported(pExportedType As Integer, pDocumentType As DocumentType) As Boolean
+            Dim oIsExported = False
+
+            If pExportedType = 1 AndAlso (pDocumentType = DocumentType.IncomingOffer Or pDocumentType = DocumentType.OutgoingOffer) Then
+                oIsExported = True
+            ElseIf pExportedType = 2 AndAlso (pDocumentType = DocumentType.IncomingOrder Or pDocumentType = DocumentType.OutgoingOrder) Then
+                oIsExported = True
+            ElseIf pExportedType = 3 AndAlso (pDocumentType = DocumentType.IncomingDeliveryNote Or pDocumentType = DocumentType.OutgoingDeliveryNote) Then
+                oIsExported = True
+            ElseIf pExportedType = 4 AndAlso (pDocumentType = DocumentType.IncomingInvoice Or pDocumentType = DocumentType.OutgoingInvoice) Then
+                oIsExported = True
+            End If
+
+            Return oIsExported
+        End Function
+
         ''' <summary>
         ''' Turns a database info like "SQLCWLDATEN on SERVER\INSTANCE" into a Tuple of two strings
         ''' </summary>

MultiTool.Common/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="10.1.1" targetFramework="net461" />
-  <package id="NLog" version="4.7.10" targetFramework="net461" />
+  <package id="NLog" version="5.1.0" targetFramework="net461" />
 </packages>

MultiTool.Form/App.config

@@ -1,13 +1,62 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <configSections>
-    </configSections>
-    <connectionStrings>
-        <add name="MultiTool.Form.My.MySettings.DD_ECMConnectionString"
-            connectionString="Data Source=SDD-VMP04-SQL17\SCHAUM;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd"
-            providerName="System.Data.SqlClient" />
-    </connectionStrings>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
-    </startup>
-</configuration>
+  <configSections>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
+      <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+    </sectionGroup>
+  </configSections>
+  <applicationSettings>
+    <DevExpress.LookAndFeel.Design.AppSettings>
+      <setting name="DefaultAppSkin" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="DefaultPalette" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="TouchUI" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="CompactUI" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="TouchScaleFactor" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="DirectX" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="RegisterUserSkins" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="RegisterBonusSkins" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="FontBehavior" serializeAs="String">
+        <value>UseSegoeUI</value>
+      </setting>
+      <setting name="DefaultAppFont" serializeAs="String">
+        <value></value>
+      </setting>
+      <setting name="DPIAwarenessMode" serializeAs="String">
+        <value>PerMonitorV2</value>
+      </setting>
+      <setting name="CustomPaletteCollection" serializeAs="Xml">
+        <value/>
+      </setting>
+    </DevExpress.LookAndFeel.Design.AppSettings>
+  </applicationSettings>
+  <connectionStrings>
+    <add name="MultiTool.Form.My.MySettings.DD_ECMConnectionString" connectionString="Data Source=SDD-VMP04-SQL17\SCHAUM;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd" providerName="System.Data.SqlClient"/>
+  </connectionStrings>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

MultiTool.Form/ApplicationEvents.vb

@@ -0,0 +1,15 @@
+Imports Microsoft.VisualBasic.ApplicationServices
+
+Namespace My
+    ' Für MyApplication sind folgende Ereignisse verfügbar:
+    ' Startup: Wird beim Starten der Anwendung noch vor dem Erstellen des Startformulars ausgelöst.
+    ' Shutdown: Wird nach dem Schließen aller Anwendungsformulare ausgelöst.  Dieses Ereignis wird nicht ausgelöst, wenn die Anwendung mit einem Fehler beendet wird.
+    ' UnhandledException: Wird bei einem Ausnahmefehler ausgelöst.
+    ' StartupNextInstance: Wird beim Starten einer Einzelinstanzanwendung ausgelöst, wenn die Anwendung bereits aktiv ist. 
+    ' NetworkAvailabilityChanged: Wird beim Herstellen oder Trennen der Netzwerkverbindung ausgelöst.
+    Partial Friend Class MyApplication
+        Protected Overrides Function OnUnhandledException(e As UnhandledExceptionEventArgs) As Boolean
+            Return MyBase.OnUnhandledException(e)
+        End Function
+    End Class
+End Namespace

MultiTool.Form/CREATE_DATABASE.sql

@@ -1,8 +1,8 @@
 USE [DD_ECM]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [FK_TBEDI_XML_TYPES]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] DROP CONSTRAINT [FK_TBEDI_XML_TYPES]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [FK_TBEDI_XML_NODES]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] DROP CONSTRAINT [FK_TBEDI_XML_NODES]
 GO
 ALTER TABLE [dbo].[TBEDI_XML_TYPES] DROP CONSTRAINT [DF_TBEDI_XML_TYPES_ADDED_WHEN]
 GO
@@ -10,106 +10,106 @@ ALTER TABLE [dbo].[TBEDI_XML_TYPES] DROP CONSTRAINT [DF_TBEDI_XML_TYPES_ADDED_WH
 GO
 ALTER TABLE [dbo].[TBEDI_XML_TYPES] DROP CONSTRAINT [DF_TBEDI_XML_TYPES_ACTIVE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_TEMPLATES] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATES_ADDED_WHEN]
+ALTER TABLE [dbo].[TBMT_TEMPLATES] DROP CONSTRAINT [DF_TBMT_TEMPLATES_ADDED_WHEN]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_TEMPLATES] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATES_ADDED_WHO]
+ALTER TABLE [dbo].[TBMT_TEMPLATES] DROP CONSTRAINT [DF_TBMT_TEMPLATES_ADDED_WHO]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_TEMPLATES] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATES_ACTIVE]
+ALTER TABLE [dbo].[TBMT_TEMPLATES] DROP CONSTRAINT [DF_TBMT_TEMPLATES_ACTIVE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_TABLES] DROP CONSTRAINT [DF_TBEDI_XML_TABLES_ADDED_WHEN]
+ALTER TABLE [dbo].[TBMT_TABLES] DROP CONSTRAINT [DF_TBMT_TABLES_ADDED_WHEN]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_TABLES] DROP CONSTRAINT [DF_TBEDI_XML_TABLES_ADDED_WHO]
+ALTER TABLE [dbo].[TBMT_TABLES] DROP CONSTRAINT [DF_TBMT_TABLES_ADDED_WHO]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_TABLES] DROP CONSTRAINT [DF_TBEDI_XML_TABLES_ACTIVE]
+ALTER TABLE [dbo].[TBMT_TABLES] DROP CONSTRAINT [DF_TBMT_TABLES_ACTIVE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_TABLES] DROP CONSTRAINT [DF_TBEDI_XML_NODES_IS_HEAD]
+ALTER TABLE [dbo].[TBMT_TABLES] DROP CONSTRAINT [DF_TBEDI_XML_NODES_IS_HEAD]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MAPPING_ENTITY] DROP CONSTRAINT [DF_TBEDI_XML_MAPPING_ENTITY_ADDED_WHEN]
+ALTER TABLE [dbo].[TBMT_MAPPING_ENTITIES] DROP CONSTRAINT [DF_TBMT_MAPPING_ENTITIES_ADDED_WHEN]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MAPPING_ENTITY] DROP CONSTRAINT [DF_TBEDI_XML_MAPPING_ENTITY_ADDED_WHO]
+ALTER TABLE [dbo].[TBMT_MAPPING_ENTITIES] DROP CONSTRAINT [DF_TBMT_MAPPING_ENTITIES_ADDED_WHO]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MAPPING_ENTITY] DROP CONSTRAINT [DF_TBEDI_XML_MAPPING_ENTITY_ACTIVE]
+ALTER TABLE [dbo].[TBMT_MAPPING_ENTITIES] DROP CONSTRAINT [DF_TBMT_MAPPING_ENTITIES_ACTIVE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] DROP CONSTRAINT [DF_TBEDI_XML_MAPPING_CONFIG_ADDED_WHEN]
+ALTER TABLE [dbo].[TBMT_MAPPING_CONFIG] DROP CONSTRAINT [DF_TBMT_MAPPING_CONFIG_ADDED_WHEN]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] DROP CONSTRAINT [DF_TBEDI_XML_MAPPING_CONFIG_ADDED_WHO]
+ALTER TABLE [dbo].[TBMT_MAPPING_CONFIG] DROP CONSTRAINT [DF_TBMT_MAPPING_CONFIG_ADDED_WHO]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] DROP CONSTRAINT [DF_TBEDI_XML_MAPPING_CONFIG_ACTIVE]
+ALTER TABLE [dbo].[TBMT_MAPPING_CONFIG] DROP CONSTRAINT [DF_TBMT_MAPPING_CONFIG_ACTIVE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] DROP CONSTRAINT [DF_TBEDI_XML_VALUE_MAPPING_ORDER_KEY]
+ALTER TABLE [dbo].[TBMT_MAPPING_CONFIG] DROP CONSTRAINT [DF_TBEDI_XML_VALUE_MAPPING_ORDER_KEY]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MANDATORS] DROP CONSTRAINT [DF_TBEDI_XML_MANDATORS_ACTIVE]
+ALTER TABLE [dbo].[TBMT_MANDATORS] DROP CONSTRAINT [DF_TBMT_MANDATORS_ACTIVE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_ADDED_WHEN]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBMT_TEMPLATE_ITEMS_ADDED_WHEN]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_ADDED_WHO]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBMT_TEMPLATE_ITEMS_ADDED_WHO]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_ACTIVE]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBMT_TEMPLATE_ITEMS_ACTIVE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_VIRTUAL]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBMT_TEMPLATE_ITEMS_IS_VIRTUAL]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_REQUIRED]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBMT_TEMPLATE_ITEMS_IS_REQUIRED]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_VISIBLE]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBMT_TEMPLATE_ITEMS_IS_VISIBLE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_READ_ONLY]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBMT_TEMPLATE_ITEMS_IS_READ_ONLY]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_ORDER_KEY]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBMT_TEMPLATE_ITEMS_ORDER_KEY]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_FUNCTIONS] DROP CONSTRAINT [DF_TBEDI_XML_FUNCTIONS_ADDED_WHEN]
+ALTER TABLE [dbo].[TBMT_FUNCTIONS] DROP CONSTRAINT [DF_TBMT_FUNCTIONS_ADDED_WHEN]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_FUNCTIONS] DROP CONSTRAINT [DF_TBEDI_XML_FUNCTIONS_ADDED_WHO]
+ALTER TABLE [dbo].[TBMT_FUNCTIONS] DROP CONSTRAINT [DF_TBMT_FUNCTIONS_ADDED_WHO]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_FUNCTIONS] DROP CONSTRAINT [DF_TBEDI_XML_FUNCTIONS_ACTIVE]
+ALTER TABLE [dbo].[TBMT_FUNCTIONS] DROP CONSTRAINT [DF_TBMT_FUNCTIONS_ACTIVE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_CONFIG] DROP CONSTRAINT [DF_TBEDI_XML_CONFIG_ADDED_WHEN]
+ALTER TABLE [dbo].[TBMT_CONFIG] DROP CONSTRAINT [DF_TBMT_CONFIG_ADDED_WHEN]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_CONFIG] DROP CONSTRAINT [DF_TBEDI_XML_CONFIG_ADDED_WHO]
+ALTER TABLE [dbo].[TBMT_CONFIG] DROP CONSTRAINT [DF_TBMT_CONFIG_ADDED_WHO]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_CONFIG] DROP CONSTRAINT [DF_TBEDI_XML_CONFIG_ACTIVE]
+ALTER TABLE [dbo].[TBMT_CONFIG] DROP CONSTRAINT [DF_TBMT_CONFIG_ACTIVE]
 GO
 /****** Object:  Table [dbo].[TBEDI_XML_TYPES]    Script Date: 26.11.2021 16:07:58 ******/
 IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_TYPES]') AND type in (N'U'))
 DROP TABLE [dbo].[TBEDI_XML_TYPES]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_TEMPLATES]    Script Date: 26.11.2021 16:07:58 ******/
-IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_TEMPLATES]') AND type in (N'U'))
-DROP TABLE [dbo].[TBEDI_XML_TEMPLATES]
+/****** Object:  Table [dbo].[TBMT_TEMPLATES]    Script Date: 26.11.2021 16:07:58 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBMT_TEMPLATES]') AND type in (N'U'))
+DROP TABLE [dbo].[TBMT_TEMPLATES]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_TABLES]    Script Date: 26.11.2021 16:07:58 ******/
-IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_TABLES]') AND type in (N'U'))
-DROP TABLE [dbo].[TBEDI_XML_TABLES]
+/****** Object:  Table [dbo].[TBMT_TABLES]    Script Date: 26.11.2021 16:07:58 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBMT_TABLES]') AND type in (N'U'))
+DROP TABLE [dbo].[TBMT_TABLES]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_MAPPING_ENTITY]    Script Date: 26.11.2021 16:07:58 ******/
-IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_MAPPING_ENTITY]') AND type in (N'U'))
-DROP TABLE [dbo].[TBEDI_XML_MAPPING_ENTITY]
+/****** Object:  Table [dbo].[TBMT_MAPPING_ENTITIES]    Script Date: 26.11.2021 16:07:58 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBMT_MAPPING_ENTITIES]') AND type in (N'U'))
+DROP TABLE [dbo].[TBMT_MAPPING_ENTITIES]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_MAPPING_CONFIG]    Script Date: 26.11.2021 16:07:58 ******/
-IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_MAPPING_CONFIG]') AND type in (N'U'))
-DROP TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG]
+/****** Object:  Table [dbo].[TBMT_MAPPING_CONFIG]    Script Date: 26.11.2021 16:07:58 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBMT_MAPPING_CONFIG]') AND type in (N'U'))
+DROP TABLE [dbo].[TBMT_MAPPING_CONFIG]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_MANDATORS]    Script Date: 26.11.2021 16:07:58 ******/
-IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_MANDATORS]') AND type in (N'U'))
-DROP TABLE [dbo].[TBEDI_XML_MANDATORS]
+/****** Object:  Table [dbo].[TBMT_MANDATORS]    Script Date: 26.11.2021 16:07:58 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBMT_MANDATORS]') AND type in (N'U'))
+DROP TABLE [dbo].[TBMT_MANDATORS]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_ITEMS]    Script Date: 26.11.2021 16:07:58 ******/
-IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_ITEMS]') AND type in (N'U'))
-DROP TABLE [dbo].[TBEDI_XML_ITEMS]
+/****** Object:  Table [dbo].[TBMT_TEMPLATE_ITEMS]    Script Date: 26.11.2021 16:07:58 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBMT_TEMPLATE_ITEMS]') AND type in (N'U'))
+DROP TABLE [dbo].[TBMT_TEMPLATE_ITEMS]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_FUNCTIONS]    Script Date: 26.11.2021 16:07:58 ******/
-IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_FUNCTIONS]') AND type in (N'U'))
-DROP TABLE [dbo].[TBEDI_XML_FUNCTIONS]
+/****** Object:  Table [dbo].[TBMT_FUNCTIONS]    Script Date: 26.11.2021 16:07:58 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBMT_FUNCTIONS]') AND type in (N'U'))
+DROP TABLE [dbo].[TBMT_FUNCTIONS]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_CONFIG]    Script Date: 26.11.2021 16:07:58 ******/
-IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_CONFIG]') AND type in (N'U'))
-DROP TABLE [dbo].[TBEDI_XML_CONFIG]
+/****** Object:  Table [dbo].[TBMT_CONFIG]    Script Date: 26.11.2021 16:07:58 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBMT_CONFIG]') AND type in (N'U'))
+DROP TABLE [dbo].[TBMT_CONFIG]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_CONFIG]    Script Date: 26.11.2021 16:07:58 ******/
+/****** Object:  Table [dbo].[TBMT_CONFIG]    Script Date: 26.11.2021 16:07:58 ******/
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
 GO
-CREATE TABLE [dbo].[TBEDI_XML_CONFIG](
+CREATE TABLE [dbo].[TBMT_CONFIG](
 	[GUID] [int] IDENTITY(1,1) NOT NULL,
 	[KEY] [nvarchar](100) NOT NULL,
 	[VALUE] [nvarchar](500) NOT NULL,
@@ -119,18 +119,18 @@ CREATE TABLE [dbo].[TBEDI_XML_CONFIG](
 	[ADDED_WHEN] [datetime] NULL,
 	[CHANGED_WHO] [nvarchar](50) NULL,
 	[CHANGED_WHEN] [datetime] NULL,
- CONSTRAINT [PK_TBEDI_XML_CONFIG] PRIMARY KEY CLUSTERED 
+ CONSTRAINT [PK_TBMT_CONFIG] PRIMARY KEY CLUSTERED 
 (
 	[GUID] ASC
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 ) ON [PRIMARY]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_FUNCTIONS]    Script Date: 26.11.2021 16:07:58 ******/
+/****** Object:  Table [dbo].[TBMT_FUNCTIONS]    Script Date: 26.11.2021 16:07:58 ******/
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
 GO
-CREATE TABLE [dbo].[TBEDI_XML_FUNCTIONS](
+CREATE TABLE [dbo].[TBMT_FUNCTIONS](
 	[GUID] [int] IDENTITY(1,1) NOT NULL,
 	[NAME] [nvarchar](max) NOT NULL,
 	[DESCRIPTION] [nvarchar](max) NOT NULL,
@@ -147,12 +147,12 @@ CREATE TABLE [dbo].[TBEDI_XML_FUNCTIONS](
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_ITEMS]    Script Date: 26.11.2021 16:07:58 ******/
+/****** Object:  Table [dbo].[TBMT_TEMPLATE_ITEMS]    Script Date: 26.11.2021 16:07:58 ******/
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
 GO
-CREATE TABLE [dbo].[TBEDI_XML_ITEMS](
+CREATE TABLE [dbo].[TBMT_TEMPLATE_ITEMS](
 	[GUID] [int] IDENTITY(1,1) NOT NULL,
 	[ORDER_KEY] [int] NOT NULL,
 	[XML_NAME] [nvarchar](50) NOT NULL,
@@ -176,12 +176,12 @@ CREATE TABLE [dbo].[TBEDI_XML_ITEMS](
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_MANDATORS]    Script Date: 26.11.2021 16:07:58 ******/
+/****** Object:  Table [dbo].[TBMT_MANDATORS]    Script Date: 26.11.2021 16:07:58 ******/
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
 GO
-CREATE TABLE [dbo].[TBEDI_XML_MANDATORS](
+CREATE TABLE [dbo].[TBMT_MANDATORS](
 	[GUID] [int] IDENTITY(1,1) NOT NULL,
 	[NAME] [nvarchar](50) NULL,
 	[ORDER_KEY] [int] NULL,
@@ -191,18 +191,18 @@ CREATE TABLE [dbo].[TBEDI_XML_MANDATORS](
 	[ADDED_WHEN] [datetime] NULL,
 	[CHANGED_WHO] [nvarchar](50) NULL,
 	[CHANGED_WHEN] [datetime] NULL,
- CONSTRAINT [PK_TBEDI_XML_MANDATORS] PRIMARY KEY CLUSTERED 
+ CONSTRAINT [PK_TBMT_MANDATORS] PRIMARY KEY CLUSTERED 
 (
 	[GUID] ASC
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 ) ON [PRIMARY]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_MAPPING_CONFIG]    Script Date: 26.11.2021 16:07:58 ******/
+/****** Object:  Table [dbo].[TBMT_MAPPING_CONFIG]    Script Date: 26.11.2021 16:07:58 ******/
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
 GO
-CREATE TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG](
+CREATE TABLE [dbo].[TBMT_MAPPING_CONFIG](
 	[GUID] [int] IDENTITY(1,1) NOT NULL,
 	[ORDER_KEY] [int] NOT NULL,
 	[SOURCE_ENTITY_ID] [int] NOT NULL,
@@ -215,18 +215,18 @@ CREATE TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG](
 	[ADDED_WHEN] [datetime] NULL,
 	[CHANGED_WHO] [nvarchar](50) NULL,
 	[CHANGED_WHEN] [nchar](10) NULL,
- CONSTRAINT [PK_TBEDI_XML_MAPPING_CONFIG] PRIMARY KEY CLUSTERED 
+ CONSTRAINT [PK_TBMT_MAPPING_CONFIG] PRIMARY KEY CLUSTERED 
 (
 	[GUID] ASC
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 ) ON [PRIMARY]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_MAPPING_ENTITY]    Script Date: 26.11.2021 16:07:58 ******/
+/****** Object:  Table [dbo].[TBMT_MAPPING_ENTITIES]    Script Date: 26.11.2021 16:07:58 ******/
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
 GO
-CREATE TABLE [dbo].[TBEDI_XML_MAPPING_ENTITY](
+CREATE TABLE [dbo].[TBMT_MAPPING_ENTITIES](
 	[GUID] [int] IDENTITY(1,1) NOT NULL,
 	[NAME] [nvarchar](100) NULL,
 	[ITEM_ID] [int] NULL,
@@ -236,18 +236,18 @@ CREATE TABLE [dbo].[TBEDI_XML_MAPPING_ENTITY](
 	[ADDED_WHEN] [datetime] NULL,
 	[CHANGED_WHO] [nvarchar](50) NULL,
 	[CHANGED_WHEN] [datetime] NULL,
- CONSTRAINT [PK_TBEDI_XML_MAPPING_ENTITY] PRIMARY KEY CLUSTERED 
+ CONSTRAINT [PK_TBMT_MAPPING_ENTITIES] PRIMARY KEY CLUSTERED 
 (
 	[GUID] ASC
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 ) ON [PRIMARY]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_TABLES]    Script Date: 26.11.2021 16:07:58 ******/
+/****** Object:  Table [dbo].[TBMT_TABLES]    Script Date: 26.11.2021 16:07:58 ******/
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
 GO
-CREATE TABLE [dbo].[TBEDI_XML_TABLES](
+CREATE TABLE [dbo].[TBMT_TABLES](
 	[GUID] [int] IDENTITY(1,1) NOT NULL,
 	[NAME] [nvarchar](max) NOT NULL,
 	[TEMPLATE_ID] [int] NOT NULL,
@@ -264,12 +264,12 @@ CREATE TABLE [dbo].[TBEDI_XML_TABLES](
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_TEMPLATES]    Script Date: 26.11.2021 16:07:58 ******/
+/****** Object:  Table [dbo].[TBMT_TEMPLATES]    Script Date: 26.11.2021 16:07:58 ******/
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
 GO
-CREATE TABLE [dbo].[TBEDI_XML_TEMPLATES](
+CREATE TABLE [dbo].[TBMT_TEMPLATES](
 	[GUID] [int] IDENTITY(1,1) NOT NULL,
 	[NAME] [nvarchar](20) NOT NULL,
 	[DESCRIPTION] [nvarchar](max) NULL,
@@ -307,189 +307,189 @@ CREATE TABLE [dbo].[TBEDI_XML_TYPES](
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 ) ON [PRIMARY]
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_CONFIG] ON 
+SET IDENTITY_INSERT [dbo].[TBMT_CONFIG] ON 
 GO
-INSERT [dbo].[TBEDI_XML_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, N'YEAR_OVERRIDE', N'2020', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:33:12.413' AS DateTime), NULL, NULL)
+INSERT [dbo].[TBMT_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, N'YEAR_OVERRIDE', N'2020', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:33:12.413' AS DateTime), NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, N'WEBSERVICE_BASEURL', N'http://sDD-VMP05-VM01:8181', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:34:07.760' AS DateTime), NULL, NULL)
+INSERT [dbo].[TBMT_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, N'WEBSERVICE_BASEURL', N'http://sDD-VMP05-VM01:8181', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:34:07.760' AS DateTime), NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (4, N'WEBSERVICE_USERNAME', N'DigitalData', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:34:22.930' AS DateTime), NULL, NULL)
+INSERT [dbo].[TBMT_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (4, N'WEBSERVICE_USERNAME', N'DigitalData', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:34:22.930' AS DateTime), NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (5, N'WEBSERIVCE_PASSWORD', N'dd', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:34:45.617' AS DateTime), NULL, NULL)
+INSERT [dbo].[TBMT_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (5, N'WEBSERIVCE_PASSWORD', N'dd', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:34:45.617' AS DateTime), NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (6, N'WEBSERVICE_IMPORT_BASE_PATH', N'\\172.24.12.51\mesonic$\WinLine', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:35:09.290' AS DateTime), NULL, NULL)
+INSERT [dbo].[TBMT_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (6, N'WEBSERVICE_IMPORT_BASE_PATH', N'\\172.24.12.51\mesonic$\WinLine', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:35:09.290' AS DateTime), NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (8, N'WEBSERVICE_IMPORT_RELATIVE_PATH', N'', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:35:32.977' AS DateTime), NULL, NULL)
+INSERT [dbo].[TBMT_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (8, N'WEBSERVICE_IMPORT_RELATIVE_PATH', N'', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:35:32.977' AS DateTime), NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (10, N'INPUT_DIRECTORY', N'P:\Projekte DIGITAL DATA\Schaum\mesonic Projekt\Werks EDI Import\Input', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:37:16.697' AS DateTime), NULL, NULL)
+INSERT [dbo].[TBMT_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (10, N'INPUT_DIRECTORY', N'P:\Projekte DIGITAL DATA\Schaum\mesonic Projekt\Werks EDI Import\Input', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:37:16.697' AS DateTime), NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (11, N'OUTPUT_DIRECTORY', N'', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:37:22.447' AS DateTime), NULL, NULL)
+INSERT [dbo].[TBMT_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (11, N'OUTPUT_DIRECTORY', N'', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:37:22.447' AS DateTime), NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (12, N'TEMPLATE_DIRECTORY', N'P:\Projekte DIGITAL DATA\Schaum\mesonic Projekt\Werks EDI Import\Schemata', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:37:48.697' AS DateTime), NULL, NULL)
+INSERT [dbo].[TBMT_CONFIG] ([GUID], [KEY], [VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (12, N'TEMPLATE_DIRECTORY', N'P:\Projekte DIGITAL DATA\Schaum\mesonic Projekt\Werks EDI Import\Schemata', 1, NULL, N'DEFAULT', CAST(N'2021-11-22T10:37:48.697' AS DateTime), NULL, NULL)
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_CONFIG] OFF
+SET IDENTITY_INSERT [dbo].[TBMT_CONFIG] OFF
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_FUNCTIONS] ON 
+SET IDENTITY_INSERT [dbo].[TBMT_FUNCTIONS] ON 
 GO
-INSERT [dbo].[TBEDI_XML_FUNCTIONS] ([GUID], [NAME], [DESCRIPTION], [PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'GLN', N'Finds an WinLine Account Number by GLN', NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_FUNCTIONS] ([GUID], [NAME], [DESCRIPTION], [PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'GLN', N'Finds an WinLine Account Number by GLN', NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_FUNCTIONS] ([GUID], [NAME], [DESCRIPTION], [PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, N'EAN', N'Finds an WinLine Article Number by EAN', NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_FUNCTIONS] ([GUID], [NAME], [DESCRIPTION], [PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, N'EAN', N'Finds an WinLine Article Number by EAN', NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_FUNCTIONS] ([GUID], [NAME], [DESCRIPTION], [PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, N'SQL', N'Finds a Value by SQL Query', N'Query', 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_FUNCTIONS] ([GUID], [NAME], [DESCRIPTION], [PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, N'SQL', N'Finds a Value by SQL Query', N'Query', 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_FUNCTIONS] OFF
+SET IDENTITY_INSERT [dbo].[TBMT_FUNCTIONS] OFF
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_ITEMS] ON 
+SET IDENTITY_INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ON 
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, 0, N'BELEGKEY', 1, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, 0, N'BELEGKEY', 1, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, 0, N'Fakt_Kontonummer', 1, 1, 0, 1, 0, 0, 1, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, 0, N'Fakt_Kontonummer', 1, 1, 0, 1, 0, 0, 1, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, 0, N'Laufnummer', 1, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, 0, N'Laufnummer', 1, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (4, 0, N'Bestellt_von', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (4, 0, N'Bestellt_von', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (5, 0, N'Lief_Kontonummer', 1, 1, 0, 1, 0, 0, 1, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (5, 0, N'Lief_Kontonummer', 1, 1, 0, 1, 0, 0, 1, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (6, 0, N'Lief_Name', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (6, 0, N'Lief_Name', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (7, 0, N'Lief_Strasse', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (7, 0, N'Lief_Strasse', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (8, 0, N'Lief_PLZ', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (8, 0, N'Lief_PLZ', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (9, 0, N'Lief_Ort', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (9, 0, N'Lief_Ort', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (10, 0, N'Belegart', 1, 2, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, CAST(N'2021-11-23T13:26:49.413' AS DateTime))
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (10, 0, N'Belegart', 1, 2, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, CAST(N'2021-11-23T13:26:49.413' AS DateTime))
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (11, 0, N'Datum_Auftrag-Bestellung', 1, 3, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (11, 0, N'Datum_Auftrag-Bestellung', 1, 3, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (12, 0, N'Auftrags-Bestellnummer', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (12, 0, N'Auftrags-Bestellnummer', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (13, 0, N'Leistungsdatum', 1, 3, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (13, 0, N'Leistungsdatum', 1, 3, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (14, 0, N'Infotext', 1, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (14, 0, N'Infotext', 1, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (15, 0, N'BELEGKEY', 2, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (15, 0, N'BELEGKEY', 2, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (16, 1, N'Zeilennummer', 2, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (16, 1, N'Zeilennummer', 2, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (17, 0, N'Datentyp', 2, 2, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (17, 0, N'Datentyp', 2, 2, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (18, 2, N'Artikelnummer', 2, 1, 0, 1, 0, 0, 2, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (18, 2, N'Artikelnummer', 2, 1, 0, 1, 0, 0, 2, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (19, 3, N'Bezeichnung', 2, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (19, 3, N'Bezeichnung', 2, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (20, 0, N'Lieferantenartikelnummer', 2, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (20, 0, N'Lieferantenartikelnummer', 2, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (21, 0, N'Menge_bestellt', 2, 5, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (21, 0, N'Menge_bestellt', 2, 5, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (22, 0, N'Menge_geliefert', 2, 5, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (22, 0, N'Menge_geliefert', 2, 5, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (23, 0, N'Colli', 2, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (23, 0, N'Colli', 2, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (24, 0, N'Einzelpreis', 2, 5, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (24, 0, N'Einzelpreis', 2, 5, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (25, 0, N'Zeilenrabatt1', 2, 5, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (25, 0, N'Zeilenrabatt1', 2, 5, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (26, 0, N'Zeilenrabatt2', 2, 5, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (26, 0, N'Zeilenrabatt2', 2, 5, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (27, 0, N'Zeilenrabatt3', 2, 5, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (27, 0, N'Zeilenrabatt3', 2, 5, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (28, 0, N'Zeilenrabatt4', 2, 5, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (28, 0, N'Zeilenrabatt4', 2, 5, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (29, 0, N'Umsatzsteuerprozent_Zeile', 2, 2, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (29, 0, N'Umsatzsteuerprozent_Zeile', 2, 2, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (30, 0, N'EDI_Infotext', 2, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (30, 0, N'EDI_Infotext', 2, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (31, 0, N'Lagerstand', 2, 1, 0, 0, 0, 1, 3, N'SELECT (c008 - c009) FROM [CWLDATEN_SIVT].[dbo].[v021] WHERE c002 = ''{#FIELD#Artikelnummer}'' AND MESOCOMP = ''{#CONST#MESOCOMP}'' AND MESOYEAR = {#CONST#MESOYEAR}', 1, NULL, N'DEFAULT', CAST(N'2021-11-23T14:00:35.573' AS DateTime), NULL, CAST(N'2021-11-23T16:05:09.667' AS DateTime))
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (31, 0, N'Lagerstand', 2, 1, 0, 0, 0, 1, 3, N'SELECT (c008 - c009) FROM [CWLDATEN_SIVT].[dbo].[v021] WHERE c002 = ''{#FIELD#Artikelnummer}'' AND MESOCOMP = ''{#CONST#MESOCOMP}'' AND MESOYEAR = {#CONST#MESOYEAR}', 1, NULL, N'DEFAULT', CAST(N'2021-11-23T14:00:35.573' AS DateTime), NULL, CAST(N'2021-11-23T16:05:09.667' AS DateTime))
 GO
-INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (32, 0, N'EinheitProPalette', 2, 1, 0, 0, 0, 1, 3, N'SELECT TRY_CONVERT(float, ISNULL(c208, 0)) FROM [CWLDATEN_SIVT].[dbo].[v021] WHERE c002 = ''{#FIELD#Artikelnummer}'' AND MESOCOMP = ''{#CONST#MESOCOMP}'' AND MESOYEAR = {#CONST#MESOYEAR}', 1, NULL, N'DEFAULT', CAST(N'2021-11-23T15:41:26.263' AS DateTime), NULL, CAST(N'2021-11-23T15:42:23.123' AS DateTime))
+INSERT [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (32, 0, N'EinheitProPalette', 2, 1, 0, 0, 0, 1, 3, N'SELECT TRY_CONVERT(float, ISNULL(c208, 0)) FROM [CWLDATEN_SIVT].[dbo].[v021] WHERE c002 = ''{#FIELD#Artikelnummer}'' AND MESOCOMP = ''{#CONST#MESOCOMP}'' AND MESOYEAR = {#CONST#MESOYEAR}', 1, NULL, N'DEFAULT', CAST(N'2021-11-23T15:41:26.263' AS DateTime), NULL, CAST(N'2021-11-23T15:42:23.123' AS DateTime))
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_ITEMS] OFF
+SET IDENTITY_INSERT [dbo].[TBMT_TEMPLATE_ITEMS] OFF
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_MANDATORS] ON 
+SET IDENTITY_INSERT [dbo].[TBMT_MANDATORS] ON 
 GO
-INSERT [dbo].[TBEDI_XML_MANDATORS] ([GUID], [NAME], [ORDER_KEY], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'SHGT', 1, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_MANDATORS] ([GUID], [NAME], [ORDER_KEY], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'SHGT', 1, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_MANDATORS] ([GUID], [NAME], [ORDER_KEY], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, N'SIVT', 2, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_MANDATORS] ([GUID], [NAME], [ORDER_KEY], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, N'SIVT', 2, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_MANDATORS] OFF
+SET IDENTITY_INSERT [dbo].[TBMT_MANDATORS] OFF
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ON 
+SET IDENTITY_INSERT [dbo].[TBMT_MAPPING_CONFIG] ON 
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, 1, 2, N'^R[a-zA-Z0-9\-_\s]+$', 1, N'SHGT', 1, NULL, N'DigitalData', NULL, NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, 1, 2, N'^R[a-zA-Z0-9\-_\s]+$', 1, N'SHGT', 1, NULL, N'DigitalData', NULL, NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, 2, 2, N'^R[a-zA-Z0-9\-_\s]+$', 3, N'1', 1, NULL, N'DigitalData', NULL, NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, 2, 2, N'^R[a-zA-Z0-9\-_\s]+$', 3, N'1', 1, NULL, N'DigitalData', NULL, NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (5, 3, 2, N'^ABN-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', NULL, NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (5, 3, 2, N'^ABN-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', NULL, NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (6, 4, 2, N'^ABN-[a-zA-Z0-9\-_\s]+$', 3, N'100', 1, NULL, N'DigitalData', CAST(N'2021-11-23T13:30:15.197' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (6, 4, 2, N'^ABN-[a-zA-Z0-9\-_\s]+$', 3, N'100', 1, NULL, N'DigitalData', CAST(N'2021-11-23T13:30:15.197' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (7, 5, 2, N'^HAU-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:40:10.130' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (7, 5, 2, N'^HAU-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:40:10.130' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (8, 6, 2, N'^HAU-[a-zA-Z0-9\-_\s]+$', 3, N'101', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:40:23.803' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (8, 6, 2, N'^HAU-[a-zA-Z0-9\-_\s]+$', 3, N'101', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:40:23.803' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (11, 7, 2, N'^SCHI-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:41:22.587' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (11, 7, 2, N'^SCHI-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:41:22.587' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (12, 8, 2, N'^SCHI-[a-zA-Z0-9\-_\s]+$', 3, N'102', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:41:35.943' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (12, 8, 2, N'^SCHI-[a-zA-Z0-9\-_\s]+$', 3, N'102', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:41:35.943' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (13, 9, 2, N'^FSC-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:42:05.040' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (13, 9, 2, N'^FSC-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:42:05.040' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (15, 10, 2, N'^FSC-[a-zA-Z0-9\-_\s]+$', 3, N'103', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:42:18.227' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (15, 10, 2, N'^FSC-[a-zA-Z0-9\-_\s]+$', 3, N'103', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:42:18.227' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (16, 11, 2, N'^HEL-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:43:12.260' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (16, 11, 2, N'^HEL-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:43:12.260' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (17, 12, 2, N'^HEL-[a-zA-Z0-9\-_\s]+$', 3, N'104', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:43:21.867' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (17, 12, 2, N'^HEL-[a-zA-Z0-9\-_\s]+$', 3, N'104', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:43:21.867' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (19, 13, 2, N'^NIE-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:43:54.493' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (19, 13, 2, N'^NIE-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:43:54.493' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (20, 14, 2, N'^NIE-[a-zA-Z0-9\-_\s]+$', 3, N'106', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:44:07.993' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (20, 14, 2, N'^NIE-[a-zA-Z0-9\-_\s]+$', 3, N'106', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:44:07.993' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (21, 15, 2, N'^WAL-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:45:02.557' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (21, 15, 2, N'^WAL-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:45:02.557' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (22, 16, 2, N'^WAL-[a-zA-Z0-9\-_\s]+$', 3, N'107', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:45:14.463' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (22, 16, 2, N'^WAL-[a-zA-Z0-9\-_\s]+$', 3, N'107', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:45:14.463' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (23, 17, 2, N'^HKL-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:45:36.150' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (23, 17, 2, N'^HKL-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:45:36.150' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (24, 18, 2, N'^HKL-[a-zA-Z0-9\-_\s]+$', 3, N'108', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:45:46.430' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (24, 18, 2, N'^HKL-[a-zA-Z0-9\-_\s]+$', 3, N'108', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:45:46.430' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (25, 19, 2, N'^FIN-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:46:14.730' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (25, 19, 2, N'^FIN-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:46:14.730' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (26, 20, 2, N'^FIN-[a-zA-Z0-9\-_\s]+$', 3, N'109', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:46:25.650' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (26, 20, 2, N'^FIN-[a-zA-Z0-9\-_\s]+$', 3, N'109', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:46:25.650' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (27, 21, 2, N'^ETH-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:47:34.057' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (27, 21, 2, N'^ETH-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:47:34.057' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (28, 22, 2, N'^ETH-[a-zA-Z0-9\-_\s]+$', 3, N'110', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:47:46.963' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (28, 22, 2, N'^ETH-[a-zA-Z0-9\-_\s]+$', 3, N'110', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:47:46.963' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (29, 23, 2, N'^BRI-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:48:36.667' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (29, 23, 2, N'^BRI-[a-zA-Z0-9\-_\s]+$', 1, N'SIVT', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:48:36.667' AS DateTime), NULL, N'Nov 26 202')
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (30, 24, 2, N'^BRI-[a-zA-Z0-9\-_\s]+$', 3, N'111', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:49:00.463' AS DateTime), NULL, N'Nov 26 202')
+INSERT [dbo].[TBMT_MAPPING_CONFIG] ([GUID], [ORDER_KEY], [SOURCE_ENTITY_ID], [SOURCE_REGEX], [DESTINATION_ENTITY_ID], [DESTINATION_VALUE], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (30, 24, 2, N'^BRI-[a-zA-Z0-9\-_\s]+$', 3, N'111', 1, NULL, N'DigitalData', CAST(N'2021-11-26T13:49:00.463' AS DateTime), NULL, N'Nov 26 202')
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] OFF
+SET IDENTITY_INSERT [dbo].[TBMT_MAPPING_CONFIG] OFF
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_MAPPING_ENTITY] ON 
+SET IDENTITY_INSERT [dbo].[TBMT_MAPPING_ENTITIES] ON 
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_ENTITY] ([GUID], [NAME], [ITEM_ID], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'MANDATOR', NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_MAPPING_ENTITIES] ([GUID], [NAME], [ITEM_ID], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'MANDATOR', NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_ENTITY] ([GUID], [NAME], [ITEM_ID], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, N'ARTICLE', 18, 1, NULL, N'DEFAULT', NULL, NULL, CAST(N'2021-11-19T12:27:02.443' AS DateTime))
+INSERT [dbo].[TBMT_MAPPING_ENTITIES] ([GUID], [NAME], [ITEM_ID], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, N'ARTICLE', 18, 1, NULL, N'DEFAULT', NULL, NULL, CAST(N'2021-11-19T12:27:02.443' AS DateTime))
 GO
-INSERT [dbo].[TBEDI_XML_MAPPING_ENTITY] ([GUID], [NAME], [ITEM_ID], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, N'DOCUMENTTYPE', 10, 1, NULL, N'DEFAULT', NULL, NULL, CAST(N'2021-11-19T12:26:06.693' AS DateTime))
+INSERT [dbo].[TBMT_MAPPING_ENTITIES] ([GUID], [NAME], [ITEM_ID], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, N'DOCUMENTTYPE', 10, 1, NULL, N'DEFAULT', NULL, NULL, CAST(N'2021-11-19T12:26:06.693' AS DateTime))
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_MAPPING_ENTITY] OFF
+SET IDENTITY_INSERT [dbo].[TBMT_MAPPING_ENTITIES] OFF
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_TABLES] ON 
+SET IDENTITY_INSERT [dbo].[TBMT_TABLES] ON 
 GO
-INSERT [dbo].[TBEDI_XML_TABLES] ([GUID], [NAME], [TEMPLATE_ID], [IS_HEAD], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'EXIM-VRG_ordersT025', 1, 1, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TABLES] ([GUID], [NAME], [TEMPLATE_ID], [IS_HEAD], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'EXIM-VRG_ordersT025', 1, 1, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_TABLES] ([GUID], [NAME], [TEMPLATE_ID], [IS_HEAD], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, N'EXIM-VRG_ordersT026', 1, 0, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TABLES] ([GUID], [NAME], [TEMPLATE_ID], [IS_HEAD], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, N'EXIM-VRG_ordersT026', 1, 0, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_TABLES] OFF
+SET IDENTITY_INSERT [dbo].[TBMT_TABLES] OFF
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_TEMPLATES] ON 
+SET IDENTITY_INSERT [dbo].[TBMT_TEMPLATES] ON 
 GO
-INSERT [dbo].[TBEDI_XML_TEMPLATES] ([GUID], [NAME], [DESCRIPTION], [FILE_NAME], [IS_IMPORT], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'EXIM-VRG_orders', N'Schaum EDI Aufträge', N'MESOBelegeEXIM-VRG_orders.xsd', 1, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_TEMPLATES] ([GUID], [NAME], [DESCRIPTION], [FILE_NAME], [IS_IMPORT], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'EXIM-VRG_orders', N'Schaum EDI Aufträge', N'MESOBelegeEXIM-VRG_orders.xsd', 1, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_TEMPLATES] OFF
+SET IDENTITY_INSERT [dbo].[TBMT_TEMPLATES] OFF
 GO
 SET IDENTITY_INSERT [dbo].[TBEDI_XML_TYPES] ON 
 GO
@@ -509,63 +509,63 @@ INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME], [ACTIVE], [COMMENT], [ADDED_WHO]
 GO
 SET IDENTITY_INSERT [dbo].[TBEDI_XML_TYPES] OFF
 GO
-ALTER TABLE [dbo].[TBEDI_XML_CONFIG] ADD  CONSTRAINT [DF_TBEDI_XML_CONFIG_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
+ALTER TABLE [dbo].[TBMT_CONFIG] ADD  CONSTRAINT [DF_TBMT_CONFIG_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_CONFIG] ADD  CONSTRAINT [DF_TBEDI_XML_CONFIG_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
+ALTER TABLE [dbo].[TBMT_CONFIG] ADD  CONSTRAINT [DF_TBMT_CONFIG_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_CONFIG] ADD  CONSTRAINT [DF_TBEDI_XML_CONFIG_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
+ALTER TABLE [dbo].[TBMT_CONFIG] ADD  CONSTRAINT [DF_TBMT_CONFIG_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_FUNCTIONS] ADD  CONSTRAINT [DF_TBEDI_XML_FUNCTIONS_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
+ALTER TABLE [dbo].[TBMT_FUNCTIONS] ADD  CONSTRAINT [DF_TBMT_FUNCTIONS_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_FUNCTIONS] ADD  CONSTRAINT [DF_TBEDI_XML_FUNCTIONS_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
+ALTER TABLE [dbo].[TBMT_FUNCTIONS] ADD  CONSTRAINT [DF_TBMT_FUNCTIONS_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_FUNCTIONS] ADD  CONSTRAINT [DF_TBEDI_XML_FUNCTIONS_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
+ALTER TABLE [dbo].[TBMT_FUNCTIONS] ADD  CONSTRAINT [DF_TBMT_FUNCTIONS_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_ORDER_KEY]  DEFAULT ((0)) FOR [ORDER_KEY]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] ADD  CONSTRAINT [DF_TBMT_TEMPLATE_ITEMS_ORDER_KEY]  DEFAULT ((0)) FOR [ORDER_KEY]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_READ_ONLY]  DEFAULT ((0)) FOR [IS_READ_ONLY]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] ADD  CONSTRAINT [DF_TBMT_TEMPLATE_ITEMS_IS_READ_ONLY]  DEFAULT ((0)) FOR [IS_READ_ONLY]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_VISIBLE]  DEFAULT ((0)) FOR [IS_VISIBLE]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] ADD  CONSTRAINT [DF_TBMT_TEMPLATE_ITEMS_IS_VISIBLE]  DEFAULT ((0)) FOR [IS_VISIBLE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_REQUIRED]  DEFAULT ((0)) FOR [IS_REQUIRED]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] ADD  CONSTRAINT [DF_TBMT_TEMPLATE_ITEMS_IS_REQUIRED]  DEFAULT ((0)) FOR [IS_REQUIRED]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_VIRTUAL]  DEFAULT ((0)) FOR [IS_VIRTUAL]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] ADD  CONSTRAINT [DF_TBMT_TEMPLATE_ITEMS_IS_VIRTUAL]  DEFAULT ((0)) FOR [IS_VIRTUAL]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] ADD  CONSTRAINT [DF_TBMT_TEMPLATE_ITEMS_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] ADD  CONSTRAINT [DF_TBMT_TEMPLATE_ITEMS_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] ADD  CONSTRAINT [DF_TBMT_TEMPLATE_ITEMS_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MANDATORS] ADD  CONSTRAINT [DF_TBEDI_XML_MANDATORS_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
+ALTER TABLE [dbo].[TBMT_MANDATORS] ADD  CONSTRAINT [DF_TBMT_MANDATORS_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] ADD  CONSTRAINT [DF_TBEDI_XML_VALUE_MAPPING_ORDER_KEY]  DEFAULT ((0)) FOR [ORDER_KEY]
+ALTER TABLE [dbo].[TBMT_MAPPING_CONFIG] ADD  CONSTRAINT [DF_TBEDI_XML_VALUE_MAPPING_ORDER_KEY]  DEFAULT ((0)) FOR [ORDER_KEY]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] ADD  CONSTRAINT [DF_TBEDI_XML_MAPPING_CONFIG_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
+ALTER TABLE [dbo].[TBMT_MAPPING_CONFIG] ADD  CONSTRAINT [DF_TBMT_MAPPING_CONFIG_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] ADD  CONSTRAINT [DF_TBEDI_XML_MAPPING_CONFIG_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
+ALTER TABLE [dbo].[TBMT_MAPPING_CONFIG] ADD  CONSTRAINT [DF_TBMT_MAPPING_CONFIG_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] ADD  CONSTRAINT [DF_TBEDI_XML_MAPPING_CONFIG_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
+ALTER TABLE [dbo].[TBMT_MAPPING_CONFIG] ADD  CONSTRAINT [DF_TBMT_MAPPING_CONFIG_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MAPPING_ENTITY] ADD  CONSTRAINT [DF_TBEDI_XML_MAPPING_ENTITY_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
+ALTER TABLE [dbo].[TBMT_MAPPING_ENTITIES] ADD  CONSTRAINT [DF_TBMT_MAPPING_ENTITIES_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MAPPING_ENTITY] ADD  CONSTRAINT [DF_TBEDI_XML_MAPPING_ENTITY_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
+ALTER TABLE [dbo].[TBMT_MAPPING_ENTITIES] ADD  CONSTRAINT [DF_TBMT_MAPPING_ENTITIES_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MAPPING_ENTITY] ADD  CONSTRAINT [DF_TBEDI_XML_MAPPING_ENTITY_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
+ALTER TABLE [dbo].[TBMT_MAPPING_ENTITIES] ADD  CONSTRAINT [DF_TBMT_MAPPING_ENTITIES_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_TABLES] ADD  CONSTRAINT [DF_TBEDI_XML_NODES_IS_HEAD]  DEFAULT ((0)) FOR [IS_HEAD]
+ALTER TABLE [dbo].[TBMT_TABLES] ADD  CONSTRAINT [DF_TBEDI_XML_NODES_IS_HEAD]  DEFAULT ((0)) FOR [IS_HEAD]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_TABLES] ADD  CONSTRAINT [DF_TBEDI_XML_TABLES_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
+ALTER TABLE [dbo].[TBMT_TABLES] ADD  CONSTRAINT [DF_TBMT_TABLES_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_TABLES] ADD  CONSTRAINT [DF_TBEDI_XML_TABLES_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
+ALTER TABLE [dbo].[TBMT_TABLES] ADD  CONSTRAINT [DF_TBMT_TABLES_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_TABLES] ADD  CONSTRAINT [DF_TBEDI_XML_TABLES_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
+ALTER TABLE [dbo].[TBMT_TABLES] ADD  CONSTRAINT [DF_TBMT_TABLES_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_TEMPLATES] ADD  CONSTRAINT [DF_TBEDI_XML_TEMPLATES_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
+ALTER TABLE [dbo].[TBMT_TEMPLATES] ADD  CONSTRAINT [DF_TBMT_TEMPLATES_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_TEMPLATES] ADD  CONSTRAINT [DF_TBEDI_XML_TEMPLATES_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
+ALTER TABLE [dbo].[TBMT_TEMPLATES] ADD  CONSTRAINT [DF_TBMT_TEMPLATES_ADDED_WHO]  DEFAULT (N'DEFAULT') FOR [ADDED_WHO]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_TEMPLATES] ADD  CONSTRAINT [DF_TBEDI_XML_TEMPLATES_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
+ALTER TABLE [dbo].[TBMT_TEMPLATES] ADD  CONSTRAINT [DF_TBMT_TEMPLATES_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
 GO
 ALTER TABLE [dbo].[TBEDI_XML_TYPES] ADD  CONSTRAINT [DF_TBEDI_XML_TYPES_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
 GO
@@ -573,13 +573,13 @@ ALTER TABLE [dbo].[TBEDI_XML_TYPES] ADD  CONSTRAINT [DF_TBEDI_XML_TYPES_ADDED_WH
 GO
 ALTER TABLE [dbo].[TBEDI_XML_TYPES] ADD  CONSTRAINT [DF_TBEDI_XML_TYPES_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS]  WITH CHECK ADD  CONSTRAINT [FK_TBEDI_XML_NODES] FOREIGN KEY([XML_TABLE_ID])
-REFERENCES [dbo].[TBEDI_XML_ITEMS] ([GUID])
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS]  WITH CHECK ADD  CONSTRAINT [FK_TBEDI_XML_NODES] FOREIGN KEY([XML_TABLE_ID])
+REFERENCES [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID])
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] CHECK CONSTRAINT [FK_TBEDI_XML_NODES]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] CHECK CONSTRAINT [FK_TBEDI_XML_NODES]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS]  WITH CHECK ADD  CONSTRAINT [FK_TBEDI_XML_TYPES] FOREIGN KEY([XML_TYPE_ID])
-REFERENCES [dbo].[TBEDI_XML_ITEMS] ([GUID])
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS]  WITH CHECK ADD  CONSTRAINT [FK_TBEDI_XML_TYPES] FOREIGN KEY([XML_TYPE_ID])
+REFERENCES [dbo].[TBMT_TEMPLATE_ITEMS] ([GUID])
 GO
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS] CHECK CONSTRAINT [FK_TBEDI_XML_TYPES]
+ALTER TABLE [dbo].[TBMT_TEMPLATE_ITEMS] CHECK CONSTRAINT [FK_TBEDI_XML_TYPES]
 GO

MultiTool.Form/DS_DD_ECM.xsd

@@ -7,72 +7,80 @@
           <Connection AppSettingsObjectName="MySettings" AppSettingsPropertyName="DD_ECMConnectionString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="DD_ECMConnectionString (MySettings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.MultiTool.Form.My.MySettings.GlobalReference.Default.DD_ECMConnectionString" Provider="System.Data.SqlClient" />
         </Connections>
         <Tables>
-          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBEDI_XML_TEMPLATE_ITEMSTableAdapter" GeneratorDataComponentClassName="TBEDI_XML_TEMPLATE_ITEMSTableAdapter" Name="TBEDI_XML_TEMPLATE_ITEMS" UserDataComponentName="TBEDI_XML_TEMPLATE_ITEMSTableAdapter">
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBMT_TEMPLATE_ITEMSTableAdapter" GeneratorDataComponentClassName="TBMT_TEMPLATE_ITEMSTableAdapter" Name="TBMT_TEMPLATE_ITEMS" UserDataComponentName="TBMT_TEMPLATE_ITEMSTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBEDI_XML_ITEMS" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>DELETE FROM TBEDI_XML_ITEMS
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>DELETE FROM TBMT_TEMPLATE_ITEMS
 WHERE        (GUID = @Original_GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [TBEDI_XML_ITEMS] ([ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@ORDER_KEY, @XML_NAME, @XML_TABLE_ID, @XML_TYPE_ID, @IS_READ_ONLY, @IS_VISIBLE, @IS_REQUIRED, @IS_VIRTUAL, @FUNCTION_ID, @FUNCTION_PARAMETERS, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN);
-SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_VIRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBEDI_XML_ITEMS WHERE (GUID = SCOPE_IDENTITY())</CommandText>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>INSERT INTO TBMT_TEMPLATE_ITEMS
+                         (ORDER_KEY, NAME, TABLE_ID, TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_VIRTUAL, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN)
+VALUES        (@ORDER_KEY,@NAME,@TABLE_ID,@TYPE_ID,@IS_READ_ONLY,@IS_VISIBLE,@IS_REQUIRED,@IS_VIRTUAL,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN);    
+SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_VIRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBMT_TEMPLATE_ITEMS WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@ORDER_KEY" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ORDER_KEY" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@XML_NAME" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="XML_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@XML_TABLE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="XML_TABLE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@XML_TYPE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="XML_TYPE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@IS_READ_ONLY" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="IS_READ_ONLY" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@IS_VISIBLE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="IS_VISIBLE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@IS_REQUIRED" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="IS_REQUIRED" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@IS_VIRTUAL" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="IS_VIRTUAL" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@FUNCTION_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="FUNCTION_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@FUNCTION_PARAMETERS" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="FUNCTION_PARAMETERS" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ORDER_KEY" ColumnName="ORDER_KEY" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ORDER_KEY" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="ORDER_KEY" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="TABLE_ID" ColumnName="TABLE_ID" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@TABLE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="TABLE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="TYPE_ID" ColumnName="TYPE_ID" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@TYPE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="TYPE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="IS_READ_ONLY" ColumnName="IS_READ_ONLY" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_READ_ONLY" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_READ_ONLY" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="IS_VISIBLE" ColumnName="IS_VISIBLE" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_VISIBLE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_VISIBLE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="IS_REQUIRED" ColumnName="IS_REQUIRED" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_REQUIRED" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_REQUIRED" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="IS_VIRTUAL" ColumnName="IS_VIRTUAL" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_VIRTUAL" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_VIRTUAL" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT        TBEDI_XML_ITEMS.*
-FROM            TBEDI_XML_ITEMS</CommandText>
-                    <Parameters />
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>SELECT        TBMT_TEMPLATE_ITEMS.GUID, TBMT_TEMPLATE_ITEMS.ORDER_KEY, TBMT_TEMPLATE_ITEMS.NAME, TBMT_TEMPLATE_ITEMS.TABLE_ID, TBMT_TEMPLATE_ITEMS.TYPE_ID, TBMT_TEMPLATE_ITEMS.IS_READ_ONLY, 
+                         TBMT_TEMPLATE_ITEMS.IS_VISIBLE, TBMT_TEMPLATE_ITEMS.IS_REQUIRED, TBMT_TEMPLATE_ITEMS.IS_VIRTUAL, TBMT_TEMPLATE_ITEMS.ACTIVE, TBMT_TEMPLATE_ITEMS.COMMENT, 
+                         TBMT_TEMPLATE_ITEMS.ADDED_WHO, TBMT_TEMPLATE_ITEMS.ADDED_WHEN, TBMT_TEMPLATE_ITEMS.CHANGED_WHO, TBMT_TEMPLATE_ITEMS.CHANGED_WHEN, TBTEMPLATES.NAME AS TEMPLATE_NAME, 
+                         TBTABLES.NAME AS TABLE_NAME, TBMT_TEMPLATE_ITEMS.PREFER_EXTERNAL
+FROM            TBMT_TEMPLATE_ITEMS INNER JOIN
+                         TBMT_TABLES AS TBTABLES ON TBMT_TEMPLATE_ITEMS.TABLE_ID = TBTABLES.GUID INNER JOIN
+                         TBMT_TEMPLATES AS TBTEMPLATES ON TBTABLES.TEMPLATE_ID = TBTEMPLATES.GUID
+WHERE        (TBMT_TEMPLATE_ITEMS.TABLE_ID = @TABLE_ID)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="TABLE_ID" ColumnName="TABLE_ID" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@TABLE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="TABLE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>UPDATE       TBEDI_XML_ITEMS
-SET                ORDER_KEY = @ORDER_KEY, XML_NAME = @XML_NAME, XML_TABLE_ID = @XML_TABLE_ID, XML_TYPE_ID = @XML_TYPE_ID, IS_READ_ONLY = @IS_READ_ONLY, IS_VISIBLE = @IS_VISIBLE, 
-                         IS_REQUIRED = @IS_REQUIRED, IS_VIRTUAL = @IS_VIRTUAL, FUNCTION_ID = @FUNCTION_ID, FUNCTION_PARAMETERS = @FUNCTION_PARAMETERS, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, 
-                         CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN
-WHERE        (GUID = @Original_GUID); 
-SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_VIRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBEDI_XML_ITEMS WHERE (GUID = @GUID)</CommandText>
+                    <CommandText>UPDATE       TBMT_TEMPLATE_ITEMS
+SET                ORDER_KEY = @ORDER_KEY, NAME = @XML_NAME, TABLE_ID = @XML_TABLE_ID, TYPE_ID = @XML_TYPE_ID, IS_READ_ONLY = @IS_READ_ONLY, IS_VISIBLE = @IS_VISIBLE, IS_REQUIRED = @IS_REQUIRED, 
+                         IS_VIRTUAL = @IS_VIRTUAL, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN, PREFER_EXTERNAL = @PREFER_EXTERNAL, 
+                         ACTIVE = @ACTIVE
+WHERE        (GUID = @Original_GUID);      
+SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_VIRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBMT_TEMPLATE_ITEMS WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="ORDER_KEY" ColumnName="ORDER_KEY" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ORDER_KEY" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="ORDER_KEY" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="XML_NAME" ColumnName="XML_NAME" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@XML_NAME" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="XML_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="XML_TABLE_ID" ColumnName="XML_TABLE_ID" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@XML_TABLE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="XML_TABLE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="XML_TYPE_ID" ColumnName="XML_TYPE_ID" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@XML_TYPE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="XML_TYPE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="IS_READ_ONLY" ColumnName="IS_READ_ONLY" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_READ_ONLY" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_READ_ONLY" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="IS_VISIBLE" ColumnName="IS_VISIBLE" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_VISIBLE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_VISIBLE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="IS_REQUIRED" ColumnName="IS_REQUIRED" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_REQUIRED" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_REQUIRED" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="IS_VIRTUAL" ColumnName="IS_VIRTUAL" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_VIRTUAL" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_VIRTUAL" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="FUNCTION_ID" ColumnName="FUNCTION_ID" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@FUNCTION_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="FUNCTION_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="FUNCTION_PARAMETERS" ColumnName="FUNCTION_PARAMETERS" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@FUNCTION_PARAMETERS" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="FUNCTION_PARAMETERS" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBEDI_XML_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ORDER_KEY" ColumnName="ORDER_KEY" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ORDER_KEY" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="ORDER_KEY" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="XML_NAME" ColumnName="NAME" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@XML_NAME" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="XML_TABLE_ID" ColumnName="TABLE_ID" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@XML_TABLE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="TABLE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="XML_TYPE_ID" ColumnName="TYPE_ID" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@XML_TYPE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="TYPE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="IS_READ_ONLY" ColumnName="IS_READ_ONLY" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_READ_ONLY" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_READ_ONLY" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="IS_VISIBLE" ColumnName="IS_VISIBLE" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_VISIBLE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_VISIBLE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="IS_REQUIRED" ColumnName="IS_REQUIRED" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_REQUIRED" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_REQUIRED" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="IS_VIRTUAL" ColumnName="IS_VIRTUAL" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_VIRTUAL" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_VIRTUAL" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="PREFER_EXTERNAL" ColumnName="PREFER_EXTERNAL" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@PREFER_EXTERNAL" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="PREFER_EXTERNAL" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -80,20 +88,26 @@ SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VI
             </MainSource>
             <Mappings>
               <Mapping SourceColumn="GUID" DataSetColumn="GUID" />
-              <Mapping SourceColumn="XML_NAME" DataSetColumn="XML_NAME" />
-              <Mapping SourceColumn="XML_TYPE_ID" DataSetColumn="XML_TYPE_ID" />
+              <Mapping SourceColumn="XML_NAME" DataSetColumn="NAME" />
+              <Mapping SourceColumn="XML_TYPE_ID" DataSetColumn="TYPE_ID" />
               <Mapping SourceColumn="IS_READ_ONLY" DataSetColumn="IS_READ_ONLY" />
               <Mapping SourceColumn="IS_VISIBLE" DataSetColumn="IS_VISIBLE" />
               <Mapping SourceColumn="ORDER_KEY" DataSetColumn="ORDER_KEY" />
-              <Mapping SourceColumn="FUNCTION_ID" DataSetColumn="FUNCTION_ID" />
               <Mapping SourceColumn="IS_REQUIRED" DataSetColumn="IS_REQUIRED" />
-              <Mapping SourceColumn="XML_TABLE_ID" DataSetColumn="XML_TABLE_ID" />
+              <Mapping SourceColumn="XML_TABLE_ID" DataSetColumn="TABLE_ID" />
               <Mapping SourceColumn="IS_VIRTUAL" DataSetColumn="IS_VIRTUAL" />
-              <Mapping SourceColumn="FUNCTION_PARAMETERS" DataSetColumn="FUNCTION_PARAMETERS" />
               <Mapping SourceColumn="ADDED_WHO" DataSetColumn="ADDED_WHO" />
               <Mapping SourceColumn="ADDED_WHEN" DataSetColumn="ADDED_WHEN" />
               <Mapping SourceColumn="CHANGED_WHO" DataSetColumn="CHANGED_WHO" />
               <Mapping SourceColumn="CHANGED_WHEN" DataSetColumn="CHANGED_WHEN" />
+              <Mapping SourceColumn="ACTIVE" DataSetColumn="ACTIVE" />
+              <Mapping SourceColumn="COMMENT" DataSetColumn="COMMENT" />
+              <Mapping SourceColumn="TEMPLATE_NAME" DataSetColumn="TEMPLATE_NAME" />
+              <Mapping SourceColumn="TABLE_NAME" DataSetColumn="TABLE_NAME" />
+              <Mapping SourceColumn="PREFER_EXTERNAL" DataSetColumn="PREFER_EXTERNAL" />
+              <Mapping SourceColumn="NAME" DataSetColumn="NAME" />
+              <Mapping SourceColumn="TABLE_ID" DataSetColumn="TABLE_ID" />
+              <Mapping SourceColumn="TYPE_ID" DataSetColumn="TYPE_ID" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -144,12 +158,12 @@ SELECT GUID, NAME FROM TBEDI_XML_TYPES WHERE (GUID = @GUID)</CommandText>
             </Mappings>
             <Sources />
           </TableAdapter>
-          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBEDI_XML_TEMPLATESTableAdapter" GeneratorDataComponentClassName="TBEDI_XML_TEMPLATESTableAdapter" Name="TBEDI_XML_TEMPLATES" UserDataComponentName="TBEDI_XML_TEMPLATESTableAdapter">
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBMT_TEMPLATESTableAdapter" GeneratorDataComponentClassName="TBMT_TEMPLATESTableAdapter" Name="TBMT_TEMPLATES" UserDataComponentName="TBMT_TEMPLATESTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBEDI_XML_TEMPLATES" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBMT_TEMPLATES" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [dbo].[TBEDI_XML_TEMPLATES] WHERE (([GUID] = @Original_GUID) AND ([NAME] = @Original_NAME))</CommandText>
+                    <CommandText>DELETE FROM [dbo].[TBMT_TEMPLATES] WHERE (([GUID] = @Original_GUID) AND ([NAME] = @Original_NAME))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_NAME" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -158,8 +172,8 @@ SELECT GUID, NAME FROM TBEDI_XML_TYPES WHERE (GUID = @GUID)</CommandText>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [dbo].[TBEDI_XML_TEMPLATES] ([NAME], [DESCRIPTION]) VALUES (@NAME, @DESCRIPTION);
-SELECT GUID, NAME, DESCRIPTION FROM TBEDI_XML_TEMPLATES WHERE (GUID = SCOPE_IDENTITY())</CommandText>
+                    <CommandText>INSERT INTO [dbo].[TBMT_TEMPLATES] ([NAME], [DESCRIPTION]) VALUES (@NAME, @DESCRIPTION);
+SELECT GUID, NAME, DESCRIPTION FROM TBMT_TEMPLATES WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@DESCRIPTION" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DESCRIPTION" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -168,14 +182,14 @@ SELECT GUID, NAME, DESCRIPTION FROM TBEDI_XML_TEMPLATES WHERE (GUID = SCOPE_IDEN
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT GUID, NAME, DESCRIPTION FROM dbo.TBEDI_XML_TEMPLATES</CommandText>
+                    <CommandText>SELECT GUID, NAME, DESCRIPTION FROM dbo.TBMT_TEMPLATES</CommandText>
                     <Parameters />
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [dbo].[TBEDI_XML_TEMPLATES] SET [NAME] = @NAME, [DESCRIPTION] = @DESCRIPTION WHERE (([GUID] = @Original_GUID) AND ([NAME] = @Original_NAME));
-SELECT GUID, NAME, DESCRIPTION FROM TBEDI_XML_TEMPLATES WHERE (GUID = @GUID)</CommandText>
+                    <CommandText>UPDATE [dbo].[TBMT_TEMPLATES] SET [NAME] = @NAME, [DESCRIPTION] = @DESCRIPTION WHERE (([GUID] = @Original_GUID) AND ([NAME] = @Original_NAME));
+SELECT GUID, NAME, DESCRIPTION FROM TBMT_TEMPLATES WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@DESCRIPTION" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DESCRIPTION" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -249,12 +263,12 @@ SELECT GUID, NAME, TEMPLATE_ID, IS_HEAD FROM TBEDI_XML_NODES WHERE (GUID = @GUID
             </Mappings>
             <Sources />
           </TableAdapter>
-          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBEDI_XML_FUNCTIONSTableAdapter" GeneratorDataComponentClassName="TBEDI_XML_FUNCTIONSTableAdapter" Name="TBEDI_XML_FUNCTIONS" UserDataComponentName="TBEDI_XML_FUNCTIONSTableAdapter">
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBMT_FUNCTIONSTableAdapter" GeneratorDataComponentClassName="TBMT_FUNCTIONSTableAdapter" Name="TBMT_FUNCTIONS" UserDataComponentName="TBMT_FUNCTIONSTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBEDI_XML_FUNCTIONS" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBMT_FUNCTIONS" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [dbo].[TBEDI_XML_FUNCTIONS] WHERE (([GUID] = @Original_GUID))</CommandText>
+                    <CommandText>DELETE FROM [dbo].[TBMT_FUNCTIONS] WHERE (([GUID] = @Original_GUID))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
@@ -262,8 +276,8 @@ SELECT GUID, NAME, TEMPLATE_ID, IS_HEAD FROM TBEDI_XML_NODES WHERE (GUID = @GUID
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [dbo].[TBEDI_XML_FUNCTIONS] ([NAME], [DESCRIPTION], [PARAMETERS]) VALUES (@NAME, @DESCRIPTION, @PARAMETERS);
-SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM TBEDI_XML_FUNCTIONS WHERE (GUID = SCOPE_IDENTITY())</CommandText>
+                    <CommandText>INSERT INTO [dbo].[TBMT_FUNCTIONS] ([NAME], [DESCRIPTION], [PARAMETERS]) VALUES (@NAME, @DESCRIPTION, @PARAMETERS);
+SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM TBMT_FUNCTIONS WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@DESCRIPTION" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DESCRIPTION" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -273,14 +287,14 @@ SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM TBEDI_XML_FUNCTIONS WHERE (GUID
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM dbo.TBEDI_XML_FUNCTIONS</CommandText>
+                    <CommandText>SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM dbo.TBMT_FUNCTIONS</CommandText>
                     <Parameters />
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [dbo].[TBEDI_XML_FUNCTIONS] SET [NAME] = @NAME, [DESCRIPTION] = @DESCRIPTION, [PARAMETERS] = @PARAMETERS WHERE (([GUID] = @Original_GUID));
-SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM TBEDI_XML_FUNCTIONS WHERE (GUID = @GUID)</CommandText>
+                    <CommandText>UPDATE [dbo].[TBMT_FUNCTIONS] SET [NAME] = @NAME, [DESCRIPTION] = @DESCRIPTION, [PARAMETERS] = @PARAMETERS WHERE (([GUID] = @Original_GUID));
+SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM TBMT_FUNCTIONS WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@DESCRIPTION" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DESCRIPTION" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -300,51 +314,61 @@ SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM TBEDI_XML_FUNCTIONS WHERE (GUID
             </Mappings>
             <Sources />
           </TableAdapter>
-          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBEDI_XML_CONFIGTableAdapter" GeneratorDataComponentClassName="TBEDI_XML_CONFIGTableAdapter" Name="TBEDI_XML_CONFIG" UserDataComponentName="TBEDI_XML_CONFIGTableAdapter">
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBMT_CONFIGTableAdapter" GeneratorDataComponentClassName="TBMT_CONFIGTableAdapter" Name="TBMT_CONFIG" UserDataComponentName="TBMT_CONFIGTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBEDI_XML_CONFIG" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBMT_CONFIG" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>DELETE FROM TBEDI_XML_CONFIG
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>DELETE FROM TBMT_CONFIG
 WHERE        (GUID = @Original_GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBEDI_XML_CONFIG" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [TBEDI_XML_CONFIG] ([KEY], [VALUE], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@KEY, @VALUE, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN)</CommandText>
+                    <CommandText>INSERT INTO TBMT_CONFIG
+                         ([KEY], VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, TEMPLATE_ID, COMMENT)
+VALUES        (@KEY,@VALUE,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@ACTIVE,@TEMPLATE_ID,@COMMENT)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@KEY" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="KEY" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@VALUE" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="KEY" ColumnName="KEY" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@KEY" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="KEY" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="VALUE" ColumnName="VALUE" DataSourceName="" DataTypeServer="nvarchar(500)" DbType="String" Direction="Input" ParameterName="@VALUE" Precision="0" ProviderType="NVarChar" Scale="0" Size="500" SourceColumn="VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="TEMPLATE_ID" ColumnName="TEMPLATE_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@TEMPLATE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="TEMPLATE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT        GUID, [KEY], VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
-FROM            TBEDI_XML_CONFIG</CommandText>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>SELECT        GUID, [KEY], VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, TEMPLATE_ID, COMMENT
+FROM            TBMT_CONFIG
+WHERE        (TEMPLATE_ID IS NOT NULL)</CommandText>
                     <Parameters />
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>UPDATE       TBEDI_XML_CONFIG
-SET                [KEY] = @KEY, VALUE = @VALUE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>UPDATE       TBMT_CONFIG
+SET                [KEY] = @KEY, VALUE = @VALUE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN, ACTIVE = @ACTIVE, 
+                         TEMPLATE_ID = @TEMPLATE_ID, COMMENT = @COMMENT
 WHERE        (GUID = @Original_GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="KEY" ColumnName="KEY" DataSourceName="DD_ECM.dbo.TBEDI_XML_CONFIG" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@KEY" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="KEY" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="VALUE" ColumnName="VALUE" DataSourceName="DD_ECM.dbo.TBEDI_XML_CONFIG" DataTypeServer="nvarchar(500)" DbType="String" Direction="Input" ParameterName="@VALUE" Precision="0" ProviderType="NVarChar" Scale="0" Size="500" SourceColumn="VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBEDI_XML_CONFIG" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="DD_ECM.dbo.TBEDI_XML_CONFIG" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM.dbo.TBEDI_XML_CONFIG" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="DD_ECM.dbo.TBEDI_XML_CONFIG" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBEDI_XML_CONFIG" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="KEY" ColumnName="KEY" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@KEY" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="KEY" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="VALUE" ColumnName="VALUE" DataSourceName="" DataTypeServer="nvarchar(500)" DbType="String" Direction="Input" ParameterName="@VALUE" Precision="0" ProviderType="NVarChar" Scale="0" Size="500" SourceColumn="VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="TEMPLATE_ID" ColumnName="TEMPLATE_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@TEMPLATE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="TEMPLATE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -358,6 +382,114 @@ WHERE        (GUID = @Original_GUID)</CommandText>
               <Mapping SourceColumn="ADDED_WHEN" DataSetColumn="ADDED_WHEN" />
               <Mapping SourceColumn="CHANGED_WHO" DataSetColumn="CHANGED_WHO" />
               <Mapping SourceColumn="CHANGED_WHEN" DataSetColumn="CHANGED_WHEN" />
+              <Mapping SourceColumn="ACTIVE" DataSetColumn="ACTIVE" />
+              <Mapping SourceColumn="TEMPLATE_ID" DataSetColumn="TEMPLATE_ID" />
+              <Mapping SourceColumn="COMMENT" DataSetColumn="COMMENT" />
+            </Mappings>
+            <Sources>
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBMT_CONFIG" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillGeneral" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataGeneral" GeneratorSourceName="FillGeneral" GetMethodModifier="Public" GetMethodName="GetDataGeneral" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataGeneral" UserSourceName="FillGeneral">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        GUID, [KEY], VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, TEMPLATE_ID, COMMENT
+FROM            TBMT_CONFIG
+WHERE        (TEMPLATE_ID IS NULL)</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </Sources>
+          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBMT_TABLESTableAdapter" GeneratorDataComponentClassName="TBMT_TABLESTableAdapter" Name="TBMT_TABLES" UserDataComponentName="TBMT_TABLESTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBMT_TABLES" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+                <DeleteCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>DELETE FROM [TBMT_TABLES] WHERE (([GUID] = @Original_GUID) AND ([TEMPLATE_ID] = @Original_TEMPLATE_ID) AND ([IS_HEAD] = @Original_IS_HEAD) AND ([ACTIVE] = @Original_ACTIVE) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_TEMPLATE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="TEMPLATE_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_IS_HEAD" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="IS_HEAD" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_COMMENT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_COMMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ADDED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHO" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </DeleteCommand>
+                <InsertCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>INSERT INTO [TBMT_TABLES] ([NAME], [TEMPLATE_ID], [IS_HEAD], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@NAME, @TEMPLATE_ID, @IS_HEAD, @ACTIVE, @COMMENT, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN);
+SELECT GUID, NAME, TEMPLATE_ID, IS_HEAD, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBMT_TABLES WHERE (GUID = SCOPE_IDENTITY())</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@TEMPLATE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="TEMPLATE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@IS_HEAD" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="IS_HEAD" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </InsertCommand>
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT        TBMT_TABLES.*
+FROM            TBMT_TABLES</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+                <UpdateCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>UPDATE [TBMT_TABLES] SET [NAME] = @NAME, [TEMPLATE_ID] = @TEMPLATE_ID, [IS_HEAD] = @IS_HEAD, [ACTIVE] = @ACTIVE, [COMMENT] = @COMMENT, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ([TEMPLATE_ID] = @Original_TEMPLATE_ID) AND ([IS_HEAD] = @Original_IS_HEAD) AND ([ACTIVE] = @Original_ACTIVE) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
+SELECT GUID, NAME, TEMPLATE_ID, IS_HEAD, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBMT_TABLES WHERE (GUID = @GUID)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@TEMPLATE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="TEMPLATE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@IS_HEAD" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="IS_HEAD" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_TEMPLATE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="TEMPLATE_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_IS_HEAD" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="IS_HEAD" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_COMMENT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_COMMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ADDED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHO" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBMT_TABLES" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </UpdateCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="GUID" DataSetColumn="GUID" />
+              <Mapping SourceColumn="NAME" DataSetColumn="NAME" />
+              <Mapping SourceColumn="TEMPLATE_ID" DataSetColumn="TEMPLATE_ID" />
+              <Mapping SourceColumn="IS_HEAD" DataSetColumn="IS_HEAD" />
+              <Mapping SourceColumn="ACTIVE" DataSetColumn="ACTIVE" />
+              <Mapping SourceColumn="COMMENT" DataSetColumn="COMMENT" />
+              <Mapping SourceColumn="ADDED_WHO" DataSetColumn="ADDED_WHO" />
+              <Mapping SourceColumn="ADDED_WHEN" DataSetColumn="ADDED_WHEN" />
+              <Mapping SourceColumn="CHANGED_WHO" DataSetColumn="CHANGED_WHO" />
+              <Mapping SourceColumn="CHANGED_WHEN" DataSetColumn="CHANGED_WHEN" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -366,200 +498,269 @@ WHERE        (GUID = @Original_GUID)</CommandText>
       </DataSource>
     </xs:appinfo>
   </xs:annotation>
-  <xs:element name="DS_DD_ECM" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_DD_ECM" msprop:Generator_UserDSName="DS_DD_ECM">
+  <xs:element name="DS_DD_ECM" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_UserDSName="DS_DD_ECM" msprop:Generator_DataSetName="DS_DD_ECM">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBEDI_XML_TEMPLATE_ITEMS" msprop:Generator_TableClassName="TBEDI_XML_TEMPLATE_ITEMSDataTable" msprop:Generator_TableVarName="tableTBEDI_XML_TEMPLATE_ITEMS" msprop:Generator_RowChangedName="TBEDI_XML_TEMPLATE_ITEMSRowChanged" msprop:Generator_TablePropName="TBEDI_XML_TEMPLATE_ITEMS" msprop:Generator_RowDeletingName="TBEDI_XML_TEMPLATE_ITEMSRowDeleting" msprop:Generator_RowChangingName="TBEDI_XML_TEMPLATE_ITEMSRowChanging" msprop:Generator_RowEvHandlerName="TBEDI_XML_TEMPLATE_ITEMSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEDI_XML_TEMPLATE_ITEMSRowDeleted" msprop:Generator_RowClassName="TBEDI_XML_TEMPLATE_ITEMSRow" msprop:Generator_UserTableName="TBEDI_XML_TEMPLATE_ITEMS" msprop:Generator_RowEvArgName="TBEDI_XML_TEMPLATE_ITEMSRowChangeEvent">
+        <xs:element name="TBMT_TEMPLATE_ITEMS" msprop:Generator_RowEvHandlerName="TBMT_TEMPLATE_ITEMSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_TEMPLATE_ITEMSRowDeleted" msprop:Generator_RowDeletingName="TBMT_TEMPLATE_ITEMSRowDeleting" msprop:Generator_RowEvArgName="TBMT_TEMPLATE_ITEMSRowChangeEvent" msprop:Generator_TablePropName="TBMT_TEMPLATE_ITEMS" msprop:Generator_RowChangedName="TBMT_TEMPLATE_ITEMSRowChanged" msprop:Generator_RowChangingName="TBMT_TEMPLATE_ITEMSRowChanging" msprop:Generator_TableClassName="TBMT_TEMPLATE_ITEMSDataTable" msprop:Generator_RowClassName="TBMT_TEMPLATE_ITEMSRow" msprop:Generator_TableVarName="tableTBMT_TEMPLATE_ITEMS" msprop:Generator_UserTableName="TBMT_TEMPLATE_ITEMS">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
-              <xs:element name="XML_NAME" msprop:Generator_ColumnVarNameInTable="columnXML_NAME" msprop:Generator_ColumnPropNameInRow="XML_NAME" msprop:Generator_ColumnPropNameInTable="XML_NAMEColumn" msprop:Generator_UserColumnName="XML_NAME">
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="NAME" msprop:Generator_ColumnPropNameInRow="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_ColumnVarNameInTable="columnNAME" msprop:Generator_UserColumnName="NAME">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="XML_TYPE_ID" msprop:Generator_ColumnVarNameInTable="columnXML_TYPE_ID" msprop:Generator_ColumnPropNameInRow="XML_TYPE_ID" msprop:Generator_ColumnPropNameInTable="XML_TYPE_IDColumn" msprop:Generator_UserColumnName="XML_TYPE_ID" type="xs:int" />
-              <xs:element name="IS_READ_ONLY" msprop:Generator_ColumnVarNameInTable="columnIS_READ_ONLY" msprop:Generator_ColumnPropNameInRow="IS_READ_ONLY" msprop:Generator_ColumnPropNameInTable="IS_READ_ONLYColumn" msprop:Generator_UserColumnName="IS_READ_ONLY" type="xs:boolean" />
-              <xs:element name="IS_VISIBLE" msprop:Generator_ColumnVarNameInTable="columnIS_VISIBLE" msprop:Generator_ColumnPropNameInRow="IS_VISIBLE" msprop:Generator_ColumnPropNameInTable="IS_VISIBLEColumn" msprop:Generator_UserColumnName="IS_VISIBLE" type="xs:boolean" />
-              <xs:element name="ORDER_KEY" msprop:Generator_ColumnVarNameInTable="columnORDER_KEY" msprop:Generator_ColumnPropNameInRow="ORDER_KEY" msprop:Generator_ColumnPropNameInTable="ORDER_KEYColumn" msprop:Generator_UserColumnName="ORDER_KEY" type="xs:int" />
-              <xs:element name="FUNCTION_ID" msprop:Generator_ColumnVarNameInTable="columnFUNCTION_ID" msprop:Generator_ColumnPropNameInRow="FUNCTION_ID" msprop:Generator_ColumnPropNameInTable="FUNCTION_IDColumn" msprop:Generator_UserColumnName="FUNCTION_ID" type="xs:int" minOccurs="0" />
-              <xs:element name="IS_REQUIRED" msprop:Generator_ColumnVarNameInTable="columnIS_REQUIRED" msprop:Generator_ColumnPropNameInRow="IS_REQUIRED" msprop:Generator_ColumnPropNameInTable="IS_REQUIREDColumn" msprop:Generator_UserColumnName="IS_REQUIRED" type="xs:boolean" />
-              <xs:element name="XML_TABLE_ID" msprop:Generator_ColumnVarNameInTable="columnXML_TABLE_ID" msprop:Generator_ColumnPropNameInRow="XML_TABLE_ID" msprop:Generator_ColumnPropNameInTable="XML_TABLE_IDColumn" msprop:Generator_UserColumnName="XML_TABLE_ID" type="xs:int" />
-              <xs:element name="IS_VIRTUAL" msprop:Generator_ColumnVarNameInTable="columnIS_VIRTUAL" msprop:Generator_ColumnPropNameInRow="IS_VIRTUAL" msprop:Generator_ColumnPropNameInTable="IS_VIRTUALColumn" msprop:Generator_UserColumnName="IS_VIRTUAL" type="xs:boolean" />
-              <xs:element name="FUNCTION_PARAMETERS" msprop:Generator_ColumnVarNameInTable="columnFUNCTION_PARAMETERS" msprop:Generator_ColumnPropNameInRow="FUNCTION_PARAMETERS" msprop:Generator_ColumnPropNameInTable="FUNCTION_PARAMETERSColumn" msprop:Generator_UserColumnName="FUNCTION_PARAMETERS" minOccurs="0">
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:maxLength value="2147483647" />
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-              <xs:element name="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_UserColumnName="ADDED_WHO">
+              <xs:element name="TYPE_ID" msprop:Generator_ColumnPropNameInRow="TYPE_ID" msprop:Generator_ColumnPropNameInTable="TYPE_IDColumn" msprop:Generator_ColumnVarNameInTable="columnTYPE_ID" msprop:Generator_UserColumnName="TYPE_ID" type="xs:int" />
+              <xs:element name="IS_READ_ONLY" msprop:Generator_ColumnPropNameInRow="IS_READ_ONLY" msprop:Generator_ColumnPropNameInTable="IS_READ_ONLYColumn" msprop:Generator_ColumnVarNameInTable="columnIS_READ_ONLY" msprop:Generator_UserColumnName="IS_READ_ONLY" type="xs:boolean" />
+              <xs:element name="IS_VISIBLE" msprop:Generator_ColumnPropNameInRow="IS_VISIBLE" msprop:Generator_ColumnPropNameInTable="IS_VISIBLEColumn" msprop:Generator_ColumnVarNameInTable="columnIS_VISIBLE" msprop:Generator_UserColumnName="IS_VISIBLE" type="xs:boolean" />
+              <xs:element name="ORDER_KEY" msprop:Generator_ColumnPropNameInRow="ORDER_KEY" msprop:Generator_ColumnPropNameInTable="ORDER_KEYColumn" msprop:Generator_ColumnVarNameInTable="columnORDER_KEY" msprop:Generator_UserColumnName="ORDER_KEY" type="xs:int" />
+              <xs:element name="IS_REQUIRED" msprop:Generator_ColumnPropNameInRow="IS_REQUIRED" msprop:Generator_ColumnPropNameInTable="IS_REQUIREDColumn" msprop:Generator_ColumnVarNameInTable="columnIS_REQUIRED" msprop:Generator_UserColumnName="IS_REQUIRED" type="xs:boolean" />
+              <xs:element name="TABLE_ID" msprop:Generator_ColumnPropNameInRow="TABLE_ID" msprop:Generator_ColumnPropNameInTable="TABLE_IDColumn" msprop:Generator_ColumnVarNameInTable="columnTABLE_ID" msprop:Generator_UserColumnName="TABLE_ID" type="xs:int" />
+              <xs:element name="IS_VIRTUAL" msprop:Generator_ColumnPropNameInRow="IS_VIRTUAL" msprop:Generator_ColumnPropNameInTable="IS_VIRTUALColumn" msprop:Generator_ColumnVarNameInTable="columnIS_VIRTUAL" msprop:Generator_UserColumnName="IS_VIRTUAL" type="xs:boolean" />
+              <xs:element name="ADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_UserColumnName="ADDED_WHO">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="TBEDI_XML_TYPES" msprop:Generator_TableClassName="TBEDI_XML_TYPESDataTable" msprop:Generator_TableVarName="tableTBEDI_XML_TYPES" msprop:Generator_RowChangedName="TBEDI_XML_TYPESRowChanged" msprop:Generator_TablePropName="TBEDI_XML_TYPES" msprop:Generator_RowDeletingName="TBEDI_XML_TYPESRowDeleting" msprop:Generator_RowChangingName="TBEDI_XML_TYPESRowChanging" msprop:Generator_RowEvHandlerName="TBEDI_XML_TYPESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEDI_XML_TYPESRowDeleted" msprop:Generator_RowClassName="TBEDI_XML_TYPESRow" msprop:Generator_UserTableName="TBEDI_XML_TYPES" msprop:Generator_RowEvArgName="TBEDI_XML_TYPESRowChangeEvent">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
-              <xs:element name="NAME" msprop:Generator_ColumnVarNameInTable="columnNAME" msprop:Generator_ColumnPropNameInRow="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_UserColumnName="NAME">
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:maxLength value="20" />
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="TBEDI_XML_TEMPLATES" msprop:Generator_TableClassName="TBEDI_XML_TEMPLATESDataTable" msprop:Generator_TableVarName="tableTBEDI_XML_TEMPLATES" msprop:Generator_RowChangedName="TBEDI_XML_TEMPLATESRowChanged" msprop:Generator_TablePropName="TBEDI_XML_TEMPLATES" msprop:Generator_RowDeletingName="TBEDI_XML_TEMPLATESRowDeleting" msprop:Generator_RowChangingName="TBEDI_XML_TEMPLATESRowChanging" msprop:Generator_RowEvHandlerName="TBEDI_XML_TEMPLATESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEDI_XML_TEMPLATESRowDeleted" msprop:Generator_RowClassName="TBEDI_XML_TEMPLATESRow" msprop:Generator_UserTableName="TBEDI_XML_TEMPLATES" msprop:Generator_RowEvArgName="TBEDI_XML_TEMPLATESRowChangeEvent">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
-              <xs:element name="NAME" msprop:Generator_ColumnVarNameInTable="columnNAME" msprop:Generator_ColumnPropNameInRow="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_UserColumnName="NAME">
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:maxLength value="20" />
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-              <xs:element name="DESCRIPTION" msprop:Generator_ColumnVarNameInTable="columnDESCRIPTION" msprop:Generator_ColumnPropNameInRow="DESCRIPTION" msprop:Generator_ColumnPropNameInTable="DESCRIPTIONColumn" msprop:Generator_UserColumnName="DESCRIPTION" minOccurs="0">
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:maxLength value="2147483647" />
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="TBEDI_XML_NODES" msprop:Generator_TableClassName="TBEDI_XML_NODESDataTable" msprop:Generator_TableVarName="tableTBEDI_XML_NODES" msprop:Generator_RowChangedName="TBEDI_XML_NODESRowChanged" msprop:Generator_TablePropName="TBEDI_XML_NODES" msprop:Generator_RowDeletingName="TBEDI_XML_NODESRowDeleting" msprop:Generator_RowChangingName="TBEDI_XML_NODESRowChanging" msprop:Generator_RowEvHandlerName="TBEDI_XML_NODESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEDI_XML_NODESRowDeleted" msprop:Generator_RowClassName="TBEDI_XML_NODESRow" msprop:Generator_UserTableName="TBEDI_XML_NODES" msprop:Generator_RowEvArgName="TBEDI_XML_NODESRowChangeEvent">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
-              <xs:element name="NAME" msprop:Generator_ColumnVarNameInTable="columnNAME" msprop:Generator_ColumnPropNameInRow="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_UserColumnName="NAME">
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:maxLength value="2147483647" />
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-              <xs:element name="TEMPLATE_ID" msprop:Generator_ColumnVarNameInTable="columnTEMPLATE_ID" msprop:Generator_ColumnPropNameInRow="TEMPLATE_ID" msprop:Generator_ColumnPropNameInTable="TEMPLATE_IDColumn" msprop:Generator_UserColumnName="TEMPLATE_ID" type="xs:int" />
-              <xs:element name="IS_HEAD" msprop:Generator_ColumnVarNameInTable="columnIS_HEAD" msprop:Generator_ColumnPropNameInRow="IS_HEAD" msprop:Generator_ColumnPropNameInTable="IS_HEADColumn" msprop:Generator_UserColumnName="IS_HEAD" type="xs:boolean" />
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="TBEDI_XML_FUNCTIONS" msprop:Generator_TableClassName="TBEDI_XML_FUNCTIONSDataTable" msprop:Generator_TableVarName="tableTBEDI_XML_FUNCTIONS" msprop:Generator_RowChangedName="TBEDI_XML_FUNCTIONSRowChanged" msprop:Generator_TablePropName="TBEDI_XML_FUNCTIONS" msprop:Generator_RowDeletingName="TBEDI_XML_FUNCTIONSRowDeleting" msprop:Generator_RowChangingName="TBEDI_XML_FUNCTIONSRowChanging" msprop:Generator_RowEvHandlerName="TBEDI_XML_FUNCTIONSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEDI_XML_FUNCTIONSRowDeleted" msprop:Generator_RowClassName="TBEDI_XML_FUNCTIONSRow" msprop:Generator_UserTableName="TBEDI_XML_FUNCTIONS" msprop:Generator_RowEvArgName="TBEDI_XML_FUNCTIONSRowChangeEvent">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
-              <xs:element name="NAME" msprop:Generator_ColumnVarNameInTable="columnNAME" msprop:Generator_ColumnPropNameInRow="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_UserColumnName="NAME">
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:maxLength value="2147483647" />
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-              <xs:element name="DESCRIPTION" msprop:Generator_ColumnVarNameInTable="columnDESCRIPTION" msprop:Generator_ColumnPropNameInRow="DESCRIPTION" msprop:Generator_ColumnPropNameInTable="DESCRIPTIONColumn" msprop:Generator_UserColumnName="DESCRIPTION">
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:maxLength value="2147483647" />
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-              <xs:element name="PARAMETERS" msprop:Generator_ColumnVarNameInTable="columnPARAMETERS" msprop:Generator_ColumnPropNameInRow="PARAMETERS" msprop:Generator_ColumnPropNameInTable="PARAMETERSColumn" msprop:Generator_UserColumnName="PARAMETERS" minOccurs="0">
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:maxLength value="2147483647" />
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="TBEDI_XML_CONFIG" msprop:Generator_TableClassName="TBEDI_XML_CONFIGDataTable" msprop:Generator_TableVarName="tableTBEDI_XML_CONFIG" msprop:Generator_RowChangedName="TBEDI_XML_CONFIGRowChanged" msprop:Generator_TablePropName="TBEDI_XML_CONFIG" msprop:Generator_RowDeletingName="TBEDI_XML_CONFIGRowDeleting" msprop:Generator_RowChangingName="TBEDI_XML_CONFIGRowChanging" msprop:Generator_RowEvHandlerName="TBEDI_XML_CONFIGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEDI_XML_CONFIGRowDeleted" msprop:Generator_RowClassName="TBEDI_XML_CONFIGRow" msprop:Generator_UserTableName="TBEDI_XML_CONFIG" msprop:Generator_RowEvArgName="TBEDI_XML_CONFIGRowChangeEvent">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
-              <xs:element name="KEY" msprop:Generator_ColumnVarNameInTable="columnKEY" msprop:Generator_ColumnPropNameInRow="KEY" msprop:Generator_ColumnPropNameInTable="KEYColumn" msprop:Generator_UserColumnName="KEY">
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="ACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" />
+              <xs:element name="COMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="VALUE" msprop:Generator_ColumnVarNameInTable="columnVALUE" msprop:Generator_ColumnPropNameInRow="VALUE" msprop:Generator_ColumnPropNameInTable="VALUEColumn" msprop:Generator_UserColumnName="VALUE">
+              <xs:element name="TEMPLATE_NAME" msprop:Generator_ColumnPropNameInRow="TEMPLATE_NAME" msprop:Generator_ColumnPropNameInTable="TEMPLATE_NAMEColumn" msprop:Generator_ColumnVarNameInTable="columnTEMPLATE_NAME" msprop:Generator_UserColumnName="TEMPLATE_NAME">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="TABLE_NAME" msprop:Generator_ColumnPropNameInRow="TABLE_NAME" msprop:Generator_ColumnPropNameInTable="TABLE_NAMEColumn" msprop:Generator_ColumnVarNameInTable="columnTABLE_NAME" msprop:Generator_UserColumnName="TABLE_NAME">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="2147483647" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="PREFER_EXTERNAL" msprop:Generator_ColumnPropNameInRow="PREFER_EXTERNAL" msprop:Generator_ColumnPropNameInTable="PREFER_EXTERNALColumn" msprop:Generator_ColumnVarNameInTable="columnPREFER_EXTERNAL" msprop:Generator_UserColumnName="PREFER_EXTERNAL" type="xs:boolean" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="TBEDI_XML_TYPES" msprop:Generator_RowEvHandlerName="TBEDI_XML_TYPESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEDI_XML_TYPESRowDeleted" msprop:Generator_RowDeletingName="TBEDI_XML_TYPESRowDeleting" msprop:Generator_RowEvArgName="TBEDI_XML_TYPESRowChangeEvent" msprop:Generator_TablePropName="TBEDI_XML_TYPES" msprop:Generator_RowChangedName="TBEDI_XML_TYPESRowChanged" msprop:Generator_RowChangingName="TBEDI_XML_TYPESRowChanging" msprop:Generator_TableClassName="TBEDI_XML_TYPESDataTable" msprop:Generator_RowClassName="TBEDI_XML_TYPESRow" msprop:Generator_TableVarName="tableTBEDI_XML_TYPES" msprop:Generator_UserTableName="TBEDI_XML_TYPES">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="NAME" msprop:Generator_ColumnPropNameInRow="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_ColumnVarNameInTable="columnNAME" msprop:Generator_UserColumnName="NAME">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="TBMT_TEMPLATES" msprop:Generator_RowEvHandlerName="TBMT_TEMPLATESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_TEMPLATESRowDeleted" msprop:Generator_RowDeletingName="TBMT_TEMPLATESRowDeleting" msprop:Generator_RowEvArgName="TBMT_TEMPLATESRowChangeEvent" msprop:Generator_TablePropName="TBMT_TEMPLATES" msprop:Generator_RowChangedName="TBMT_TEMPLATESRowChanged" msprop:Generator_RowChangingName="TBMT_TEMPLATESRowChanging" msprop:Generator_TableClassName="TBMT_TEMPLATESDataTable" msprop:Generator_RowClassName="TBMT_TEMPLATESRow" msprop:Generator_TableVarName="tableTBMT_TEMPLATES" msprop:Generator_UserTableName="TBMT_TEMPLATES">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="NAME" msprop:Generator_ColumnPropNameInRow="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_ColumnVarNameInTable="columnNAME" msprop:Generator_UserColumnName="NAME">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="DESCRIPTION" msprop:Generator_ColumnPropNameInRow="DESCRIPTION" msprop:Generator_ColumnPropNameInTable="DESCRIPTIONColumn" msprop:Generator_ColumnVarNameInTable="columnDESCRIPTION" msprop:Generator_UserColumnName="DESCRIPTION" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="2147483647" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="TBEDI_XML_NODES" msprop:Generator_RowEvHandlerName="TBEDI_XML_NODESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEDI_XML_NODESRowDeleted" msprop:Generator_RowDeletingName="TBEDI_XML_NODESRowDeleting" msprop:Generator_RowEvArgName="TBEDI_XML_NODESRowChangeEvent" msprop:Generator_TablePropName="TBEDI_XML_NODES" msprop:Generator_RowChangedName="TBEDI_XML_NODESRowChanged" msprop:Generator_RowChangingName="TBEDI_XML_NODESRowChanging" msprop:Generator_TableClassName="TBEDI_XML_NODESDataTable" msprop:Generator_RowClassName="TBEDI_XML_NODESRow" msprop:Generator_TableVarName="tableTBEDI_XML_NODES" msprop:Generator_UserTableName="TBEDI_XML_NODES">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="NAME" msprop:Generator_ColumnPropNameInRow="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_ColumnVarNameInTable="columnNAME" msprop:Generator_UserColumnName="NAME">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="2147483647" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="TEMPLATE_ID" msprop:Generator_ColumnPropNameInRow="TEMPLATE_ID" msprop:Generator_ColumnPropNameInTable="TEMPLATE_IDColumn" msprop:Generator_ColumnVarNameInTable="columnTEMPLATE_ID" msprop:Generator_UserColumnName="TEMPLATE_ID" type="xs:int" />
+              <xs:element name="IS_HEAD" msprop:Generator_ColumnPropNameInRow="IS_HEAD" msprop:Generator_ColumnPropNameInTable="IS_HEADColumn" msprop:Generator_ColumnVarNameInTable="columnIS_HEAD" msprop:Generator_UserColumnName="IS_HEAD" type="xs:boolean" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="TBMT_FUNCTIONS" msprop:Generator_RowEvHandlerName="TBMT_FUNCTIONSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_FUNCTIONSRowDeleted" msprop:Generator_RowDeletingName="TBMT_FUNCTIONSRowDeleting" msprop:Generator_RowEvArgName="TBMT_FUNCTIONSRowChangeEvent" msprop:Generator_TablePropName="TBMT_FUNCTIONS" msprop:Generator_RowChangedName="TBMT_FUNCTIONSRowChanged" msprop:Generator_RowChangingName="TBMT_FUNCTIONSRowChanging" msprop:Generator_TableClassName="TBMT_FUNCTIONSDataTable" msprop:Generator_RowClassName="TBMT_FUNCTIONSRow" msprop:Generator_TableVarName="tableTBMT_FUNCTIONS" msprop:Generator_UserTableName="TBMT_FUNCTIONS">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="NAME" msprop:Generator_ColumnPropNameInRow="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_ColumnVarNameInTable="columnNAME" msprop:Generator_UserColumnName="NAME">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="2147483647" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="DESCRIPTION" msprop:Generator_ColumnPropNameInRow="DESCRIPTION" msprop:Generator_ColumnPropNameInTable="DESCRIPTIONColumn" msprop:Generator_ColumnVarNameInTable="columnDESCRIPTION" msprop:Generator_UserColumnName="DESCRIPTION">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="2147483647" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="PARAMETERS" msprop:Generator_ColumnPropNameInRow="PARAMETERS" msprop:Generator_ColumnPropNameInTable="PARAMETERSColumn" msprop:Generator_ColumnVarNameInTable="columnPARAMETERS" msprop:Generator_UserColumnName="PARAMETERS" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="2147483647" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="TBMT_CONFIG" msprop:Generator_RowEvHandlerName="TBMT_CONFIGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_CONFIGRowDeleted" msprop:Generator_RowDeletingName="TBMT_CONFIGRowDeleting" msprop:Generator_RowEvArgName="TBMT_CONFIGRowChangeEvent" msprop:Generator_TablePropName="TBMT_CONFIG" msprop:Generator_RowChangedName="TBMT_CONFIGRowChanged" msprop:Generator_RowChangingName="TBMT_CONFIGRowChanging" msprop:Generator_TableClassName="TBMT_CONFIGDataTable" msprop:Generator_RowClassName="TBMT_CONFIGRow" msprop:Generator_TableVarName="tableTBMT_CONFIG" msprop:Generator_UserTableName="TBMT_CONFIG">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="KEY" msprop:Generator_ColumnPropNameInRow="KEY" msprop:Generator_ColumnPropNameInTable="KEYColumn" msprop:Generator_ColumnVarNameInTable="columnKEY" msprop:Generator_UserColumnName="KEY">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="VALUE" msprop:Generator_ColumnPropNameInRow="VALUE" msprop:Generator_ColumnPropNameInTable="VALUEColumn" msprop:Generator_ColumnVarNameInTable="columnVALUE" msprop:Generator_UserColumnName="VALUE">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="500" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_UserColumnName="ADDED_WHO">
+              <xs:element name="ADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_UserColumnName="ADDED_WHO">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="ACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="false" />
+              <xs:element name="TEMPLATE_ID" msprop:Generator_ColumnPropNameInRow="TEMPLATE_ID" msprop:Generator_ColumnPropNameInTable="TEMPLATE_IDColumn" msprop:Generator_ColumnVarNameInTable="columnTEMPLATE_ID" msprop:Generator_UserColumnName="TEMPLATE_ID" type="xs:int" minOccurs="0" />
+              <xs:element name="COMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="TBMT_TABLES" msprop:Generator_RowClassName="TBMT_TABLESRow" msprop:Generator_RowEvHandlerName="TBMT_TABLESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_TABLESRowDeleted" msprop:Generator_RowDeletingName="TBMT_TABLESRowDeleting" msprop:Generator_RowEvArgName="TBMT_TABLESRowChangeEvent" msprop:Generator_TablePropName="TBMT_TABLES" msprop:Generator_RowChangedName="TBMT_TABLESRowChanged" msprop:Generator_RowChangingName="TBMT_TABLESRowChanging" msprop:Generator_TableClassName="TBMT_TABLESDataTable" msprop:Generator_UserTableName="TBMT_TABLES" msprop:Generator_TableVarName="tableTBMT_TABLES">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="NAME" msprop:Generator_ColumnPropNameInRow="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_ColumnVarNameInTable="columnNAME" msprop:Generator_UserColumnName="NAME">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="2147483647" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="TEMPLATE_ID" msprop:Generator_ColumnPropNameInRow="TEMPLATE_ID" msprop:Generator_ColumnPropNameInTable="TEMPLATE_IDColumn" msprop:Generator_ColumnVarNameInTable="columnTEMPLATE_ID" msprop:Generator_UserColumnName="TEMPLATE_ID" type="xs:int" />
+              <xs:element name="IS_HEAD" msprop:Generator_ColumnPropNameInRow="IS_HEAD" msprop:Generator_ColumnPropNameInTable="IS_HEADColumn" msprop:Generator_ColumnVarNameInTable="columnIS_HEAD" msprop:Generator_UserColumnName="IS_HEAD" type="xs:boolean" />
+              <xs:element name="ACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" />
+              <xs:element name="COMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="ADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_UserColumnName="ADDED_WHO">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
       </xs:choice>
     </xs:complexType>
     <xs:unique name="Constraint1" msdata:PrimaryKey="true">
-      <xs:selector xpath=".//mstns:TBEDI_XML_TEMPLATE_ITEMS" />
+      <xs:selector xpath=".//mstns:TBMT_TEMPLATE_ITEMS" />
       <xs:field xpath="mstns:GUID" />
     </xs:unique>
     <xs:unique name="TBEDI_XML_TYPES_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
       <xs:selector xpath=".//mstns:TBEDI_XML_TYPES" />
       <xs:field xpath="mstns:GUID" />
     </xs:unique>
-    <xs:unique name="TBEDI_XML_TEMPLATES_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
-      <xs:selector xpath=".//mstns:TBEDI_XML_TEMPLATES" />
+    <xs:unique name="TBMT_TEMPLATES_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:TBMT_TEMPLATES" />
       <xs:field xpath="mstns:GUID" />
     </xs:unique>
     <xs:unique name="TBEDI_XML_NODES_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
       <xs:selector xpath=".//mstns:TBEDI_XML_NODES" />
       <xs:field xpath="mstns:GUID" />
     </xs:unique>
-    <xs:unique name="TBEDI_XML_FUNCTIONS_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
-      <xs:selector xpath=".//mstns:TBEDI_XML_FUNCTIONS" />
+    <xs:unique name="TBMT_FUNCTIONS_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:TBMT_FUNCTIONS" />
+      <xs:field xpath="mstns:GUID" />
+    </xs:unique>
+    <xs:unique name="TBMT_CONFIG_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:TBMT_CONFIG" />
+      <xs:field xpath="mstns:GUID" />
+    </xs:unique>
+    <xs:unique name="TBMT_TABLES_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:TBMT_TABLES" />
       <xs:field xpath="mstns:GUID" />
     </xs:unique>
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="TBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS" msdata:parent="TBEDI_XML_TEMPLATE_ITEMS" msdata:child="TBEDI_XML_FUNCTIONS" msdata:parentkey="FUNCTION_ID" msdata:childkey="GUID" msprop:Generator_UserChildTable="TBEDI_XML_FUNCTIONS" msprop:Generator_ChildPropName="GetTBEDI_XML_FUNCTIONSRows" msprop:Generator_UserRelationName="TBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS" msprop:Generator_RelationVarName="relationTBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS" msprop:Generator_UserParentTable="TBEDI_XML_TEMPLATE_ITEMS" msprop:Generator_ParentPropName="TBEDI_XML_ITEMSRow" />
-      <msdata:Relationship name="TBEDI_XML_ITEMS_TBEDI_XML_TYPES" msdata:parent="TBEDI_XML_TEMPLATE_ITEMS" msdata:child="TBEDI_XML_TYPES" msdata:parentkey="XML_TYPE_ID" msdata:childkey="GUID" msprop:Generator_UserChildTable="TBEDI_XML_TYPES" msprop:Generator_ChildPropName="GetTBEDI_XML_TYPESRows" msprop:Generator_UserRelationName="TBEDI_XML_ITEMS_TBEDI_XML_TYPES" msprop:Generator_RelationVarName="relationTBEDI_XML_ITEMS_TBEDI_XML_TYPES" msprop:Generator_UserParentTable="TBEDI_XML_TEMPLATE_ITEMS" msprop:Generator_ParentPropName="TBEDI_XML_ITEMSRow" />
-      <msdata:Relationship name="TBEDI_XML_NODES_TBEDI_XML_TEMPLATES" msdata:parent="TBEDI_XML_NODES" msdata:child="TBEDI_XML_TEMPLATES" msdata:parentkey="TEMPLATE_ID" msdata:childkey="GUID" msprop:Generator_UserChildTable="TBEDI_XML_TEMPLATES" msprop:Generator_ChildPropName="GetTBEDI_XML_TEMPLATESRows" msprop:Generator_UserRelationName="TBEDI_XML_NODES_TBEDI_XML_TEMPLATES" msprop:Generator_ParentPropName="TBEDI_XML_NODESRow" msprop:Generator_RelationVarName="relationTBEDI_XML_NODES_TBEDI_XML_TEMPLATES" msprop:Generator_UserParentTable="TBEDI_XML_NODES" />
-      <msdata:Relationship name="FK_TBEDI_XML_TYPES" msdata:parent="TBEDI_XML_TEMPLATE_ITEMS" msdata:child="TBEDI_XML_TEMPLATE_ITEMS" msdata:parentkey="GUID" msdata:childkey="XML_TYPE_ID" msprop:Generator_UserChildTable="TBEDI_XML_TEMPLATE_ITEMS" msprop:Generator_ChildPropName="GetTBEDI_XML_TEMPLATE_ITEMSRowsByFK_TBEDI_XML_TYPES" msprop:Generator_UserRelationName="FK_TBEDI_XML_TYPES" msprop:Generator_RelationVarName="relationFK_TBEDI_XML_TYPES" msprop:Generator_UserParentTable="TBEDI_XML_TEMPLATE_ITEMS" msprop:Generator_ParentPropName="TBEDI_XML_TEMPLATE_ITEMSRowParentByFK_TBEDI_XML_TYPES" />
-      <msdata:Relationship name="FK_TBEDI_XML_NODES" msdata:parent="TBEDI_XML_TEMPLATE_ITEMS" msdata:child="TBEDI_XML_TEMPLATE_ITEMS" msdata:parentkey="GUID" msdata:childkey="XML_TABLE_ID" msprop:Generator_UserChildTable="TBEDI_XML_TEMPLATE_ITEMS" msprop:Generator_ChildPropName="GetTBEDI_XML_TEMPLATE_ITEMSRowsByFK_TBEDI_XML_NODES" msprop:Generator_UserRelationName="FK_TBEDI_XML_NODES" msprop:Generator_ParentPropName="TBEDI_XML_TEMPLATE_ITEMSRowParentByFK_TBEDI_XML_NODES" msprop:Generator_RelationVarName="relationFK_TBEDI_XML_NODES" msprop:Generator_UserParentTable="TBEDI_XML_TEMPLATE_ITEMS" />
+      <msdata:Relationship name="TBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES" msdata:parent="TBMT_TEMPLATE_ITEMS" msdata:child="TBEDI_XML_TYPES" msdata:parentkey="TYPE_ID" msdata:childkey="GUID" msprop:Generator_UserParentTable="TBMT_TEMPLATE_ITEMS" msprop:Generator_UserChildTable="TBEDI_XML_TYPES" msprop:Generator_RelationVarName="relationTBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES" msprop:Generator_ChildPropName="GetTBEDI_XML_TYPESRows" msprop:Generator_ParentPropName="TBMT_TEMPLATE_ITEMSRow" msprop:Generator_UserRelationName="TBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES" />
+      <msdata:Relationship name="TBEDI_XML_NODES_TBMT_TEMPLATES" msdata:parent="TBEDI_XML_NODES" msdata:child="TBMT_TEMPLATES" msdata:parentkey="TEMPLATE_ID" msdata:childkey="GUID" msprop:Generator_ChildPropName="GetTBMT_TEMPLATESRows" msprop:Generator_UserChildTable="TBMT_TEMPLATES" msprop:Generator_RelationVarName="relationTBEDI_XML_NODES_TBMT_TEMPLATES" msprop:Generator_UserRelationName="TBEDI_XML_NODES_TBMT_TEMPLATES" msprop:Generator_UserParentTable="TBEDI_XML_NODES" msprop:Generator_ParentPropName="TBEDI_XML_NODESRow" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

MultiTool.Form/DS_DD_ECM.xss

@@ -4,33 +4,18 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-60" ViewPortY="-55" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-51" ViewPortY="-55" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:TBEDI_XML_TEMPLATE_ITEMS" ZOrder="1" X="5" Y="8" Height="305" Width="252" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBEDI_XML_TYPES" ZOrder="11" X="525" Y="204" Height="115" Width="251" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:TBEDI_XML_TEMPLATES" ZOrder="9" X="1069" Y="27" Height="134" Width="285" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:TBEDI_XML_NODES" ZOrder="7" X="513" Y="22" Height="153" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:TBEDI_XML_FUNCTIONS" ZOrder="10" X="472" Y="347" Height="153" Width="286" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:TBEDI_XML_CONFIG" ZOrder="3" X="-21" Y="423" Height="210" Width="262" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:TBMT_TEMPLATE_ITEMS" ZOrder="2" X="5" Y="8" Height="305" Width="252" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBEDI_XML_TYPES" ZOrder="9" X="525" Y="204" Height="115" Width="251" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:TBMT_TEMPLATES" ZOrder="7" X="1069" Y="27" Height="134" Width="285" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:TBEDI_XML_NODES" ZOrder="6" X="513" Y="22" Height="153" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:TBMT_FUNCTIONS" ZOrder="8" X="472" Y="347" Height="153" Width="286" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:TBMT_CONFIG" ZOrder="3" X="-25" Y="383" Height="286" Width="230" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:TBMT_TABLES" ZOrder="1" X="884" Y="396" Height="267" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
   </Shapes>
   <Connectors>
-    <Connector ID="DesignRelation:TBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS" ZOrder="8" LineWidth="11">
-      <RoutePoints>
-        <Point>
-          <X>240</X>
-          <Y>313</Y>
-        </Point>
-        <Point>
-          <X>240</X>
-          <Y>364</Y>
-        </Point>
-        <Point>
-          <X>472</X>
-          <Y>364</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
-    <Connector ID="DesignRelation:TBEDI_XML_ITEMS_TBEDI_XML_TYPES" ZOrder="5" LineWidth="11">
+    <Connector ID="DesignRelation:TBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES" ZOrder="4" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>257</X>
@@ -42,7 +27,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:TBEDI_XML_NODES_TBEDI_XML_TEMPLATES" ZOrder="6" LineWidth="11">
+    <Connector ID="DesignRelation:TBEDI_XML_NODES_TBMT_TEMPLATES" ZOrder="5" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>770</X>
@@ -54,53 +39,5 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBEDI_XML_TYPES" ZOrder="4" LineWidth="11">
-      <RoutePoints>
-        <Point>
-          <X>5</X>
-          <Y>33</Y>
-        </Point>
-        <Point>
-          <X>-33</X>
-          <Y>33</Y>
-        </Point>
-        <Point>
-          <X>-33</X>
-          <Y>-30</Y>
-        </Point>
-        <Point>
-          <X>30</X>
-          <Y>-30</Y>
-        </Point>
-        <Point>
-          <X>30</X>
-          <Y>8</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
-    <Connector ID="DesignRelation:FK_TBEDI_XML_NODES" ZOrder="2" LineWidth="11">
-      <RoutePoints>
-        <Point>
-          <X>5</X>
-          <Y>41</Y>
-        </Point>
-        <Point>
-          <X>-41</X>
-          <Y>41</Y>
-        </Point>
-        <Point>
-          <X>-41</X>
-          <Y>-38</Y>
-        </Point>
-        <Point>
-          <X>38</X>
-          <Y>-38</Y>
-        </Point>
-        <Point>
-          <X>38</X>
-          <Y>8</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
   </Connectors>
 </DiagramLayout>

MultiTool.Form/FormHelpers.vb

@@ -1,5 +1,5 @@
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared.Exceptions
+Imports MultiTool.Common.Exceptions
 
 Public Class FormHelper
     Private ReadOnly Logger As Logger
@@ -39,6 +39,7 @@ Public Class FormHelper
         MsgBox(oMessage, MsgBoxStyle.Exclamation, Form.Text)
     End Sub
 
+
     Public Sub TryOpenDirectory(pPath As String, pDisplayName As String)
         If IO.Directory.Exists(pPath) Then
             Process.Start(pPath)

MultiTool.Form/GridLoader.vb

@@ -2,8 +2,8 @@
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared
-Imports MultiTool.Shared.Constants
+Imports MultiTool.Common
+Imports MultiTool.Common.Constants
 
 Public Class GridLoader
     Inherits BaseClass
@@ -48,6 +48,12 @@ Public Class GridLoader
                 .VisibleIndex = oVisibleIndex
             }
 
+            ' TODO: Correclty format all values, but especially currency and numbers
+            'If oCol.DataType = ColumnType.Decimal Then
+            '    oColumn.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric
+            '    oColumn.DisplayFormat.FormatString = "c2"
+            'End If
+
             oView.Columns.Add(oColumn)
         Next
 
@@ -62,7 +68,7 @@ Public Class GridLoader
         Return pGrid
     End Function
 
-    Private Function GetColumnType(pColumn As Templates.Template.Column)
+    Private Function GetColumnType(pColumn As Templates.Template.Column) As DevExpress.Data.UnboundColumnType
         Select Case pColumn.DataType
             Case ColumnType.Boolean
                 Return DevExpress.Data.UnboundColumnType.Boolean

MultiTool.Form/MultiTool.Form.vbproj

@@ -11,9 +11,10 @@
     <AssemblyName>MultiTool.Form</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsForms</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -96,32 +97,28 @@
     <Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraVerticalGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DigitalData.Controls.SQLConfig">
-      <HintPath>..\..\DDMonorepo\SQLConfig\bin\Debug\DigitalData.Controls.SQLConfig.dll</HintPath>
-    </Reference>
     <Reference Include="DigitalData.GUIs.Common">
       <HintPath>..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Filesystem, Version=1.0.7.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
+      <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Language, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDMonorepo\Modules.Language\bin\Release\DigitalData.Modules.Language.dll</HintPath>
+      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\DDMonorepo\Modules.Logging\bin\Release\DigitalData.Modules.Logging.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.1.0\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -155,6 +152,7 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ApplicationEvents.vb" />
     <Compile Include="DS_DD_ECM.Designer.vb">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -243,9 +241,14 @@
       <DependentUpon>frmImportMainExtra.resx</DependentUpon>
     </Compile>
     <Compile Include="Strings\frmShared.Designer.vb">
+      <DependentUpon>frmShared.resx</DependentUpon>
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
-      <DependentUpon>frmShared.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Strings\frmShared.en.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>frmShared.en.resx</DependentUpon>
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -294,6 +297,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmConfig.resx">
       <DependentUpon>frmConfig.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Strings\frmImportMainExtra.resx">
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
@@ -301,9 +305,14 @@
       <LastGenOutput>frmImportMainExtra.Designer.vb</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Include="Strings\frmShared.resx">
-      <CustomToolNamespace>My.Resources</CustomToolNamespace>
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>frmShared.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Strings\frmShared.en.resx">
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>frmShared.en.Designer.vb</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
@@ -334,6 +343,18 @@
   <ItemGroup>
     <Content Include="CREATE_DATABASE.sql" />
     <Content Include="MultiTool.ico" />
+    <None Include="Resources\highimportance1.svg" />
+    <None Include="Resources\highimportance.svg" />
+    <None Include="Resources\refreshpivottable.svg" />
+    <None Include="Resources\update.svg" />
+    <None Include="Resources\actions_reload1.svg" />
+    <None Include="Resources\logical3.svg" />
+    <None Include="Resources\logical2.svg" />
+    <None Include="Resources\bo_sale.svg" />
+    <None Include="Resources\editquery.svg" />
+    <None Include="Resources\actions_checkcircled2.svg" />
+    <None Include="Resources\actions_deletecircled1.svg" />
+    <None Include="Resources\actions_addcircled.svg" />
     <None Include="Resources\squarified1.svg" />
     <None Include="Resources\open3.svg" />
     <None Include="Resources\up1.svg" />
@@ -401,11 +422,10 @@
     <None Include="Resources\import.svg" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\MultiTool.Shared\MultiTool.Shared.vbproj">
+    <ProjectReference Include="..\MultiTool.Common\MultiTool.Common.vbproj">
       <Project>{dd1ac3b9-7595-4d3c-b9bb-97c46a480fa0}</Project>
-      <Name>MultiTool.Shared</Name>
+      <Name>MultiTool.Common</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

MultiTool.Form/My Project/AssemblyInfo.vb

@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("WebService Multitool für WinLine")>
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("WebService Multitool")>
-<Assembly: AssemblyCopyright("Copyright © 2022")>
-<Assembly: AssemblyTrademark("1.2.0.0")>
+<Assembly: AssemblyCopyright("Copyright © 2024")>
+<Assembly: AssemblyTrademark("1.4.4.3")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.2.0.0")>
+<Assembly: AssemblyVersion("1.4.4.3")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>

MultiTool.Form/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -70,6 +70,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property actions_addcircled() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("actions_addcircled", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -100,6 +110,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property actions_checkcircled2() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("actions_checkcircled2", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -120,6 +140,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property actions_deletecircled1() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("actions_deletecircled1", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -130,6 +160,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property actions_reload1() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("actions_reload1", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -210,6 +250,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property bo_sale() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("bo_sale", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -270,6 +320,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property editquery() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("editquery", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -300,6 +360,26 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property highimportance() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("highimportance", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property highimportance1() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("highimportance1", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -370,6 +450,26 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property logical2() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("logical2", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property logical3() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("logical3", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -540,6 +640,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property refreshpivottable() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("refreshpivottable", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -670,6 +780,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property update() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("update", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>

MultiTool.Form/My Project/Resources.resx

@@ -118,26 +118,92 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="logical" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\logical.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="icon_export" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="mailmergepreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\mailmergepreview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_send" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_send.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="bo_country" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_country.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="open24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\open24.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="deletetablerows" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\deletetablerows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="parameters" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\parameters.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="tilelabels" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\tilelabels.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="refreshpivottable" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\refreshpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="squarified1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\squarified1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="redo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\redo.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="logical1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\logical1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="rotatecounterclockwise" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\rotatecounterclockwise.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="bo_unknown1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_unknown1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_reload" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_reload.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="bo_unknown" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_unknown.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="resetview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\resetview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="update" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\update.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="open26" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\open26.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="open25" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\open25.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_send4" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_send4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="up1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\up1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="actions_checkcircled1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_checkcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\up.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="togglefieldcodes" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\togglefieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="actions_arrow4down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_arrow4down.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="bo_unknown1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_unknown1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="bo_unknown2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_unknown2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="open3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\open3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="bo_sale" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_sale.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="actions_checkcircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_checkcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="actions_send5" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_send5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="wraptext" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\wraptext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -145,163 +211,133 @@
   <data name="tableproperties" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\tableproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_send3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_send3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="itemtypechecked" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="up1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\up1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="preview" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\preview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="bo_country" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_country.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="insertpagecount" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="tilelabels" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\tilelabels.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="actions_checkcircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_checkcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="togglefieldcodes" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\togglefieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="squarified" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\squarified.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="exporttopdf" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\exporttopdf.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="actions_reload" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_reload.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="open21" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\open21.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="parameters" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\parameters.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="bo_product" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_product.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="open3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\open3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="paymentrefund" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\paymentrefund.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="actions_deletecircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="bo_unknown" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_unknown.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="charthorizontalaxis_logscale" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\charthorizontalaxis_logscale.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="actions_arrow4down" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_arrow4down.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="deletetablerows" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\deletetablerows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="showallfieldcodes" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\showallfieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="open26" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\open26.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="up" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\up.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="singlepageview" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="open1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\open1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="export" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="new" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\new.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="bo_validation" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="rotatecounterclockwise" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\rotatecounterclockwise.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="actions_send2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="open27" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\open27.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="actions_checkcircled1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_checkcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="logical1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\logical1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="actions_send1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_send1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_delete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_send2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="followupall" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\followupall.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="open24" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\open24.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="actions_send5" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_send5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="icon_export" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="support" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\support.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="open22" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\open22.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="bo_unknown2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_unknown2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="import" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\import.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="open23" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\open23.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="charthorizontalaxis_logscale" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\charthorizontalaxis_logscale.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="insertpagenumber" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\insertpagenumber.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="pagesetup" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="open" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_send" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_send.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="open23" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\open23.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="resetview" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\resetview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_reload1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_reload1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="itemtypechecked" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="mailmergepreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mailmergepreview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="squarified1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\squarified1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="pagesetup" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="logical3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\logical3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="bo_validation" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="actions_deletecircled1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="singlepageview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="logical" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\logical.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="bo_product" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_product.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="paymentrefund" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\paymentrefund.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="squarified" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\squarified.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="support" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\support.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="followupall" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\followupall.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="actions_send3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_send3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="editquery" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="preview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\preview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="insertpagecount" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="exporttopdf" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\exporttopdf.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="open22" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\open22.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="import" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\import.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="open21" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\open21.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="actions_deletecircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="showallfieldcodes" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\showallfieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="open1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\open1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="highimportance" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\highimportance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="actions_addcircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_addcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="actions_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_delete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="actions_send4" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_send4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="logical2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\logical2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="export" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="open27" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\open27.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="new" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\new.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="actions_checkcircled2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_checkcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="highimportance1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\highimportance1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>

MultiTool.Form/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase

MultiTool.Form/My Project/licenses.licx

@@ -1,15 +1,16 @@
 DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

MultiTool.Form/MyApplication.vb

@@ -1,6 +1,6 @@
-Imports MultiTool.Shared
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Winline
+Imports MultiTool.Common
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Winline
 
 Namespace My
     <HideModuleName()>
@@ -9,8 +9,7 @@ Namespace My
         Friend Property MappingConfiguration As MappingConfig
         Friend Property MandatorConfiguration As MandatorConfig
         Friend Property GeneralConfiguration As GeneralConfig
+        Friend Property FilterConfiguration As FilterConfig
         Friend Property Winline As WinlineData
-
-        Public Property Helpers As Helpers
     End Module
 End Namespace

MultiTool.Form/Reports/OrderReport.Designer.vb

@@ -87,9 +87,9 @@ Partial Public Class OrderReport
         Me.XrTableCell18 = New DevExpress.XtraReports.UI.XRTableCell()
         Me.tableCell46 = New DevExpress.XtraReports.UI.XRTableCell()
         Me.XrTableCell8 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components)
         Me.GroupFooter1 = New DevExpress.XtraReports.UI.GroupFooterBand()
         Me.label2 = New DevExpress.XtraReports.UI.XRLabel()
+        Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components)
         CType(Me.XrTable2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.XrTable1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.table3, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -488,7 +488,7 @@ Partial Public Class OrderReport
         Me.tableCell31.Multiline = True
         Me.tableCell31.Name = "tableCell31"
         Me.tableCell31.StyleName = "DetailCaption2"
-        Me.tableCell31.Text = "Artikelnummer" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Lieferant"
+        Me.tableCell31.Text = "Positionstext"
         Me.tableCell31.Weight = 0.13529574805877542R
         '
         'XrTableCell13
@@ -688,11 +688,6 @@ Partial Public Class OrderReport
         Me.XrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight
         Me.XrTableCell8.Weight = 0.089263976911086243R
         '
-        'ObjectDataSource1
-        '
-        Me.ObjectDataSource1.DataSource = GetType(MultiTool.[Shared].Report.ReportSource)
-        Me.ObjectDataSource1.Name = "ObjectDataSource1"
-        '
         'GroupFooter1
         '
         Me.GroupFooter1.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.label2})
@@ -711,6 +706,11 @@ Partial Public Class OrderReport
         Me.label2.StylePriority.UseBackColor = False
         Me.label2.StylePriority.UseBorders = False
         '
+        'ObjectDataSource1
+        '
+        Me.ObjectDataSource1.DataSource = GetType(MultiTool.Common.Report.ReportSource)
+        Me.ObjectDataSource1.Name = "ObjectDataSource1"
+        '
         'OrderReport
         '
         Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.TopMargin, Me.BottomMargin, Me.ReportHeader, Me.Detail, Me.DetailReport})

MultiTool.Form/Resources/actions_addcircled.svg

@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Yellow{fill:#FFB115;}
+	.Black{fill:#727272;}
+	.Green{fill:#039C23;}
+	.Red{fill:#D11C1C;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+</style>
+  <g id="AddCircled">
+    <path d="M16,4C9.4,4,4,9.4,4,16s5.4,12,12,12s12-5.4,12-12S22.6,4,16,4z M24,18h-6v6h-4v-6H8v-4h6V8h4v6h6V18z" class="Green" />
+  </g>
+</svg>

MultiTool.Form/Resources/actions_checkcircled2.svg

@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Yellow{fill:#FFB115;}
+	.Black{fill:#727272;}
+	.Green{fill:#039C23;}
+	.Red{fill:#D11C1C;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+</style>
+  <g id="CheckCircled">
+    <path d="M16,4C9.4,4,4,9.4,4,16c0,6.6,5.4,12,12,12s12-5.4,12-12C28,9.4,22.6,4,16,4z M14,22l-6-6l2-2l4,4l8-8l2,2   L14,22z" class="Green" />
+  </g>
+</svg>

MultiTool.Form/Resources/actions_deletecircled1.svg

@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Yellow{fill:#FFB115;}
+	.Black{fill:#727272;}
+	.Green{fill:#039C23;}
+	.Red{fill:#D11C1C;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+</style>
+  <g id="DeleteCircled">
+    <path d="M16,4C9.4,4,4,9.4,4,16s5.4,12,12,12s12-5.4,12-12S22.6,4,16,4z M23.1,20.2l-2.8,2.8L16,18.8l-4.2,4.2   l-2.8-2.8l4.2-4.2l-4.2-4.2l2.8-2.8l4.2,4.2l4.2-4.2l2.8,2.8L18.8,16L23.1,20.2z" class="Red" />
+  </g>
+</svg>

MultiTool.Form/Resources/actions_reload1.svg

@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Yellow{fill:#FFB115;}
+	.Black{fill:#727272;}
+	.Green{fill:#039C23;}
+	.Red{fill:#D11C1C;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+</style>
+  <g id="Reload_1_">
+    <path d="M16,4c3.3,0,6.3,1.3,8.5,3.5L28,4v10h-0.2h-4.1H18l3.6-3.6C20.2,8.9,18.2,8,16,8c-4.4,0-8,3.6-8,8s3.6,8,8,8   c3.7,0,6.8-2.6,7.7-6h4.1c-1,5.7-5.9,10-11.8,10C9.4,28,4,22.6,4,16C4,9.4,9.4,4,16,4z" class="Green" />
+  </g>
+</svg>

MultiTool.Form/Resources/bo_sale.svg

@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.Green{fill:#039C23;}
+	.Black{fill:#727272;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{opacity:0.75;}
+	.st2{display:none;}
+	.st3{display:inline;fill:#FFB115;}
+	.st4{display:inline;}
+	.st5{display:inline;opacity:0.75;}
+	.st6{display:inline;opacity:0.5;}
+	.st7{display:inline;fill:#039C23;}
+	.st8{display:inline;fill:#D11C1C;}
+	.st9{display:inline;fill:#1177D7;}
+	.st10{display:inline;fill:#FFFFFF;}
+</style>
+  <g id="Sale">
+    <path d="M4,18V8H0V6h6v10h8.5c-0.5,0.6-0.9,1.3-1.3,2H4z M9,20c-1.7,0-3,1.3-3,3s1.3,3,3,3s3-1.3,3-3S10.7,20,9,20z" class="Black" />
+    <path d="M23,14c-5,0-9,4-9,9c0,5,4,9,9,9c5,0,9-4,9-9C32,18,28,14,23,14z M23,22c1.7,0,3,1.3,3,3   c0,1.3-0.8,2.4-2,2.8V29h-2v-1.2c-1.2-0.4-2-1.5-2-2.8h2c0,0.6,0.4,1,1,1c0.6,0,1-0.4,1-1s-0.4-1-1-1c-1.7,0-3-1.3-3-3   c0-1.3,0.8-2.4,2-2.8V17h2v1.2c1.2,0.4,2,1.5,2,2.8h-2c0-0.6-0.4-1-1-1c-0.6,0-1,0.4-1,1S22.4,22,23,22z" class="Green" />
+    <path d="M23,12c0.3,0,0.7,0,1,0.1V3c0-0.5-0.4-1-1-1H9C8.4,2,8,2.5,8,3v10c0,0.5,0.4,1,1,1h7.7   C18.5,12.7,20.6,12,23,12z" class="Yellow" />
+  </g>
+</svg>

MultiTool.Form/Resources/editquery.svg

@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.Black{fill:#727272;}
+	.Blue{fill:#1177D7;}
+	.White{fill:#FFFFFF;}
+	.Green{fill:#039C23;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+	.st2{opacity:0.25;}
+	.st3{fill:#FFB115;}
+</style>
+  <g />
+  <g id="EditQuery">
+    <g class="st1">
+      <path d="M0,24h8v-6H0V24z M20,8h8V2h-8V8z M18,21.2V18h-8v6h5.2L18,21.2z M20,10h8v1.2L23.2,16H20V10z" class="Black" />
+    </g>
+    <path d="M29,21l-8,8l-4-4l8-8L29,21z M30,20l1.7-1.7c0.4-0.4,0.4-1,0-1.3L29,14.3c-0.4-0.4-1-0.4-1.3,0L26,16L30,20z    M16,26v4h4L16,26z" class="Blue" />
+    <path d="M8,10H0v6h8V10z M8,2H0v6h8V2z M18,2h-8v6h8V2z M18,10h-8v6h8V10z" class="Green" />
+  </g>
+</svg>

MultiTool.Form/Resources/highimportance.svg

@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.Blue{fill:#1177D7;}
+	.Green{fill:#039C23;}
+	.Black{fill:#727272;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{display:none;}
+	.st2{display:inline;fill:#039C23;}
+	.st3{display:inline;fill:#D11C1C;}
+	.st4{display:inline;fill:#727272;}
+</style>
+  <g id="HighImportance">
+    <path d="M16,2C8.3,2,2,8.3,2,16s6.3,14,14,14s14-6.3,14-14S23.7,2,16,2z M16,24c-1.1,0-2-0.9-2-2s0.9-2,2-2s2,0.9,2,2   S17.1,24,16,24z M18,18h-4V8h4V18z" class="Red" />
+  </g>
+</svg>

MultiTool.Form/Resources/highimportance1.svg

@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.Blue{fill:#1177D7;}
+	.Green{fill:#039C23;}
+	.Black{fill:#727272;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{display:none;}
+	.st2{display:inline;fill:#039C23;}
+	.st3{display:inline;fill:#D11C1C;}
+	.st4{display:inline;fill:#727272;}
+</style>
+  <g id="HighImportance">
+    <path d="M16,2C8.3,2,2,8.3,2,16s6.3,14,14,14s14-6.3,14-14S23.7,2,16,2z M16,24c-1.1,0-2-0.9-2-2s0.9-2,2-2s2,0.9,2,2   S17.1,24,16,24z M18,18h-4V8h4V18z" class="Red" />
+  </g>
+</svg>

MultiTool.Form/Resources/logical2.svg

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Logical" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+</style>
+  <path d="M5,4h23V3c0-0.6-0.4-1-1-1H5C3.3,2,2,3.3,2,5v22c0,1.7,1.3,3,3,3h22c0.6,0,1-0.4,1-1V6H5C4.4,6,4,5.6,4,5  C4,4.4,4.4,4,5,4z M16,24h-2v-2h2V24z M11.6,14.4c0.2-0.5,0.4-0.9,0.7-1.3c0.3-0.4,0.7-0.6,1.1-0.8c0.4-0.2,0.9-0.3,1.5-0.3  c0.7,0,1.3,0.1,1.8,0.3c0.5,0.2,0.9,0.5,1.2,0.8c0.3,0.3,0.5,0.7,0.6,1c0.1,0.4,0.2,0.7,0.2,1c0,0.4,0,0.7-0.1,1  c-0.1,0.3-0.2,0.5-0.3,0.8c-0.1,0.2-0.3,0.4-0.4,0.6c-0.2,0.2-0.3,0.3-0.5,0.4c-0.2,0.1-0.3,0.3-0.5,0.4c-0.2,0.1-0.3,0.3-0.4,0.4  c-0.1,0.1-0.3,0.3-0.4,0.5c-0.1,0.2-0.2,0.4-0.2,0.6v0.6h-2v-0.7c0-0.4,0.1-0.7,0.1-0.9c0.1-0.3,0.2-0.5,0.3-0.7  c0.1-0.2,0.3-0.4,0.4-0.5c0.1-0.1,0.3-0.3,0.4-0.4s0.3-0.3,0.4-0.4c0.1-0.1,0.2-0.2,0.3-0.4c0.1-0.1,0.2-0.3,0.2-0.5  c0.1-0.2,0.1-0.4,0.1-0.6c0-0.5-0.1-0.9-0.3-1.1c-0.2-0.2-0.5-0.4-0.9-0.4c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.1-0.4,0.3-0.5,0.5  c-0.1,0.2-0.2,0.4-0.3,0.7c-0.1,0.2-0.1,0.5-0.1,0.8h-2.2C11.4,15.4,11.4,14.9,11.6,14.4z" class="Blue" />
+</svg>

MultiTool.Form/Resources/logical3.svg

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Logical" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+</style>
+  <path d="M5,4h23V3c0-0.6-0.4-1-1-1H5C3.3,2,2,3.3,2,5v22c0,1.7,1.3,3,3,3h22c0.6,0,1-0.4,1-1V6H5C4.4,6,4,5.6,4,5  C4,4.4,4.4,4,5,4z M16,24h-2v-2h2V24z M11.6,14.4c0.2-0.5,0.4-0.9,0.7-1.3c0.3-0.4,0.7-0.6,1.1-0.8c0.4-0.2,0.9-0.3,1.5-0.3  c0.7,0,1.3,0.1,1.8,0.3c0.5,0.2,0.9,0.5,1.2,0.8c0.3,0.3,0.5,0.7,0.6,1c0.1,0.4,0.2,0.7,0.2,1c0,0.4,0,0.7-0.1,1  c-0.1,0.3-0.2,0.5-0.3,0.8c-0.1,0.2-0.3,0.4-0.4,0.6c-0.2,0.2-0.3,0.3-0.5,0.4c-0.2,0.1-0.3,0.3-0.5,0.4c-0.2,0.1-0.3,0.3-0.4,0.4  c-0.1,0.1-0.3,0.3-0.4,0.5c-0.1,0.2-0.2,0.4-0.2,0.6v0.6h-2v-0.7c0-0.4,0.1-0.7,0.1-0.9c0.1-0.3,0.2-0.5,0.3-0.7  c0.1-0.2,0.3-0.4,0.4-0.5c0.1-0.1,0.3-0.3,0.4-0.4s0.3-0.3,0.4-0.4c0.1-0.1,0.2-0.2,0.3-0.4c0.1-0.1,0.2-0.3,0.2-0.5  c0.1-0.2,0.1-0.4,0.1-0.6c0-0.5-0.1-0.9-0.3-1.1c-0.2-0.2-0.5-0.4-0.9-0.4c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.1-0.4,0.3-0.5,0.5  c-0.1,0.2-0.2,0.4-0.3,0.7c-0.1,0.2-0.1,0.5-0.1,0.8h-2.2C11.4,15.4,11.4,14.9,11.6,14.4z" class="Blue" />
+</svg>

MultiTool.Form/Resources/refreshpivottable.svg

@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Refresh" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Black{fill:#727272;}
+	.Green{fill:#039C23;}
+	.st0{opacity:0.5;}
+</style>
+  <g class="st0">
+    <path d="M10,10H6V6h4V10z M24,6H12v4h12V6z M10,12H6v12h4V12z" class="Blue" />
+  </g>
+  <path d="M30,16v6h-0.1h-2H24l2.5-2.5C25.6,18.6,24.4,18,23,18c-2.4,0-4.4,1.7-4.9,4h-2c0.5-3.4,3.4-6,6.9-6  c1.9,0,3.7,0.8,4.9,2.1L30,16z M23,28c-1.4,0-2.6-0.6-3.5-1.5L22,24h-3.9h-2H16v6l2.1-2.1c1.3,1.3,3,2.1,4.9,2.1  c3.5,0,6.4-2.6,6.9-6h-2C27.4,26.3,25.4,28,23,28z" class="Green" />
+  <path d="M27,2H3C2.4,2,2,2.4,2,3v24c0,0.6,0.4,1,1,1h11v-2H4V4h22v10.5c0.7,0.3,1.4,0.6,2,1V3C28,2.4,27.6,2,27,2z" class="Black" />
+</svg>

MultiTool.Form/Resources/update.svg

@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.Black{fill:#727272;}
+	.Blue{fill:#1177D7;}
+	.White{fill:#FFFFFF;}
+	.Green{fill:#039C23;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+	.st2{opacity:0.25;}
+	.st3{fill:#FFB115;}
+</style>
+  <g />
+  <g id="Update">
+    <g class="st1">
+      <path d="M16,6h-6V2h6V6z M16,8h-6v4h6V8z M24,2h-6v4h6V2z M24,12V8h-6v4H24z M2,6h6V2H2V6z M2,18h6v-4H2V18z M16,14    L16,14l-6,0v4h2.8C13.5,16.4,14.6,15,16,14z M2,12h6V8H2V12z" class="Black" />
+    </g>
+    <path d="M27.7,20h2H30v-6l-2.3,2.3C26.2,14.9,24.2,14,22,14c-4.4,0-8,3.6-8,8c0,4.4,3.6,8,8,8s8-3.6,8-8h-2   c0,3.3-2.7,6-6,6s-6-2.7-6-6s2.7-6,6-6c1.7,0,3.2,0.7,4.2,1.8L24,20H27.7z" class="Green" />
+  </g>
+</svg>

MultiTool.Form/Strings/frmImportMainExtra.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
     Friend Class frmImportMainExtra
@@ -64,6 +64,15 @@ Namespace My.Resources
             End Set
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die {0} Dateien erfolgreich in die Winline übertragen! ähnelt.
+        '''</summary>
+        Friend Shared ReadOnly Property _0__Dateien_erfolgreich_in_die_Winline_übertragen_() As String
+            Get
+                Return ResourceManager.GetString("{0} Dateien erfolgreich in die Winline übertragen!", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die {0} Dateien geladen ähnelt.
         '''</summary>

MultiTool.Form/Strings/frmImportMainExtra.resx

@@ -195,6 +195,9 @@
   <data name="Zur Zeit werden nur bis zu 4 Tabellen unterstützt!" xml:space="preserve">
     <value>Zur Zeit werden nur bis zu 4 Tabellen unterstützt!</value>
   </data>
+  <data name="{0} Dateien erfolgreich in die Winline übertragen!" xml:space="preserve">
+    <value>{0} Dateien erfolgreich in die Winline übertragen!</value>
+  </data>
   <data name="{0} Dateien geladen" xml:space="preserve">
     <value>{0} Dateien geladen</value>
   </data>

MultiTool.Form/Strings/frmMainExtra.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
     Friend Class frmMainExtra

MultiTool.Form/Strings/frmRowEditorExtra.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
     Friend Class frmRowEditorExtra
@@ -65,7 +65,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Datumswert für &apos;{oField.Key}&apos; enthält einen ungüligen Wert. Bitte benutzen Sie das Format &apos;YYYY-MM-DD&apos;. ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Datumswert für &apos;{0}&apos; enthält einen ungüligen Wert. Bitte benutzen Sie das Format &apos;YYYY-MM-DD&apos;. ähnelt.
         '''</summary>
         Friend Shared ReadOnly Property Datumswert_für___0___enthält_einen_ungüligen_Wert() As String
             Get

MultiTool.Form/Strings/frmRowEditorExtra.resx

@@ -118,6 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Datumswert für '{0}' enthält einen ungüligen Wert" xml:space="preserve">
-    <value>Datumswert für '{oField.Key}' enthält einen ungüligen Wert. Bitte benutzen Sie das Format 'YYYY-MM-DD'.</value>
+    <value>Datumswert für '{0}' enthält einen ungüligen Wert. Bitte benutzen Sie das Format 'YYYY-MM-DD'.</value>
   </data>
 </root>

MultiTool.Form/Strings/frmShared.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
     Friend Class frmShared

MultiTool.Form/Strings/frmShared.en.resx

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Auswahl der Vorlage" xml:space="preserve">
+    <value>Selection of Template</value>
+  </data>
+  <data name="In der Funktion '{0}' ist folgender Fehler aufgetreten: {1}" xml:space="preserve">
+    <value>The following error occurred in Function '{0}': {1}</value>
+  </data>
+  <data name="Laden des Formulars" xml:space="preserve">
+    <value>Form Load</value>
+  </data>
+  <data name="{0} - WebService Multitool für WinLine" xml:space="preserve">
+    <value>{0} - WebService Multitool for WinLine</value>
+  </data>
+</root>

MultiTool.Form/frmConfig.resx

@@ -118,18 +118,18 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="TBEDIXMLITEMSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>313, 17</value>
+    <value>136, 17</value>
   </metadata>
   <metadata name="DS_DD_ECM.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>194, 17</value>
+    <value>17, 17</value>
   </metadata>
-  <metadata name="TBEDI_XML_CONFIGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>758, 17</value>
+  <metadata name="TBMT_TABLESBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1210, 16</value>
   </metadata>
   <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -143,13 +143,22 @@
         IC8+DQo8L3N2Zz4L
 </value>
   </data>
-  <metadata name="TBEDI_XML_ITEMSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>533, 17</value>
+  <metadata name="TBMT_CONFIGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>613, 17</value>
   </metadata>
-  <metadata name="TBEDI_XML_CONFIGTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>999, 17</value>
+  <metadata name="TBMT_TEMPLATE_ITEMSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>356, 17</value>
+  </metadata>
+  <metadata name="TBMT_CONFIGTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>824, 17</value>
   </metadata>
   <metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1234, 17</value>
+    <value>1029, 17</value>
+  </metadata>
+  <metadata name="TBMT_TABLESTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 56</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>121</value>
   </metadata>
 </root>

MultiTool.Form/frmConfig.vb

@@ -1,51 +1,225 @@
 Imports System.Data.SqlClient
+Imports DevExpress.XtraGrid
+Imports DevExpress.XtraGrid.Views.Grid
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Base
+Imports DigitalData.GUIs.Common
 
 Public Class frmConfig
-    Private ReadOnly ConfigManager As ConfigManager(Of MultiTool.Shared.Config)
-    Private ReadOnly FormHelper As FormHelper
 
-    Private ReadOnly Property Config As MultiTool.Shared.Config
+    Private ReadOnly TBMT_CONFIG_GENERAL As New DS_DD_ECM.TBMT_CONFIGDataTable
+    Private ReadOnly ConfigManager As ConfigManager(Of MultiTool.Common.Config)
+    Private ReadOnly FormHelper As FormHelper
+    Private ReadOnly GridBuilder As GridBuilder
+
+    Private BindingSource As BindingSource = TBEDIXMLITEMSBindingSource
+    Private View As GridView = GridViewItems
+    Private Logger As Logger
+    Private FormLoading As Boolean = True
+
+
+    Private ReadOnly Property Config As Common.Config
         Get
             Return ConfigManager?.Config
         End Get
     End Property
 
-    Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of MultiTool.Shared.Config))
+    Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Common.Config))
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()
 
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
         FormHelper = New FormHelper(pLogConfig, Me)
         ConfigManager = pConfigManager
+        GridBuilder = New GridBuilder(GridViewTables, GridViewItems)
+        Logger = pLogConfig.GetLogger()
     End Sub
 
     Private Sub frmConfig_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        Try
+            GridBuilder.WithDefaults()
+            GridBuilder.WithReadOnlyOptions(GridViewTables)
 
-        Dim oConnectionString = MSSQLServer.DecryptConnectionString(Config.ConnectionString)
-        Dim oBuilder As New SqlConnectionStringBuilder(oConnectionString) With {
-            .InitialCatalog = "DD_ECM"
-        }
+            Dim oConnectionString = MSSQLServer.DecryptConnectionString(Config.ConnectionString)
+            Dim oBuilder As New SqlConnectionStringBuilder(oConnectionString) With {
+                .InitialCatalog = "DD_ECM"
+            }
+            oConnectionString = oBuilder.ToString()
+            Logger.Debug("Connection String: [{0}]", oConnectionString)
 
-        TBEDI_XML_TEMPLATE_ITEMSTableAdapter.Connection.ConnectionString = oBuilder.ToString()
-        TBEDI_XML_TEMPLATE_ITEMSTableAdapter.Fill(Me.DS_DD_ECM.TBEDI_XML_TEMPLATE_ITEMS)
+            Logger.Debug("Setting default values")
+            DS_DD_ECM.TBMT_CONFIG.ADDED_WHOColumn.DefaultValue = Environment.UserName
+            DS_DD_ECM.TBMT_CONFIG.CHANGED_WHOColumn.DefaultValue = Environment.UserName
+            DS_DD_ECM.TBMT_TEMPLATE_ITEMS.ADDED_WHOColumn.DefaultValue = Environment.UserName
+            DS_DD_ECM.TBMT_TEMPLATE_ITEMS.CHANGED_WHOColumn.DefaultValue = Environment.UserName
 
-        TBEDI_XML_CONFIGTableAdapter.Connection.ConnectionString = oBuilder.ToString()
-        TBEDI_XML_CONFIGTableAdapter.Fill(Me.DS_DD_ECM.TBEDI_XML_CONFIG)
+            Logger.Debug("Initializing Tables Adapter")
+            TBMT_TABLESTableAdapter.Connection.ConnectionString = oConnectionString
+
+            Logger.Debug("Initializing Templates Adapter")
+            TBMT_TEMPLATE_ITEMSTableAdapter.Connection.ConnectionString = oConnectionString
+
+            Logger.Debug("Initializing Config Adapter")
+            TBMT_CONFIGTableAdapter.Connection.ConnectionString = oConnectionString
+
+            Logger.Debug("Loading Data from Adapters")
+            TBMT_TABLESTableAdapter.Fill(DS_DD_ECM.TBMT_TABLES)
+            TBMT_CONFIGTableAdapter.Fill(DS_DD_ECM.TBMT_CONFIG)
+            TBMT_CONFIGTableAdapter.FillGeneral(TBMT_CONFIG_GENERAL)
+
+            Logger.Debug("Loading general config")
+            LoadGeneralConfig(TBMT_CONFIG_GENERAL)
+
+            BindingSource = TBEDIXMLITEMSBindingSource
+
+            FormLoading = False
+
+            GridViewItems.FocusedRowHandle = GridControl.InvalidRowHandle
+        Catch ex As Exception
+            Logger.Error(ex)
+            FormHelper.ShowError(ex, "Laden des Formulars")
+        End Try
+    End Sub
+
+    Private Sub LoadGeneralConfig(TBMT_CONFIG_GENERAL As DS_DD_ECM.TBMT_CONFIGDataTable)
+        For Each oRow As DataRow In TBMT_CONFIG_GENERAL.Rows
+            Dim oConfigKey = oRow.ItemEx("KEY", "")
+            Dim oConfigValue = oRow.ItemEx("VALUE", "")
+
+            Select Case oConfigKey
+                Case "YEAR_OVERRIDE"
+                    txtYearOverride.EditValue = oConfigValue
+
+                Case "WEBSERVICE_BASEURL"
+                    txtWebserviceBaseurl.EditValue = oConfigValue
+
+                Case "WEBSERVICE_USERNAME"
+                    txtWebserviceUsername.EditValue = oConfigValue
+
+                Case "WEBSERIVCE_PASSWORD"
+                    txtWebservicePassword.EditValue = oConfigValue
+
+                Case "WEBSERVICE_IMPORT_BASE_PATH"
+                    txtWebserviceImportBasePath.EditValue = oConfigValue
+
+                Case "WEBSERVICE_IMPORT_RELATIVE_PATH"
+                    txtWebserviceImportRelativePath.EditValue = oConfigValue
+
+            End Select
+        Next
+    End Sub
+
+    Private Sub SaveGeneralConfig(TBMT_CONFIG_GENERAL As DS_DD_ECM.TBMT_CONFIGDataTable)
+        For Each oRow As DataRow In TBMT_CONFIG_GENERAL.Rows
+            Dim oConfigKey = oRow.ItemEx("KEY", "")
+
+            Select Case oConfigKey
+                Case "YEAR_OVERRIDE"
+                    oRow.Item("VALUE") = txtYearOverride.EditValue
+
+                Case "WEBSERVICE_BASEURL"
+                    oRow.Item("VALUE") = txtWebserviceBaseurl.EditValue
+
+                Case "WEBSERVICE_USERNAME"
+                    oRow.Item("VALUE") = txtWebserviceUsername.EditValue
+
+                Case "WEBSERIVCE_PASSWORD"
+                    oRow.Item("VALUE") = txtWebservicePassword.EditValue
+
+                Case "WEBSERVICE_IMPORT_BASE_PATH"
+                    oRow.Item("VALUE") = txtWebserviceImportBasePath.EditValue
+
+                Case "WEBSERVICE_IMPORT_RELATIVE_PATH"
+                    oRow.Item("VALUE") = txtWebserviceImportRelativePath.EditValue
+
+            End Select
+        Next
+    End Sub
+
+    Private Sub Save()
+        GridViewItems.PostEditor()
+        TBMT_CONFIGTableAdapter.Update(DS_DD_ECM.TBMT_CONFIG)
+        DS_DD_ECM.TBMT_CONFIG.AcceptChanges()
+
+        GridViewConfig.PostEditor()
+        TBMT_TEMPLATE_ITEMSTableAdapter.Update(DS_DD_ECM.TBMT_TEMPLATE_ITEMS)
+        DS_DD_ECM.TBMT_TEMPLATE_ITEMS.AcceptChanges()
+
+        TBMT_CONFIG_GENERAL.AcceptChanges()
+        SaveGeneralConfig(TBMT_CONFIG_GENERAL)
+        TBMT_CONFIGTableAdapter.Update(TBMT_CONFIG_GENERAL)
     End Sub
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
         Try
-            TBEDI_XML_CONFIGBindingSource.EndEdit()
-            TBEDI_XML_CONFIGTableAdapter.Update(DS_DD_ECM.TBEDI_XML_CONFIG)
-
+            TBMT_CONFIGBindingSource.EndEdit()
             TBEDIXMLITEMSBindingSource.EndEdit()
-            TBEDI_XML_TEMPLATE_ITEMSTableAdapter.Update(DS_DD_ECM.TBEDI_XML_TEMPLATE_ITEMS)
+
+            Save()
         Catch ex As Exception
             FormHelper.ShowError(ex, "Speichern der Konfiguration")
         End Try
+    End Sub
 
+    Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+        BindingSource?.AddNew()
+    End Sub
+
+    Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged
+        Select Case e.Page.Name
+            Case tabPageSchema.Name
+                BindingSource = TBEDIXMLITEMSBindingSource
+                View = GridViewItems
+
+            Case tabPageConfig.Name
+                BindingSource = TBMT_CONFIGBindingSource
+                View = GridViewConfig
+
+        End Select
+    End Sub
+
+    Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick
+        If View.FocusedRowHandle <> GridControl.InvalidRowHandle Then
+            Dim oResult = MsgBox("Wollen Sie den ausgewählten Eintrag löschen?", MsgBoxStyle.Question Or MsgBoxStyle.YesNo, "Eintrag löschen?")
+
+            If oResult = MsgBoxResult.Yes Then
+                Dim oRow As DataRow = View.GetDataRow(View.FocusedRowHandle)
+                BindingSource.RemoveCurrent()
+                BindingSource.EndEdit()
+
+                Save()
+
+            End If
+        End If
+    End Sub
+
+    Private Sub GridViewTables_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles GridViewTables.FocusedRowChanged
+        Try
+            If FormLoading Then
+                Logger.Debug("Form still loading. Exiting.")
+                Exit Sub
+            End If
+
+            If GridViewTables.FocusedRowHandle < 0 Then
+                Logger.Debug("No row selected. Exiting.")
+                Exit Sub
+            End If
+
+            Dim oRow As DataRow = GridViewTables.GetDataRow(GridViewTables.FocusedRowHandle)
+
+            If oRow Is Nothing Then
+                Logger.Debug("Invalid row handle. Exiting.")
+                Exit Sub
+            End If
+
+            Dim oTableId = oRow.Item("GUID")
+            Logger.Debug("Loading Items for Table [{0}]", oTableId)
+            TBMT_TEMPLATE_ITEMSTableAdapter.Fill(DS_DD_ECM.TBMT_TEMPLATE_ITEMS, oTableId)
+        Catch ex As Exception
+            Logger.Error(ex)
+            FormHelper.ShowError(ex, "Laden der Tabelle")
+        End Try
     End Sub
 End Class

MultiTool.Form/frmExportMain.Designer.vb

@@ -26,10 +26,11 @@ Partial Class frmExportMain
         Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
         Me.txtResults = New DevExpress.XtraBars.BarStaticItem()
-        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnExport = New DevExpress.XtraBars.BarButtonItem()
         Me.btnOpenInputDirectory = New DevExpress.XtraBars.BarButtonItem()
         Me.btnOpenOutputDirectory = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -43,6 +44,7 @@ Partial Class frmExportMain
         Me.RepositoryItemImageComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox()
         Me.BooleanImages = New DevExpress.Utils.SvgImageCollection(Me.components)
         Me.colNumber = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colDocumentKind = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colAccount = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colDate = New DevExpress.XtraGrid.Columns.GridColumn()
@@ -58,27 +60,31 @@ Partial Class frmExportMain
         Me.GridLookUpEdit1View = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.colName = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colId = New DevExpress.XtraGrid.Columns.GridColumn()
-        Me.dateDocDate = New DevExpress.XtraEditors.DateEdit()
+        Me.dateDocDateFrom = New DevExpress.XtraEditors.DateEdit()
         Me.lookupAccount = New DevExpress.XtraEditors.GridLookUpEdit()
         Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn()
-        Me.lookupDocumentKind = New DevExpress.XtraEditors.GridLookUpEdit()
-        Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView()
-        Me.GridColumn3 = New DevExpress.XtraGrid.Columns.GridColumn()
-        Me.GridColumn4 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.chkShowExported = New DevExpress.XtraEditors.CheckEdit()
-        Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit()
-        Me.TextEdit2 = New DevExpress.XtraEditors.TextEdit()
+        Me.txtDocumentFrom = New DevExpress.XtraEditors.TextEdit()
+        Me.txtDocumentTo = New DevExpress.XtraEditors.TextEdit()
+        Me.dateDocDateTo = New DevExpress.XtraEditors.DateEdit()
+        Me.comboDocumentType = New DevExpress.XtraEditors.GridLookUpEdit()
+        Me.GridView3 = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.comboDocumentKind = New DevExpress.XtraEditors.CheckedComboBoxEdit()
+        Me.comboYear = New DevExpress.XtraEditors.ComboBoxEdit()
         Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
         Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem()
         Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LabelControl2 = New DevExpress.XtraEditors.LabelControl()
         Me.colName2 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colId2 = New DevExpress.XtraGrid.Columns.GridColumn()
@@ -100,32 +106,39 @@ Partial Class frmExportMain
         Me.LayoutControl1.SuspendLayout()
         CType(Me.lookupMandator.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridLookUpEdit1View, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.dateDocDate.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.dateDocDate.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.dateDocDateFrom.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.dateDocDateFrom.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lookupAccount.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lookupDocumentKind.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.chkShowExported.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtDocumentFrom.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtDocumentTo.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.dateDocDateTo.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.dateDocDateTo.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.comboDocumentType.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.comboDocumentKind.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.comboYear.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.txtResults, Me.BarButtonItem2, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.BarButtonItem3})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.txtResults, Me.btnExport, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.BarButtonItem3, Me.BarButtonItem4})
         Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 9
+        Me.RibbonControl1.MaxItemId = 10
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3})
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -136,7 +149,7 @@ Partial Class frmExportMain
         '
         'BarButtonItem1
         '
-        Me.BarButtonItem1.Caption = "Daten laden"
+        Me.BarButtonItem1.Caption = "Daten laden (F5)"
         Me.BarButtonItem1.Id = 3
         Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.icon_export
         Me.BarButtonItem1.Name = "BarButtonItem1"
@@ -149,16 +162,17 @@ Partial Class frmExportMain
         Me.txtResults.Name = "txtResults"
         Me.txtResults.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         '
-        'BarButtonItem2
+        'btnExport
         '
-        Me.BarButtonItem2.Caption = "Ausgewählte Zeilen Exportieren"
-        Me.BarButtonItem2.Id = 5
-        Me.BarButtonItem2.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send5
-        Me.BarButtonItem2.Name = "BarButtonItem2"
+        Me.btnExport.Caption = "Ausgewählte Zeilen Exportieren"
+        Me.btnExport.Id = 5
+        Me.btnExport.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send5
+        Me.btnExport.Name = "btnExport"
         '
         'btnOpenInputDirectory
         '
         Me.btnOpenInputDirectory.Caption = "Eingangsverzeichnis öffnen"
+        Me.btnOpenInputDirectory.Enabled = False
         Me.btnOpenInputDirectory.Id = 6
         Me.btnOpenInputDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open27
         Me.btnOpenInputDirectory.Name = "btnOpenInputDirectory"
@@ -177,6 +191,13 @@ Partial Class frmExportMain
         Me.BarButtonItem3.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open3
         Me.BarButtonItem3.Name = "BarButtonItem3"
         '
+        'BarButtonItem4
+        '
+        Me.BarButtonItem4.Caption = "Logverzeichnis öffnen"
+        Me.BarButtonItem4.Id = 9
+        Me.BarButtonItem4.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.logical3
+        Me.BarButtonItem4.Name = "BarButtonItem4"
+        '
         'RibbonPage1
         '
         Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2})
@@ -192,7 +213,7 @@ Partial Class frmExportMain
         'RibbonPageGroup2
         '
         Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2)
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.btnExport)
         Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
         Me.RibbonPageGroup2.Text = "Export"
         '
@@ -207,6 +228,7 @@ Partial Class frmExportMain
         Me.RibbonPageGroup3.ItemLinks.Add(Me.btnOpenInputDirectory)
         Me.RibbonPageGroup3.ItemLinks.Add(Me.btnOpenOutputDirectory)
         Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem3)
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem4)
         Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
         Me.RibbonPageGroup3.Text = "Verzeichnisse"
         '
@@ -237,12 +259,13 @@ Partial Class frmExportMain
         '
         'GridViewDocuments
         '
-        Me.GridViewDocuments.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colImported, Me.colNumber, Me.colAccount, Me.GridColumn7, Me.colDate, Me.GridColumn5, Me.GridColumn6, Me.GridColumn8, Me.GridColumn9, Me.GridColumn10})
+        Me.GridViewDocuments.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colImported, Me.colNumber, Me.colDocumentKind, Me.colAccount, Me.GridColumn7, Me.colDate, Me.GridColumn5, Me.GridColumn6, Me.GridColumn8, Me.GridColumn9, Me.GridColumn10})
         Me.GridViewDocuments.GridControl = Me.GridControlDocuments
         Me.GridViewDocuments.Name = "GridViewDocuments"
         Me.GridViewDocuments.OptionsSelection.CheckBoxSelectorField = "IsSelected"
         Me.GridViewDocuments.OptionsSelection.MultiSelect = True
         Me.GridViewDocuments.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect
+        Me.GridViewDocuments.SortInfo.AddRange(New DevExpress.XtraGrid.Columns.GridColumnSortInfo() {New DevExpress.XtraGrid.Columns.GridColumnSortInfo(Me.colNumber, DevExpress.Data.ColumnSortOrder.Descending)})
         '
         'colImported
         '
@@ -286,13 +309,21 @@ Partial Class frmExportMain
         Me.colNumber.VisibleIndex = 2
         Me.colNumber.Width = 138
         '
+        'colDocumentKind
+        '
+        Me.colDocumentKind.Caption = "Belegart"
+        Me.colDocumentKind.FieldName = "DOCUMENT_KIND"
+        Me.colDocumentKind.Name = "colDocumentKind"
+        Me.colDocumentKind.Visible = True
+        Me.colDocumentKind.VisibleIndex = 3
+        '
         'colAccount
         '
         Me.colAccount.Caption = "Konto"
         Me.colAccount.FieldName = "AccountName"
         Me.colAccount.Name = "colAccount"
         Me.colAccount.Visible = True
-        Me.colAccount.VisibleIndex = 3
+        Me.colAccount.VisibleIndex = 4
         Me.colAccount.Width = 138
         '
         'GridColumn7
@@ -301,7 +332,7 @@ Partial Class frmExportMain
         Me.GridColumn7.FieldName = "RunningNumber"
         Me.GridColumn7.Name = "GridColumn7"
         Me.GridColumn7.Visible = True
-        Me.GridColumn7.VisibleIndex = 4
+        Me.GridColumn7.VisibleIndex = 5
         Me.GridColumn7.Width = 94
         '
         'colDate
@@ -310,7 +341,7 @@ Partial Class frmExportMain
         Me.colDate.FieldName = "Date"
         Me.colDate.Name = "colDate"
         Me.colDate.Visible = True
-        Me.colDate.VisibleIndex = 5
+        Me.colDate.VisibleIndex = 6
         Me.colDate.Width = 138
         '
         'GridColumn5
@@ -319,7 +350,7 @@ Partial Class frmExportMain
         Me.GridColumn5.FieldName = "NetAmount"
         Me.GridColumn5.Name = "GridColumn5"
         Me.GridColumn5.Visible = True
-        Me.GridColumn5.VisibleIndex = 6
+        Me.GridColumn5.VisibleIndex = 7
         Me.GridColumn5.Width = 94
         '
         'GridColumn6
@@ -328,7 +359,7 @@ Partial Class frmExportMain
         Me.GridColumn6.FieldName = "GrossAmount"
         Me.GridColumn6.Name = "GridColumn6"
         Me.GridColumn6.Visible = True
-        Me.GridColumn6.VisibleIndex = 7
+        Me.GridColumn6.VisibleIndex = 8
         Me.GridColumn6.Width = 118
         '
         'GridColumn8
@@ -339,7 +370,7 @@ Partial Class frmExportMain
         Me.GridColumn8.Name = "GridColumn8"
         Me.GridColumn8.UnboundDataType = GetType(Date)
         Me.GridColumn8.Visible = True
-        Me.GridColumn8.VisibleIndex = 9
+        Me.GridColumn8.VisibleIndex = 10
         '
         'RepositoryItemDateEdit1
         '
@@ -355,7 +386,7 @@ Partial Class frmExportMain
         Me.GridColumn9.FieldName = "ExportedWho"
         Me.GridColumn9.Name = "GridColumn9"
         Me.GridColumn9.Visible = True
-        Me.GridColumn9.VisibleIndex = 8
+        Me.GridColumn9.VisibleIndex = 9
         '
         'GridColumn10
         '
@@ -363,7 +394,7 @@ Partial Class frmExportMain
         Me.GridColumn10.FieldName = "FilenameExport"
         Me.GridColumn10.Name = "GridColumn10"
         Me.GridColumn10.Visible = True
-        Me.GridColumn10.VisibleIndex = 10
+        Me.GridColumn10.VisibleIndex = 11
         '
         'SplitContainerControl1
         '
@@ -388,12 +419,15 @@ Partial Class frmExportMain
         'LayoutControl1
         '
         Me.LayoutControl1.Controls.Add(Me.lookupMandator)
-        Me.LayoutControl1.Controls.Add(Me.dateDocDate)
+        Me.LayoutControl1.Controls.Add(Me.dateDocDateFrom)
         Me.LayoutControl1.Controls.Add(Me.lookupAccount)
-        Me.LayoutControl1.Controls.Add(Me.lookupDocumentKind)
         Me.LayoutControl1.Controls.Add(Me.chkShowExported)
-        Me.LayoutControl1.Controls.Add(Me.TextEdit1)
-        Me.LayoutControl1.Controls.Add(Me.TextEdit2)
+        Me.LayoutControl1.Controls.Add(Me.txtDocumentFrom)
+        Me.LayoutControl1.Controls.Add(Me.txtDocumentTo)
+        Me.LayoutControl1.Controls.Add(Me.dateDocDateTo)
+        Me.LayoutControl1.Controls.Add(Me.comboDocumentType)
+        Me.LayoutControl1.Controls.Add(Me.comboDocumentKind)
+        Me.LayoutControl1.Controls.Add(Me.comboYear)
         Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.LayoutControl1.Location = New System.Drawing.Point(0, 0)
         Me.LayoutControl1.Name = "LayoutControl1"
@@ -404,14 +438,14 @@ Partial Class frmExportMain
         '
         'lookupMandator
         '
-        Me.lookupMandator.Location = New System.Drawing.Point(85, 15)
+        Me.lookupMandator.Location = New System.Drawing.Point(112, 15)
         Me.lookupMandator.MenuManager = Me.RibbonControl1
         Me.lookupMandator.Name = "lookupMandator"
         Me.lookupMandator.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
         Me.lookupMandator.Properties.NullText = ""
         Me.lookupMandator.Properties.PopupSizeable = False
         Me.lookupMandator.Properties.PopupView = Me.GridLookUpEdit1View
-        Me.lookupMandator.Size = New System.Drawing.Size(198, 20)
+        Me.lookupMandator.Size = New System.Drawing.Size(171, 20)
         Me.lookupMandator.StyleController = Me.LayoutControl1
         Me.lookupMandator.TabIndex = 4
         '
@@ -439,30 +473,30 @@ Partial Class frmExportMain
         Me.colId.Visible = True
         Me.colId.VisibleIndex = 1
         '
-        'dateDocDate
+        'dateDocDateFrom
         '
-        Me.dateDocDate.EditValue = Nothing
-        Me.dateDocDate.Location = New System.Drawing.Point(85, 165)
-        Me.dateDocDate.MenuManager = Me.RibbonControl1
-        Me.dateDocDate.Name = "dateDocDate"
-        Me.dateDocDate.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
-        Me.dateDocDate.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
-        Me.dateDocDate.Properties.CharacterCasing = System.Windows.Forms.CharacterCasing.Lower
-        Me.dateDocDate.Properties.SelectionMode = DevExpress.XtraEditors.Repository.CalendarSelectionMode.Multiple
-        Me.dateDocDate.Size = New System.Drawing.Size(198, 20)
-        Me.dateDocDate.StyleController = Me.LayoutControl1
-        Me.dateDocDate.TabIndex = 5
+        Me.dateDocDateFrom.EditValue = Nothing
+        Me.dateDocDateFrom.Location = New System.Drawing.Point(112, 225)
+        Me.dateDocDateFrom.MenuManager = Me.RibbonControl1
+        Me.dateDocDateFrom.Name = "dateDocDateFrom"
+        Me.dateDocDateFrom.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.dateDocDateFrom.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.dateDocDateFrom.Properties.CharacterCasing = System.Windows.Forms.CharacterCasing.Lower
+        Me.dateDocDateFrom.Properties.SelectionMode = DevExpress.XtraEditors.Repository.CalendarSelectionMode.Multiple
+        Me.dateDocDateFrom.Size = New System.Drawing.Size(171, 20)
+        Me.dateDocDateFrom.StyleController = Me.LayoutControl1
+        Me.dateDocDateFrom.TabIndex = 5
         '
         'lookupAccount
         '
-        Me.lookupAccount.Location = New System.Drawing.Point(85, 75)
+        Me.lookupAccount.Location = New System.Drawing.Point(112, 135)
         Me.lookupAccount.MenuManager = Me.RibbonControl1
         Me.lookupAccount.Name = "lookupAccount"
         Me.lookupAccount.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo), New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Clear)})
         Me.lookupAccount.Properties.NullText = ""
         Me.lookupAccount.Properties.PopupSizeable = False
         Me.lookupAccount.Properties.PopupView = Me.GridView1
-        Me.lookupAccount.Size = New System.Drawing.Size(198, 20)
+        Me.lookupAccount.Size = New System.Drawing.Size(171, 20)
         Me.lookupAccount.StyleController = Me.LayoutControl1
         Me.lookupAccount.TabIndex = 7
         '
@@ -490,46 +524,9 @@ Partial Class frmExportMain
         Me.GridColumn2.Visible = True
         Me.GridColumn2.VisibleIndex = 1
         '
-        'lookupDocumentKind
-        '
-        Me.lookupDocumentKind.Location = New System.Drawing.Point(85, 45)
-        Me.lookupDocumentKind.MenuManager = Me.RibbonControl1
-        Me.lookupDocumentKind.Name = "lookupDocumentKind"
-        Me.lookupDocumentKind.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo), New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Clear)})
-        Me.lookupDocumentKind.Properties.NullText = ""
-        Me.lookupDocumentKind.Properties.PopupSizeable = False
-        Me.lookupDocumentKind.Properties.PopupView = Me.GridView2
-        Me.lookupDocumentKind.Size = New System.Drawing.Size(198, 20)
-        Me.lookupDocumentKind.StyleController = Me.LayoutControl1
-        Me.lookupDocumentKind.TabIndex = 8
-        '
-        'GridView2
-        '
-        Me.GridView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.GridColumn4})
-        Me.GridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus
-        Me.GridView2.Name = "GridView2"
-        Me.GridView2.OptionsSelection.EnableAppearanceFocusedCell = False
-        Me.GridView2.OptionsView.ShowGroupPanel = False
-        '
-        'GridColumn3
-        '
-        Me.GridColumn3.Caption = "Name"
-        Me.GridColumn3.FieldName = "Name"
-        Me.GridColumn3.Name = "GridColumn3"
-        Me.GridColumn3.Visible = True
-        Me.GridColumn3.VisibleIndex = 0
-        '
-        'GridColumn4
-        '
-        Me.GridColumn4.Caption = "Nummer"
-        Me.GridColumn4.FieldName = "Id"
-        Me.GridColumn4.Name = "GridColumn4"
-        Me.GridColumn4.Visible = True
-        Me.GridColumn4.VisibleIndex = 1
-        '
         'chkShowExported
         '
-        Me.chkShowExported.Location = New System.Drawing.Point(12, 192)
+        Me.chkShowExported.Location = New System.Drawing.Point(12, 282)
         Me.chkShowExported.MenuManager = Me.RibbonControl1
         Me.chkShowExported.Name = "chkShowExported"
         Me.chkShowExported.Properties.Caption = "Bereits exportierte Belege anzeigen"
@@ -537,29 +534,82 @@ Partial Class frmExportMain
         Me.chkShowExported.StyleController = Me.LayoutControl1
         Me.chkShowExported.TabIndex = 9
         '
-        'TextEdit1
+        'txtDocumentFrom
         '
-        Me.TextEdit1.Location = New System.Drawing.Point(85, 105)
-        Me.TextEdit1.MenuManager = Me.RibbonControl1
-        Me.TextEdit1.Name = "TextEdit1"
-        Me.TextEdit1.Size = New System.Drawing.Size(198, 20)
-        Me.TextEdit1.StyleController = Me.LayoutControl1
-        Me.TextEdit1.TabIndex = 10
+        Me.txtDocumentFrom.Location = New System.Drawing.Point(112, 165)
+        Me.txtDocumentFrom.MenuManager = Me.RibbonControl1
+        Me.txtDocumentFrom.Name = "txtDocumentFrom"
+        Me.txtDocumentFrom.Size = New System.Drawing.Size(171, 20)
+        Me.txtDocumentFrom.StyleController = Me.LayoutControl1
+        Me.txtDocumentFrom.TabIndex = 10
         '
-        'TextEdit2
+        'txtDocumentTo
         '
-        Me.TextEdit2.Location = New System.Drawing.Point(85, 135)
-        Me.TextEdit2.MenuManager = Me.RibbonControl1
-        Me.TextEdit2.Name = "TextEdit2"
-        Me.TextEdit2.Size = New System.Drawing.Size(198, 20)
-        Me.TextEdit2.StyleController = Me.LayoutControl1
-        Me.TextEdit2.TabIndex = 11
+        Me.txtDocumentTo.Location = New System.Drawing.Point(112, 195)
+        Me.txtDocumentTo.MenuManager = Me.RibbonControl1
+        Me.txtDocumentTo.Name = "txtDocumentTo"
+        Me.txtDocumentTo.Size = New System.Drawing.Size(171, 20)
+        Me.txtDocumentTo.StyleController = Me.LayoutControl1
+        Me.txtDocumentTo.TabIndex = 11
+        '
+        'dateDocDateTo
+        '
+        Me.dateDocDateTo.EditValue = Nothing
+        Me.dateDocDateTo.Location = New System.Drawing.Point(112, 255)
+        Me.dateDocDateTo.MenuManager = Me.RibbonControl1
+        Me.dateDocDateTo.Name = "dateDocDateTo"
+        Me.dateDocDateTo.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.dateDocDateTo.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.dateDocDateTo.Size = New System.Drawing.Size(171, 20)
+        Me.dateDocDateTo.StyleController = Me.LayoutControl1
+        Me.dateDocDateTo.TabIndex = 12
+        '
+        'comboDocumentType
+        '
+        Me.comboDocumentType.Location = New System.Drawing.Point(112, 75)
+        Me.comboDocumentType.MenuManager = Me.RibbonControl1
+        Me.comboDocumentType.Name = "comboDocumentType"
+        Me.comboDocumentType.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.comboDocumentType.Properties.NullText = ""
+        Me.comboDocumentType.Properties.PopupSizeable = False
+        Me.comboDocumentType.Properties.PopupView = Me.GridView3
+        Me.comboDocumentType.Size = New System.Drawing.Size(171, 20)
+        Me.comboDocumentType.StyleController = Me.LayoutControl1
+        Me.comboDocumentType.TabIndex = 13
+        '
+        'GridView3
+        '
+        Me.GridView3.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus
+        Me.GridView3.Name = "GridView3"
+        Me.GridView3.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.GridView3.OptionsView.ShowGroupPanel = False
+        '
+        'comboDocumentKind
+        '
+        Me.comboDocumentKind.Location = New System.Drawing.Point(112, 105)
+        Me.comboDocumentKind.MenuManager = Me.RibbonControl1
+        Me.comboDocumentKind.Name = "comboDocumentKind"
+        Me.comboDocumentKind.Properties.AllowMultiSelect = True
+        Me.comboDocumentKind.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo), New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Clear)})
+        Me.comboDocumentKind.Size = New System.Drawing.Size(171, 20)
+        Me.comboDocumentKind.StyleController = Me.LayoutControl1
+        Me.comboDocumentKind.TabIndex = 14
+        '
+        'comboYear
+        '
+        Me.comboYear.Location = New System.Drawing.Point(112, 45)
+        Me.comboYear.MenuManager = Me.RibbonControl1
+        Me.comboYear.Name = "comboYear"
+        Me.comboYear.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.comboYear.Size = New System.Drawing.Size(171, 20)
+        Me.comboYear.StyleController = Me.LayoutControl1
+        Me.comboYear.TabIndex = 15
         '
         'Root
         '
         Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
         Me.Root.GroupBordersVisible = False
-        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.EmptySpaceItem1, Me.LayoutControlItem3, Me.LayoutControlItem2, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem7})
+        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.EmptySpaceItem1, Me.LayoutControlItem3, Me.LayoutControlItem2, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem8, Me.LayoutControlItem10, Me.LayoutControlItem9, Me.LayoutControlItem4})
         Me.Root.Name = "Root"
         Me.Root.Size = New System.Drawing.Size(298, 538)
         Me.Root.TextVisible = False
@@ -572,51 +622,40 @@ Partial Class frmExportMain
         Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem1.Size = New System.Drawing.Size(278, 30)
         Me.LayoutControlItem1.Text = "Mandant"
-        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(58, 13)
+        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(85, 13)
         '
         'EmptySpaceItem1
         '
         Me.EmptySpaceItem1.AllowHotTrack = False
-        Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 204)
+        Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 294)
         Me.EmptySpaceItem1.Name = "EmptySpaceItem1"
-        Me.EmptySpaceItem1.Size = New System.Drawing.Size(278, 314)
+        Me.EmptySpaceItem1.Size = New System.Drawing.Size(278, 224)
         Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0)
         '
         'LayoutControlItem3
         '
         Me.LayoutControlItem3.Control = Me.lookupAccount
-        Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 60)
+        Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 120)
         Me.LayoutControlItem3.Name = "LayoutControlItem3"
         Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem3.Size = New System.Drawing.Size(278, 30)
         Me.LayoutControlItem3.Text = "Konto"
-        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(58, 13)
+        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(85, 13)
         '
         'LayoutControlItem2
         '
-        Me.LayoutControlItem2.Control = Me.dateDocDate
-        Me.LayoutControlItem2.Enabled = False
-        Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 150)
+        Me.LayoutControlItem2.Control = Me.dateDocDateFrom
+        Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 210)
         Me.LayoutControlItem2.Name = "LayoutControlItem2"
         Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem2.Size = New System.Drawing.Size(278, 30)
-        Me.LayoutControlItem2.Text = "Belegdatum"
-        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(58, 13)
-        '
-        'LayoutControlItem4
-        '
-        Me.LayoutControlItem4.Control = Me.lookupDocumentKind
-        Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 30)
-        Me.LayoutControlItem4.Name = "LayoutControlItem4"
-        Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem4.Size = New System.Drawing.Size(278, 30)
-        Me.LayoutControlItem4.Text = "Belegart"
-        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(58, 13)
+        Me.LayoutControlItem2.Text = "Belegdatum Von"
+        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(85, 13)
         '
         'LayoutControlItem5
         '
         Me.LayoutControlItem5.Control = Me.chkShowExported
-        Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 180)
+        Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 270)
         Me.LayoutControlItem5.Name = "LayoutControlItem5"
         Me.LayoutControlItem5.Size = New System.Drawing.Size(278, 24)
         Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0)
@@ -624,29 +663,67 @@ Partial Class frmExportMain
         '
         'LayoutControlItem6
         '
-        Me.LayoutControlItem6.Control = Me.TextEdit1
-        Me.LayoutControlItem6.Enabled = False
-        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 90)
+        Me.LayoutControlItem6.Control = Me.txtDocumentFrom
+        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 150)
         Me.LayoutControlItem6.Name = "LayoutControlItem6"
         Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem6.Size = New System.Drawing.Size(278, 30)
         Me.LayoutControlItem6.Text = "BelegNr Von"
-        Me.LayoutControlItem6.TextSize = New System.Drawing.Size(58, 13)
+        Me.LayoutControlItem6.TextSize = New System.Drawing.Size(85, 13)
         '
         'LayoutControlItem7
         '
-        Me.LayoutControlItem7.Control = Me.TextEdit2
-        Me.LayoutControlItem7.Enabled = False
-        Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 120)
+        Me.LayoutControlItem7.Control = Me.txtDocumentTo
+        Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 180)
         Me.LayoutControlItem7.Name = "LayoutControlItem7"
         Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem7.Size = New System.Drawing.Size(278, 30)
         Me.LayoutControlItem7.Text = "BelegNr Bis"
-        Me.LayoutControlItem7.TextSize = New System.Drawing.Size(58, 13)
+        Me.LayoutControlItem7.TextSize = New System.Drawing.Size(85, 13)
+        '
+        'LayoutControlItem8
+        '
+        Me.LayoutControlItem8.Control = Me.dateDocDateTo
+        Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 240)
+        Me.LayoutControlItem8.Name = "LayoutControlItem8"
+        Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem8.Size = New System.Drawing.Size(278, 30)
+        Me.LayoutControlItem8.Text = "Belegdatum Bis"
+        Me.LayoutControlItem8.TextSize = New System.Drawing.Size(85, 13)
+        '
+        'LayoutControlItem10
+        '
+        Me.LayoutControlItem10.Control = Me.comboDocumentKind
+        Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 90)
+        Me.LayoutControlItem10.Name = "LayoutControlItem10"
+        Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem10.Size = New System.Drawing.Size(278, 30)
+        Me.LayoutControlItem10.Text = "Belegart"
+        Me.LayoutControlItem10.TextSize = New System.Drawing.Size(85, 13)
+        '
+        'LayoutControlItem9
+        '
+        Me.LayoutControlItem9.Control = Me.comboDocumentType
+        Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 60)
+        Me.LayoutControlItem9.Name = "LayoutControlItem9"
+        Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem9.Size = New System.Drawing.Size(278, 30)
+        Me.LayoutControlItem9.Text = "Belegtyp"
+        Me.LayoutControlItem9.TextSize = New System.Drawing.Size(85, 13)
+        '
+        'LayoutControlItem4
+        '
+        Me.LayoutControlItem4.Control = Me.comboYear
+        Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 30)
+        Me.LayoutControlItem4.Name = "LayoutControlItem4"
+        Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem4.Size = New System.Drawing.Size(278, 30)
+        Me.LayoutControlItem4.Text = "Wirtschaftsjahr"
+        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(85, 13)
         '
         'LabelControl2
         '
-        Me.LabelControl2.Appearance.Font = New System.Drawing.Font("Tahoma", 48.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.LabelControl2.Appearance.Font = New System.Drawing.Font("Tahoma", 48.0!)
         Me.LabelControl2.Appearance.ForeColor = System.Drawing.Color.Silver
         Me.LabelControl2.Appearance.Options.UseFont = True
         Me.LabelControl2.Appearance.Options.UseForeColor = True
@@ -708,24 +785,31 @@ Partial Class frmExportMain
         Me.LayoutControl1.ResumeLayout(False)
         CType(Me.lookupMandator.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridLookUpEdit1View, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.dateDocDate.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.dateDocDate.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.dateDocDateFrom.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.dateDocDateFrom.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lookupAccount.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lookupDocumentKind.Properties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.chkShowExported.Properties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtDocumentFrom.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtDocumentTo.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.dateDocDateTo.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.dateDocDateTo.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.comboDocumentType.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.comboDocumentKind.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.comboYear.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -751,7 +835,7 @@ Partial Class frmExportMain
     Friend WithEvents GridLookUpEdit1View As DevExpress.XtraGrid.Views.Grid.GridView
     Friend WithEvents colName As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents colId As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents dateDocDate As DevExpress.XtraEditors.DateEdit
+    Friend WithEvents dateDocDateFrom As DevExpress.XtraEditors.DateEdit
     Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem
     Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem
     Friend WithEvents lookupAccount As DevExpress.XtraEditors.GridLookUpEdit
@@ -761,23 +845,18 @@ Partial Class frmExportMain
     Friend WithEvents colId2 As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents GridColumn2 As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem
-    Friend WithEvents lookupDocumentKind As DevExpress.XtraEditors.GridLookUpEdit
-    Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView
-    Friend WithEvents GridColumn3 As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents GridColumn4 As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents GridColumn5 As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents GridColumn6 As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents colImported As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents chkShowExported As DevExpress.XtraEditors.CheckEdit
     Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem
-    Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit
-    Friend WithEvents TextEdit2 As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents txtDocumentFrom As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents txtDocumentTo As DevExpress.XtraEditors.TextEdit
     Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem
     Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem
     Friend WithEvents GridColumn7 As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents txtResults As DevExpress.XtraBars.BarStaticItem
-    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnExport As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager
     Friend WithEvents RepositoryItemImageComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox
@@ -791,4 +870,15 @@ Partial Class frmExportMain
     Friend WithEvents GridColumn9 As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents GridColumn10 As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents RepositoryItemDateEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemDateEdit
+    Friend WithEvents dateDocDateTo As DevExpress.XtraEditors.DateEdit
+    Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents comboDocumentType As DevExpress.XtraEditors.GridLookUpEdit
+    Friend WithEvents GridView3 As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents colDocumentKind As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents comboDocumentKind As DevExpress.XtraEditors.CheckedComboBoxEdit
+    Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents comboYear As DevExpress.XtraEditors.ComboBoxEdit
+    Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
 End Class

MultiTool.Form/frmExportMain.vb

@@ -1,18 +1,17 @@
 Imports DevExpress.XtraEditors
-Imports DevExpress.XtraGrid.Views.Grid
 Imports DigitalData.GUIs.Common
+Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Exceptions
-Imports MultiTool.Shared.Winline
-Imports MultiTool.Shared.Winline.Entities
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Exceptions
+Imports MultiTool.Common.Winline
+Imports MultiTool.Common.Winline.Entities
 
 Public Class frmExportMain
     Private ReadOnly LogConfig As LogConfig
-    Private ReadOnly ConfigManager As ConfigManager(Of Config)
+    Private ReadOnly ConfigManager As ConfigManager(Of Common.Config)
     Private ReadOnly CurrentTemplate As Template = Nothing
 
     Private Logger As Logger
@@ -21,9 +20,9 @@ Public Class frmExportMain
     Private WebService As WebServiceData
     Private Winline As WinlineData
     Private GridBuilder As GridBuilder
-    Private FileEx As DigitalData.Modules.Filesystem.File
+    Private FileEx As FilesystemEx
 
-    Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Config), pTemplate As Template)
+    Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Common.Config), pTemplate As Template)
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()
 
@@ -44,21 +43,14 @@ Public Class frmExportMain
             Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
             Database = New MSSQLServer(LogConfig, oConnectionString)
 
-            Dim oViews As New List(Of GridView) From {
-                GridViewDocuments,
-                lookupMandator.Properties.View,
-                lookupAccount.Properties.View,
-                lookupDocumentKind.Properties.View
-            }
-            GridBuilder = New GridBuilder(oViews)
-            GridBuilder.
+            GridBuilder = New GridBuilder(GridViewDocuments, lookupMandator.Properties.View, lookupAccount.Properties.View).
                 WithDefaults().
                 WithReadOnlyOptions().
                 WithClipboardHandler()
 
             Winline = My.Winline
-            FileEx = New DigitalData.Modules.Filesystem.File(LogConfig)
-            WebService = New WebServiceData(LogConfig, Winline, My.GeneralConfiguration.Webservice, My.GeneralConfiguration)
+            FileEx = New FilesystemEx(LogConfig)
+            WebService = New WebServiceData(LogConfig, Database, Winline, My.GeneralConfiguration.Webservice, My.GeneralConfiguration, My.FilterConfiguration)
             AddHandler WebService.WebServiceProgress, AddressOf WebService_Progress
 
         Catch ex As Exception
@@ -77,24 +69,84 @@ Public Class frmExportMain
             lookupAccount.ForceInitialize()
             lookupAccount.Properties.View.BestFitColumns()
 
-            lookupDocumentKind.Properties.DataSource = Winline.DocumentKinds
-            lookupDocumentKind.ForceInitialize()
-            lookupDocumentKind.Properties.View.BestFitColumns()
+            comboDocumentKind.Properties.DataSource = Winline.DocumentKinds
+            comboDocumentKind.Properties.EditValueType = Repository.EditValueTypeCollection.List
+            comboDocumentKind.EditValue = New List(Of Object)
+
+            comboYear.Properties.Items.AddRange(Winline.Years)
+
+            comboDocumentType.Properties.DisplayMember = "Key"
+            comboDocumentType.Properties.ValueMember = "Value"
+            comboDocumentType.Properties.DataSource = [Enum].
+                GetValues(GetType(WinlineData.DocumentType)).
+                Cast(Of WinlineData.DocumentType)().
+                Select(AddressOf MapDocumentTypeFromEnum).
+                ToList()
+            comboDocumentType.EditValue = DirectCast(CurrentTemplate.DocType, Integer)
 
             If ConfigManager.Config.LastUsedMandator <> "" Then
                 lookupMandator.EditValue = Winline.Mandators.
                     Where(Function(mandator) mandator.Id = ConfigManager.Config.LastUsedMandator).
                     FirstOrDefault()
             End If
+
+            If ConfigManager.Config.AutomaticLoadingOnFormOpen = True Then
+                SearchDocuments()
+            End If
         Catch ex As Exception
             FormHelper.ShowError(ex, "Initialisierung der Form")
         End Try
     End Sub
 
+    Private Function MapDocumentTypeToEnum(Of T)(pValue As Integer) As T
+        Return [Enum].Parse(GetType(T), pValue)
+    End Function
+
+    Private Function MapDocumentTypeFromEnum(pValue As WinlineData.DocumentType)
+        Select Case pValue
+            Case WinlineData.DocumentType.Undefined
+                Return New KeyValuePair(Of String, Integer)("Alle", pValue)
+
+            Case WinlineData.DocumentType.IncomingOffer
+                Return New KeyValuePair(Of String, Integer)("Angebot EK", pValue)
+
+            Case WinlineData.DocumentType.IncomingOrder
+                Return New KeyValuePair(Of String, Integer)("Auftrag EK", pValue)
+
+            Case WinlineData.DocumentType.IncomingDeliveryNote
+                Return New KeyValuePair(Of String, Integer)("Lieferschein EK", pValue)
+
+            Case WinlineData.DocumentType.IncomingInvoice
+                Return New KeyValuePair(Of String, Integer)("Rechnung EK", pValue)
+
+            Case WinlineData.DocumentType.OutgoingOffer
+                Return New KeyValuePair(Of String, Integer)("Angebot VK", pValue)
+
+            Case WinlineData.DocumentType.OutgoingOrder
+                Return New KeyValuePair(Of String, Integer)("Auftrag VK", pValue)
+
+            Case WinlineData.DocumentType.OutgoingDeliveryNote
+                Return New KeyValuePair(Of String, Integer)("Lieferschein VK", pValue)
+
+            Case WinlineData.DocumentType.OutgoingInvoice
+                Return New KeyValuePair(Of String, Integer)("Rechnung VK", pValue)
+
+            Case Else
+                Return Nothing
+
+        End Select
+    End Function
+
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
         SearchDocuments()
     End Sub
 
+    Private Sub frmExportMain_KeyDown(sender As Object, e As KeyEventArgs) Handles MyBase.KeyDown
+        If e.KeyCode = Keys.F5 Then
+            SearchDocuments()
+        End If
+    End Sub
+
     Private Sub WebService_Progress(sender As Object, e As String)
         SplashScreenManager.SetWaitFormDescription(e)
     End Sub
@@ -102,57 +154,67 @@ Public Class frmExportMain
     Private Sub lookupMandator_EditValueChanged(sender As Object, e As EventArgs) Handles lookupMandator.EditValueChanged
         Dim oMandator As Mandator = lookupMandator.EditValue
         lookupAccount.Properties.DataSource = Winline.Accounts.Where(Function(acc) acc.Mandator.Equals(oMandator))
-        lookupDocumentKind.Properties.DataSource = Winline.DocumentKinds.Where(Function(kind) kind.Mandator.Equals(oMandator))
+        comboDocumentKind.Properties.DataSource = Winline.DocumentKinds.Where(Function(kind) kind.Mandator.Equals(oMandator))
 
         ConfigManager.Config.LastUsedMandator = oMandator.Id
         ConfigManager.Save()
     End Sub
 
-    Private Sub lookup_Properties_ButtonClick(sender As Object, e As DevExpress.XtraEditors.Controls.ButtonPressedEventArgs) _
-        Handles lookupDocumentKind.Properties.ButtonClick, lookupAccount.Properties.ButtonClick
+    Private Sub lookup_Properties_ButtonClick(sender As Object, e As DevExpress.XtraEditors.Controls.ButtonPressedEventArgs) Handles lookupAccount.Properties.ButtonClick
         Dim oLookup As GridLookUpEdit = sender
         If e.Button.Kind = DevExpress.XtraEditors.Controls.ButtonPredefines.Clear Then
             oLookup.EditValue = Nothing
         End If
     End Sub
 
-
+    Private Sub combo_Properties_ButtonClick(sender As Object, e As DevExpress.XtraEditors.Controls.ButtonPressedEventArgs) Handles comboDocumentKind.Properties.ButtonClick
+        Dim oLookup As CheckedComboBoxEdit = sender
+        If e.Button.Kind = DevExpress.XtraEditors.Controls.ButtonPredefines.Clear Then
+            oLookup.EditValue = New List(Of Object)
+        End If
+    End Sub
 
     Private Sub SearchDocuments()
         Try
+            dateDocDateFrom.DoValidate()
+            dateDocDateTo.DoValidate()
+
             Dim oMandator = lookupMandator.EditValue
+            Dim oYear = ObjectEx.NotNull(comboYear.EditValue, 0)
             Dim oAccount = lookupAccount.EditValue
-            Dim oKind = lookupDocumentKind.EditValue
-            Dim oDateRanges = dateDocDate.SelectedRanges
+            Dim oKindsAsObjects As List(Of Object) = comboDocumentKind.EditValue
+            Dim oKinds As List(Of DocumentKind) = oKindsAsObjects.Cast(Of DocumentKind).ToList()
+
+            Dim oDateFrom = dateDocDateFrom.EditValue
+            Dim oDateTo = dateDocDateTo.EditValue
             Dim oShowExported = chkShowExported.Checked
+            Dim oDocNumberFrom = ObjectEx.NotNull(txtDocumentFrom.EditValue, String.Empty)
+            Dim oDocNumberTo = ObjectEx.NotNull(txtDocumentTo.EditValue, String.Empty)
+
+            Dim oDocType As WinlineData.DocumentType = MapDocumentTypeToEnum(Of WinlineData.DocumentType)(comboDocumentType.EditValue)
 
             If oMandator Is Nothing Then
                 FormHelper.ShowWarning("Bitte einen Mandanten auswählen!")
                 Exit Sub
             End If
 
-            If oDateRanges.Count > 1 Then
-                FormHelper.ShowWarning("Bitte nur einen Datumsbereich auswählen!")
+            'TODO: Make Document Type configurable
+            Dim oDocuments = Winline.GetDocuments(oMandator, CurrentTemplate, oDocType, New WinlineData.GetDocumentArgs With {
+                .Account = oAccount,
+                .Kinds = oKinds,
+                .DateFrom = oDateFrom,
+                .DateTo = oDateTo,
+                .ShowExported = oShowExported,
+                .DocNumberFrom = oDocNumberFrom,
+                .DocNumberTo = oDocNumberTo,
+                .Year = oYear
+            })
+
+            If oDocuments Is Nothing Then
+                FormHelper.ShowWarning("There was an error in the Query.")
                 Exit Sub
             End If
 
-            Dim oStartDate As Date = Nothing
-            Dim oEndDate As Date = Nothing
-            If oDateRanges.Count > 0 Then
-                Dim oRange = oDateRanges.First()
-                oStartDate = oRange.StartDate
-                oEndDate = oRange.EndDate
-            End If
-
-            'TODO: Make Document Type configurable
-            Dim oDocuments = Winline.GetDocuments(oMandator, CurrentTemplate, WinlineData.DocumentType.Order, New WinlineData.GetDocumentArgs With {
-                .Account = oAccount,
-                .Kind = oKind,
-                .DateFrom = oStartDate,
-                .DateTo = oEndDate,
-                .ShowExported = oShowExported
-            })
-
             GridControlDocuments.DataSource = oDocuments
 
             txtResults.Caption = String.Format("{0} Ergebnisse", oDocuments.Count)
@@ -162,8 +224,9 @@ Public Class frmExportMain
         End Try
     End Sub
 
-    Private Async Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+    Private Async Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnExport.ItemClick
         Try
+            btnExport.Enabled = False
             SplashScreenManager.ShowWaitForm()
 
             Dim oExportResult = False
@@ -173,20 +236,18 @@ Public Class frmExportMain
             For Each oRowHandle In oRowHandles
                 oExportCount += 1
 
-                Dim oDocument As Document = GridViewDocuments.GetRow(oRowHandle)
+                Dim oDocument As ExportDocument = GridViewDocuments.GetRow(oRowHandle)
                 Dim oMandator As Mandator = lookupMandator.EditValue
 
                 Dim oMessage = String.Format("Beleg {0} exportieren.. ({1}/{2})", oDocument.Number, oExportCount, oRowHandles.Length)
                 SplashScreenManager.SetWaitFormDescription(oMessage)
 
                 Await WebService.ExportDocumentFromWinline(oDocument, CurrentTemplate, oMandator)
-                Dim oFinalSqlResult = Await Winline.ExecuteFinalSQL(oDocument, CurrentTemplate, oMandator)
+                Dim oFinalSqlResult = Await Winline.ExecuteFinalSQLForExport(oDocument, CurrentTemplate, oMandator)
 
                 If oFinalSqlResult = False Then
                     Throw New DatabaseException("FinalSQL was not executed successfully!")
                 End If
-
-                oDocument.IsExported = True
             Next
 
             MsgBox($"{oExportCount} Dateien wurden erfolgreich exportiert!", MsgBoxStyle.Information, Text)
@@ -199,6 +260,8 @@ Public Class frmExportMain
 
         Finally
             SplashScreenManager.CloseWaitForm()
+            btnExport.Enabled = True
+            SearchDocuments()
 
         End Try
     End Sub
@@ -220,4 +283,8 @@ Public Class frmExportMain
             e.DisplayText = ""
         End If
     End Sub
+
+    Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick
+        FormHelper.TryOpenDirectory(LogConfig.LogDirectory, My.Resources.frmImportMainExtra.Logverzeichnis)
+    End Sub
 End Class

MultiTool.Form/frmImportMain.Designer.vb

@@ -30,7 +30,6 @@ Partial Class frmImportMain
         Me.GridControlFiles = New DevExpress.XtraGrid.GridControl()
         Me.GridViewFiles = New DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView()
         Me.gridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand()
-        Me.colSelected = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn()
         Me.GridBand2 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand()
         Me.colFilename = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn()
         Me.colCreatedAt = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn()
@@ -52,16 +51,19 @@ Partial Class frmImportMain
         Me.txtCurrentFile = New DevExpress.XtraBars.BarStaticItem()
         Me.btnConfig = New DevExpress.XtraBars.BarButtonItem()
         Me.btnRemoveRow = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarWorkspaceMenuItem1 = New DevExpress.XtraBars.BarWorkspaceMenuItem()
-        Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(Me.components)
         Me.btnTestTransferFile = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
         Me.btnDebugExportReport = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnEditRow = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnCalculatePrices = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnOpenLogDirectory2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.txtErrors = New DevExpress.XtraBars.BarStaticItem()
+        Me.btnShowErrors = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
-        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroup7 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupLoad = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupReport = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupTransfer = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupEdit = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -85,6 +87,7 @@ Partial Class frmImportMain
         Me.GridView3 = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.GridControl4 = New DevExpress.XtraGrid.GridControl()
         Me.GridView4 = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(Me.components)
         Me.BehaviorManager = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components)
         Me.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True)
         CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -147,7 +150,7 @@ Partial Class frmImportMain
         '
         Me.SplitContainerMain.Panel2.Controls.Add(Me.SplitContainerGrids)
         resources.ApplyResources(Me.SplitContainerMain.Panel2, "SplitContainerMain.Panel2")
-        Me.SplitContainerMain.SplitterPosition = 340
+        Me.SplitContainerMain.SplitterPosition = 287
         '
         'GridControlFiles
         '
@@ -161,9 +164,13 @@ Partial Class frmImportMain
         'GridViewFiles
         '
         Me.GridViewFiles.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.gridBand1, Me.GridBand2})
-        Me.GridViewFiles.Columns.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() {Me.colSelected, Me.colFilename, Me.colMandator, Me.colCreatedAt})
+        Me.GridViewFiles.Columns.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() {Me.colFilename, Me.colMandator, Me.colCreatedAt})
         Me.GridViewFiles.GridControl = Me.GridControlFiles
         Me.GridViewFiles.Name = "GridViewFiles"
+        Me.GridViewFiles.OptionsSelection.CheckBoxSelectorColumnWidth = 25
+        Me.GridViewFiles.OptionsSelection.CheckBoxSelectorField = "Selected"
+        Me.GridViewFiles.OptionsSelection.MultiSelect = True
+        Me.GridViewFiles.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect
         Me.GridViewFiles.OptionsView.ShowBands = False
         Me.GridViewFiles.OptionsView.ShowDetailButtons = False
         Me.GridViewFiles.OptionsView.ShowGroupPanel = False
@@ -172,20 +179,7 @@ Partial Class frmImportMain
         'gridBand1
         '
         resources.ApplyResources(Me.gridBand1, "gridBand1")
-        Me.gridBand1.Columns.Add(Me.colSelected)
-        Me.gridBand1.VisibleIndex = 0
-        '
-        'colSelected
-        '
-        Me.colSelected.AutoFillDown = True
-        resources.ApplyResources(Me.colSelected, "colSelected")
-        Me.colSelected.FieldName = "Selected"
-        Me.colSelected.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send2
-        Me.colSelected.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
-        Me.colSelected.MinWidth = 27
-        Me.colSelected.Name = "colSelected"
-        Me.colSelected.OptionsColumn.FixedWidth = True
-        Me.colSelected.UnboundType = DevExpress.Data.UnboundColumnType.[Boolean]
+        Me.gridBand1.VisibleIndex = -1
         '
         'GridBand2
         '
@@ -193,7 +187,7 @@ Partial Class frmImportMain
         Me.GridBand2.Columns.Add(Me.colFilename)
         Me.GridBand2.Columns.Add(Me.colCreatedAt)
         Me.GridBand2.Columns.Add(Me.colMandator)
-        Me.GridBand2.VisibleIndex = 1
+        Me.GridBand2.VisibleIndex = 0
         '
         'colFilename
         '
@@ -230,11 +224,10 @@ Partial Class frmImportMain
         'RibbonControl
         '
         Me.RibbonControl.ExpandCollapseItem.Id = 0
-        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtFilesLoaded, Me.btnLoadFiles, Me.btnTransferFile, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory, Me.btnReloadFile, Me.btnTransferAllFiles, Me.btnOpenReport, Me.btnShowXml, Me.btnOpenLogDirectory, Me.btnOpenConfigDirectory, Me.txtCurrentFile, Me.btnConfig, Me.btnRemoveRow, Me.BarWorkspaceMenuItem1, Me.btnTestTransferFile, Me.BarButtonItem1, Me.btnDebugExportReport})
+        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtFilesLoaded, Me.btnLoadFiles, Me.btnTransferFile, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory, Me.btnReloadFile, Me.btnTransferAllFiles, Me.btnOpenReport, Me.btnShowXml, Me.btnOpenLogDirectory, Me.btnOpenConfigDirectory, Me.txtCurrentFile, Me.btnConfig, Me.btnRemoveRow, Me.btnTestTransferFile, Me.BarButtonItem1, Me.btnDebugExportReport, Me.btnEditRow, Me.btnCalculatePrices, Me.btnOpenLogDirectory2, Me.txtErrors, Me.btnShowErrors})
         resources.ApplyResources(Me.RibbonControl, "RibbonControl")
-        Me.RibbonControl.MaxItemId = 34
+        Me.RibbonControl.MaxItemId = 40
         Me.RibbonControl.Name = "RibbonControl"
-        Me.RibbonControl.PageHeaderItemLinks.Add(Me.BarWorkspaceMenuItem1)
         Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2})
         Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemComboBox1, Me.RepositoryItemProgressBar1})
         Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -297,7 +290,6 @@ Partial Class frmImportMain
         'btnTransferAllFiles
         '
         resources.ApplyResources(Me.btnTransferAllFiles, "btnTransferAllFiles")
-        Me.btnTransferAllFiles.Enabled = False
         Me.btnTransferAllFiles.Id = 13
         Me.btnTransferAllFiles.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send
         Me.btnTransferAllFiles.Name = "btnTransferAllFiles"
@@ -356,18 +348,6 @@ Partial Class frmImportMain
         Me.btnRemoveRow.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_deletecircled
         Me.btnRemoveRow.Name = "btnRemoveRow"
         '
-        'BarWorkspaceMenuItem1
-        '
-        resources.ApplyResources(Me.BarWorkspaceMenuItem1, "BarWorkspaceMenuItem1")
-        Me.BarWorkspaceMenuItem1.Id = 28
-        Me.BarWorkspaceMenuItem1.Name = "BarWorkspaceMenuItem1"
-        Me.BarWorkspaceMenuItem1.WorkspaceManager = Me.WorkspaceManager1
-        '
-        'WorkspaceManager1
-        '
-        Me.WorkspaceManager1.TargetControl = Me
-        Me.WorkspaceManager1.TransitionType = PushTransition1
-        '
         'btnTestTransferFile
         '
         resources.ApplyResources(Me.btnTestTransferFile, "btnTestTransferFile")
@@ -389,39 +369,83 @@ Partial Class frmImportMain
         Me.btnDebugExportReport.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.exporttopdf
         Me.btnDebugExportReport.Name = "btnDebugExportReport"
         '
+        'btnEditRow
+        '
+        resources.ApplyResources(Me.btnEditRow, "btnEditRow")
+        Me.btnEditRow.Enabled = False
+        Me.btnEditRow.Id = 35
+        Me.btnEditRow.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.editquery
+        Me.btnEditRow.Name = "btnEditRow"
+        '
+        'btnCalculatePrices
+        '
+        resources.ApplyResources(Me.btnCalculatePrices, "btnCalculatePrices")
+        Me.btnCalculatePrices.Enabled = False
+        Me.btnCalculatePrices.Id = 36
+        Me.btnCalculatePrices.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.bo_sale
+        Me.btnCalculatePrices.Name = "btnCalculatePrices"
+        '
+        'btnOpenLogDirectory2
+        '
+        resources.ApplyResources(Me.btnOpenLogDirectory2, "btnOpenLogDirectory2")
+        Me.btnOpenLogDirectory2.Id = 37
+        Me.btnOpenLogDirectory2.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.logical2
+        Me.btnOpenLogDirectory2.Name = "btnOpenLogDirectory2"
+        '
+        'txtErrors
+        '
+        resources.ApplyResources(Me.txtErrors, "txtErrors")
+        Me.txtErrors.Id = 38
+        Me.txtErrors.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.highimportance
+        Me.txtErrors.Name = "txtErrors"
+        Me.txtErrors.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
+        Me.txtErrors.Tag = "Fehler: {0}"
+        '
+        'btnShowErrors
+        '
+        resources.ApplyResources(Me.btnShowErrors, "btnShowErrors")
+        Me.btnShowErrors.Enabled = False
+        Me.btnShowErrors.Id = 39
+        Me.btnShowErrors.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.highimportance1
+        Me.btnShowErrors.Name = "btnShowErrors"
+        '
         'RibbonPage1
         '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup4, Me.RibbonPageGroup3, Me.RibbonPageGroup7})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroupLoad, Me.RibbonPageGroupReport, Me.RibbonPageGroupTransfer, Me.RibbonPageGroupEdit})
         Me.RibbonPage1.Name = "RibbonPage1"
         resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
         '
-        'RibbonPageGroup1
+        'RibbonPageGroupLoad
         '
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.btnLoadFiles)
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.btnReloadFile)
-        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
-        resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1")
+        Me.RibbonPageGroupLoad.ItemLinks.Add(Me.btnLoadFiles)
+        Me.RibbonPageGroupLoad.ItemLinks.Add(Me.btnReloadFile)
+        Me.RibbonPageGroupLoad.Name = "RibbonPageGroupLoad"
+        resources.ApplyResources(Me.RibbonPageGroupLoad, "RibbonPageGroupLoad")
         '
-        'RibbonPageGroup4
+        'RibbonPageGroupReport
         '
-        Me.RibbonPageGroup4.ItemLinks.Add(Me.btnOpenReport)
-        Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
-        resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
+        Me.RibbonPageGroupReport.ItemLinks.Add(Me.btnOpenReport)
+        Me.RibbonPageGroupReport.Name = "RibbonPageGroupReport"
+        resources.ApplyResources(Me.RibbonPageGroupReport, "RibbonPageGroupReport")
         '
-        'RibbonPageGroup3
+        'RibbonPageGroupTransfer
         '
-        Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.btnTransferFile)
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.btnTransferAllFiles)
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.btnTestTransferFile)
-        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
-        resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
+        Me.RibbonPageGroupTransfer.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
+        Me.RibbonPageGroupTransfer.Enabled = False
+        Me.RibbonPageGroupTransfer.ItemLinks.Add(Me.btnTransferFile)
+        Me.RibbonPageGroupTransfer.ItemLinks.Add(Me.btnTransferAllFiles)
+        Me.RibbonPageGroupTransfer.ItemLinks.Add(Me.btnTestTransferFile)
+        Me.RibbonPageGroupTransfer.Name = "RibbonPageGroupTransfer"
+        resources.ApplyResources(Me.RibbonPageGroupTransfer, "RibbonPageGroupTransfer")
         '
-        'RibbonPageGroup7
+        'RibbonPageGroupEdit
         '
-        Me.RibbonPageGroup7.ItemLinks.Add(Me.btnRemoveRow)
-        Me.RibbonPageGroup7.Name = "RibbonPageGroup7"
-        resources.ApplyResources(Me.RibbonPageGroup7, "RibbonPageGroup7")
+        Me.RibbonPageGroupEdit.ItemLinks.Add(Me.btnEditRow)
+        Me.RibbonPageGroupEdit.ItemLinks.Add(Me.btnRemoveRow)
+        Me.RibbonPageGroupEdit.ItemLinks.Add(Me.btnCalculatePrices)
+        Me.RibbonPageGroupEdit.ItemLinks.Add(Me.btnShowErrors)
+        Me.RibbonPageGroupEdit.Name = "RibbonPageGroupEdit"
+        resources.ApplyResources(Me.RibbonPageGroupEdit, "RibbonPageGroupEdit")
         '
         'RibbonPage2
         '
@@ -434,11 +458,13 @@ Partial Class frmImportMain
         Me.RibbonPageGroup5.ItemLinks.Add(Me.btnOpenInputDirectory)
         Me.RibbonPageGroup5.ItemLinks.Add(Me.btnOpenOutputDirectory)
         Me.RibbonPageGroup5.ItemLinks.Add(Me.btnOpenSchemaDirectory)
+        Me.RibbonPageGroup5.ItemLinks.Add(Me.btnOpenLogDirectory2)
         Me.RibbonPageGroup5.Name = "RibbonPageGroup5"
         resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5")
         '
         'RibbonPageGroup2
         '
+        Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
         Me.RibbonPageGroup2.ItemLinks.Add(Me.btnShowXml)
         Me.RibbonPageGroup2.ItemLinks.Add(Me.btnDebugExportReport)
         Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
@@ -459,6 +485,7 @@ Partial Class frmImportMain
         '
         Me.RibbonStatusBar.ItemLinks.Add(Me.txtFilesLoaded)
         Me.RibbonStatusBar.ItemLinks.Add(Me.txtCurrentFile)
+        Me.RibbonStatusBar.ItemLinks.Add(Me.txtErrors)
         resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar")
         Me.RibbonStatusBar.Name = "RibbonStatusBar"
         Me.RibbonStatusBar.Ribbon = Me.RibbonControl
@@ -482,7 +509,10 @@ Partial Class frmImportMain
         resources.ApplyResources(Me.lookupMandator, "lookupMandator")
         Me.lookupMandator.MenuManager = Me.RibbonControl
         Me.lookupMandator.Name = "lookupMandator"
+        Me.lookupMandator.Properties.Appearance.BackColor = System.Drawing.Color.White
+        Me.lookupMandator.Properties.Appearance.Options.UseBackColor = True
         Me.lookupMandator.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("lookupMandator.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))})
+        Me.lookupMandator.Properties.NullText = resources.GetString("lookupMandator.Properties.NullText")
         Me.lookupMandator.Properties.PopupView = Me.GridLookUpEdit1View
         '
         'GridLookUpEdit1View
@@ -605,6 +635,11 @@ Partial Class frmImportMain
         Me.GridView4.GridControl = Me.GridControl4
         Me.GridView4.Name = "GridView4"
         '
+        'WorkspaceManager1
+        '
+        Me.WorkspaceManager1.TargetControl = Me
+        Me.WorkspaceManager1.TransitionType = PushTransition1
+        '
         'SplashScreenManager
         '
         Me.SplashScreenManager.ClosingDelay = 500
@@ -618,6 +653,7 @@ Partial Class frmImportMain
         Me.Controls.Add(Me.RibbonStatusBar)
         Me.Controls.Add(Me.RibbonControl)
         Me.IconOptions.SvgImage = CType(resources.GetObject("frmImportMain.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.KeyPreview = True
         Me.Name = "frmImportMain"
         Me.Ribbon = Me.RibbonControl
         Me.StatusBar = Me.RibbonStatusBar
@@ -673,7 +709,7 @@ Partial Class frmImportMain
 
     Friend WithEvents RibbonControl As DevExpress.XtraBars.Ribbon.RibbonControl
     Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
-    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonPageGroupLoad As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents RibbonStatusBar As DevExpress.XtraBars.Ribbon.RibbonStatusBar
     Friend WithEvents GridControlFiles As DevExpress.XtraGrid.GridControl
     Friend WithEvents txtFilesLoaded As DevExpress.XtraBars.BarStaticItem
@@ -688,9 +724,9 @@ Partial Class frmImportMain
     Friend WithEvents SplitContainerMain As DevExpress.XtraEditors.SplitContainerControl
     Friend WithEvents btnReloadFile As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents btnTransferAllFiles As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonPageGroupTransfer As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents btnOpenReport As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonPageGroupReport As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents btnShowXml As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents btnOpenLogDirectory As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents btnOpenConfigDirectory As DevExpress.XtraBars.BarButtonItem
@@ -698,7 +734,6 @@ Partial Class frmImportMain
     Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox
     Friend WithEvents GridViewFiles As DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView
-    Friend WithEvents colSelected As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn
     Friend WithEvents colCreatedAt As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn
     Friend WithEvents colMandator As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn
     Friend WithEvents colFilename As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn
@@ -715,7 +750,7 @@ Partial Class frmImportMain
     Friend WithEvents RepositoryItemProgressBar1 As Repository.RepositoryItemProgressBar
     Friend WithEvents SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager
     Friend WithEvents btnRemoveRow As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents RibbonPageGroup7 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonPageGroupEdit As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl
     Friend WithEvents GridView1 As GridView
     Friend WithEvents GridControl2 As DevExpress.XtraGrid.GridControl
@@ -724,12 +759,16 @@ Partial Class frmImportMain
     Friend WithEvents GridView3 As GridView
     Friend WithEvents GridControl4 As DevExpress.XtraGrid.GridControl
     Friend WithEvents GridView4 As GridView
-    Friend WithEvents BarWorkspaceMenuItem1 As DevExpress.XtraBars.BarWorkspaceMenuItem
     Friend WithEvents WorkspaceManager1 As DevExpress.Utils.WorkspaceManager
     Friend WithEvents btnTestTransferFile As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents gridBand1 As DevExpress.XtraGrid.Views.BandedGrid.GridBand
-    Friend WithEvents GridBand2 As DevExpress.XtraGrid.Views.BandedGrid.GridBand
     Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents btnDebugExportReport As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents gridBand1 As DevExpress.XtraGrid.Views.BandedGrid.GridBand
+    Friend WithEvents GridBand2 As DevExpress.XtraGrid.Views.BandedGrid.GridBand
+    Friend WithEvents btnEditRow As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnCalculatePrices As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnOpenLogDirectory2 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents txtErrors As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents btnShowErrors As DevExpress.XtraBars.BarButtonItem
 End Class

MultiTool.Form/frmMain.Designer.vb

@@ -23,41 +23,42 @@ Partial Class frmMain
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
         Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.btnOpenImportExportForm = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnReloadTemplates = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
         Me.txtVersion = New DevExpress.XtraBars.BarStaticItem()
         Me.txtCulture = New DevExpress.XtraBars.BarStaticItem()
-        Me.btnOpenInputDirectory = New DevExpress.XtraBars.BarButtonItem()
-        Me.btnOpenOutputDirectory = New DevExpress.XtraBars.BarButtonItem()
         Me.btnOpenSchemaDirectory = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnReloadWinlineData = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
-        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupStart = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupData = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components)
-        Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
+        Me.GridControlTemplates = New DevExpress.XtraGrid.GridControl()
         Me.GridViewTemplates = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.colName = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colDescription = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colFileName = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colChangedWhen = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True)
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridControlTemplates, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridViewTemplates, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnOpenImportExportForm, Me.BarButtonItem1, Me.BarButtonItem4, Me.BarButtonItem2, Me.BarButtonItem3, Me.txtVersion, Me.txtCulture, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnOpenImportExportForm, Me.btnReloadTemplates, Me.BarButtonItem4, Me.BarButtonItem2, Me.BarButtonItem3, Me.txtVersion, Me.txtCulture, Me.btnOpenSchemaDirectory, Me.btnReloadWinlineData})
         Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 13
+        Me.RibbonControl1.MaxItemId = 14
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3})
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -68,17 +69,17 @@ Partial Class frmMain
         '
         'btnOpenImportExportForm
         '
-        Me.btnOpenImportExportForm.Caption = "Vorlage öffnen"
+        Me.btnOpenImportExportForm.Caption = "Vorlage öffnen (F5)"
         Me.btnOpenImportExportForm.Id = 1
         Me.btnOpenImportExportForm.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_checkcircled1
         Me.btnOpenImportExportForm.Name = "btnOpenImportExportForm"
         '
-        'BarButtonItem1
+        'btnReloadTemplates
         '
-        Me.BarButtonItem1.Caption = "Vorlagen laden"
-        Me.BarButtonItem1.Id = 2
-        Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_reload
-        Me.BarButtonItem1.Name = "BarButtonItem1"
+        Me.btnReloadTemplates.Caption = "Vorlagen neuladen"
+        Me.btnReloadTemplates.Id = 2
+        Me.btnReloadTemplates.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.refreshpivottable
+        Me.btnReloadTemplates.Name = "btnReloadTemplates"
         '
         'BarButtonItem4
         '
@@ -117,20 +118,6 @@ Partial Class frmMain
         Me.txtCulture.Name = "txtCulture"
         Me.txtCulture.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         '
-        'btnOpenInputDirectory
-        '
-        Me.btnOpenInputDirectory.Caption = "Eingangsverzeichnis öffnen"
-        Me.btnOpenInputDirectory.Id = 10
-        Me.btnOpenInputDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open24
-        Me.btnOpenInputDirectory.Name = "btnOpenInputDirectory"
-        '
-        'btnOpenOutputDirectory
-        '
-        Me.btnOpenOutputDirectory.Caption = "Ausgangsverzeichnis öffnen"
-        Me.btnOpenOutputDirectory.Id = 11
-        Me.btnOpenOutputDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open25
-        Me.btnOpenOutputDirectory.Name = "btnOpenOutputDirectory"
-        '
         'btnOpenSchemaDirectory
         '
         Me.btnOpenSchemaDirectory.Caption = "Vorlagenverzeichnis öffnen"
@@ -138,42 +125,54 @@ Partial Class frmMain
         Me.btnOpenSchemaDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open26
         Me.btnOpenSchemaDirectory.Name = "btnOpenSchemaDirectory"
         '
+        'btnReloadWinlineData
+        '
+        Me.btnReloadWinlineData.Caption = "WinLine Daten neuladen"
+        Me.btnReloadWinlineData.Id = 13
+        Me.btnReloadWinlineData.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.update
+        Me.btnReloadWinlineData.Name = "btnReloadWinlineData"
+        '
         'RibbonPage1
         '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroupStart, Me.RibbonPageGroupData})
         Me.RibbonPage1.Name = "RibbonPage1"
         Me.RibbonPage1.Text = "Start"
         '
-        'RibbonPageGroup1
+        'RibbonPageGroupStart
         '
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.btnOpenImportExportForm)
-        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
-        Me.RibbonPageGroup1.Text = "Start"
+        Me.RibbonPageGroupStart.ItemLinks.Add(Me.btnOpenImportExportForm)
+        Me.RibbonPageGroupStart.Name = "RibbonPageGroupStart"
+        Me.RibbonPageGroupStart.Text = "Start"
         '
-        'RibbonPageGroup3
+        'RibbonPageGroupData
         '
-        Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1)
-        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
-        Me.RibbonPageGroup3.Text = "RibbonPageGroup3"
+        Me.RibbonPageGroupData.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
+        Me.RibbonPageGroupData.ItemLinks.Add(Me.btnReloadTemplates)
+        Me.RibbonPageGroupData.ItemLinks.Add(Me.btnReloadWinlineData)
+        Me.RibbonPageGroupData.Name = "RibbonPageGroupData"
+        Me.RibbonPageGroupData.Text = "Daten"
         '
         'RibbonPage3
         '
-        Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2})
+        Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup4})
         Me.RibbonPage3.Name = "RibbonPage3"
         Me.RibbonPage3.Text = "Erweitert"
         '
         'RibbonPageGroup2
         '
         Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2)
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.btnOpenInputDirectory)
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.btnOpenOutputDirectory)
         Me.RibbonPageGroup2.ItemLinks.Add(Me.btnOpenSchemaDirectory)
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem4)
         Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3)
         Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
         Me.RibbonPageGroup2.Text = "Verzeichnisse"
         '
+        'RibbonPageGroup4
+        '
+        Me.RibbonPageGroup4.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
+        Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem4)
+        Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
+        Me.RibbonPageGroup4.Text = "Konfiguration"
+        '
         'RibbonStatusBar1
         '
         Me.RibbonStatusBar1.ItemLinks.Add(Me.txtVersion)
@@ -193,21 +192,21 @@ Partial Class frmMain
         Me.SvgImageCollection1.Add("import", "image://svgimages/scheduling/import.svg")
         Me.SvgImageCollection1.Add("export", "image://svgimages/export/export.svg")
         '
-        'GridControl1
+        'GridControlTemplates
         '
-        Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GridControl1.Location = New System.Drawing.Point(0, 158)
-        Me.GridControl1.MainView = Me.GridViewTemplates
-        Me.GridControl1.MenuManager = Me.RibbonControl1
-        Me.GridControl1.Name = "GridControl1"
-        Me.GridControl1.Size = New System.Drawing.Size(757, 355)
-        Me.GridControl1.TabIndex = 9
-        Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewTemplates})
+        Me.GridControlTemplates.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.GridControlTemplates.Location = New System.Drawing.Point(0, 158)
+        Me.GridControlTemplates.MainView = Me.GridViewTemplates
+        Me.GridControlTemplates.MenuManager = Me.RibbonControl1
+        Me.GridControlTemplates.Name = "GridControlTemplates"
+        Me.GridControlTemplates.Size = New System.Drawing.Size(757, 355)
+        Me.GridControlTemplates.TabIndex = 9
+        Me.GridControlTemplates.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewTemplates})
         '
         'GridViewTemplates
         '
-        Me.GridViewTemplates.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colName, Me.colDescription, Me.colFileName})
-        Me.GridViewTemplates.GridControl = Me.GridControl1
+        Me.GridViewTemplates.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colName, Me.colDescription, Me.colFileName, Me.colChangedWhen})
+        Me.GridViewTemplates.GridControl = Me.GridControlTemplates
         Me.GridViewTemplates.Name = "GridViewTemplates"
         '
         'colName
@@ -234,6 +233,14 @@ Partial Class frmMain
         Me.colFileName.Visible = True
         Me.colFileName.VisibleIndex = 2
         '
+        'colChangedWhen
+        '
+        Me.colChangedWhen.Caption = "Letzte Änderung"
+        Me.colChangedWhen.FieldName = "LastModified"
+        Me.colChangedWhen.Name = "colChangedWhen"
+        Me.colChangedWhen.Visible = True
+        Me.colChangedWhen.VisibleIndex = 3
+        '
         'SplashScreenManager
         '
         Me.SplashScreenManager.ClosingDelay = 500
@@ -243,17 +250,18 @@ Partial Class frmMain
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(757, 537)
-        Me.Controls.Add(Me.GridControl1)
+        Me.Controls.Add(Me.GridControlTemplates)
         Me.Controls.Add(Me.RibbonStatusBar1)
         Me.Controls.Add(Me.RibbonControl1)
         Me.IconOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.squarified
+        Me.KeyPreview = True
         Me.Name = "frmMain"
         Me.Ribbon = Me.RibbonControl1
         Me.StatusBar = Me.RibbonStatusBar1
         Me.Text = "frmMain"
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridControlTemplates, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridViewTemplates, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
@@ -261,27 +269,28 @@ Partial Class frmMain
     End Sub
     Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl
     Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
-    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonPageGroupStart As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar
     Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
     Friend WithEvents btnOpenImportExportForm As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection
-    Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl
+    Friend WithEvents GridControlTemplates As DevExpress.XtraGrid.GridControl
     Friend WithEvents GridViewTemplates As DevExpress.XtraGrid.Views.Grid.GridView
     Friend WithEvents colName As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents colDescription As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents colFileName As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage
     Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
-    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnReloadTemplates As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonPageGroupData As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager
     Friend WithEvents txtVersion As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents txtCulture As DevExpress.XtraBars.BarStaticItem
-    Friend WithEvents btnOpenInputDirectory As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents btnOpenOutputDirectory As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents btnOpenSchemaDirectory As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents btnReloadWinlineData As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents colChangedWhen As DevExpress.XtraGrid.Columns.GridColumn
 End Class

MultiTool.Form/frmMain.vb

@@ -1,23 +1,22 @@
 Imports System.ComponentModel
 Imports System.IO
-Imports DigitalData.Controls.SQLConfig
+Imports DevExpress.Utils
 Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Winline
-Imports MultiTool.Shared.Winline.Entities
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Winline
+Imports MultiTool.Common.Winline.Entities
 
 Public Class frmMain
     Private LogConfig As LogConfig
     Private Logger As Logger
-    Private ConfigManager As ConfigManager(Of [Shared].Config)
+    Private ConfigManager As ConfigManager(Of Common.Config)
     Private Database As MSSQLServer
     Private TemplateLoader As TemplateLoader
     Private GridBuilder As GridBuilder
     Private FormHelper As FormHelper
-    Private WinLine As WinlineData
 
     Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Try
@@ -27,20 +26,21 @@ Public Class frmMain
             Logger = LogConfig.GetLogger()
             Logger.Info("Starting {0}, Version [{1}]", Application.ProductName, Application.ProductVersion)
 
+            ShowLoadingUI()
+
         Catch ex As Exception
             FormHelper.ShowError(ex, My.Resources.frmShared.Laden_des_Formulars)
+            HideLoadingUI()
 
         End Try
     End Sub
 
     Private Async Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
-        SplashScreenManager.ShowWaitForm()
-
         Try
             SplashScreenManager.SetWaitFormDescription("Initialisierung der Grundfunktionen")
 
             FormHelper = New FormHelper(LogConfig, Me)
-            ConfigManager = New ConfigManager(Of [Shared].Config)(LogConfig,
+            ConfigManager = New ConfigManager(Of Common.Config)(LogConfig,
                 Application.UserAppDataPath,
                 Application.CommonAppDataPath,
                 Application.StartupPath
@@ -64,52 +64,17 @@ Public Class frmMain
                 End If
             End If
 
-            SplashScreenManager.SetWaitFormDescription("Initialisierung der Datenbankverbindung")
-
             ' Initialize Database
+            SplashScreenManager.SetWaitFormDescription("Initialisierung der Datenbankverbindung")
             Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
             Database = New MSSQLServer(LogConfig, oConnectionString)
 
-            SplashScreenManager.SetWaitFormDescription("Initialisierung der Vorlagen")
-
-            ' Initialize Schemas
-            TemplateLoader = New TemplateLoader(LogConfig, Database)
-            Await TemplateLoader.LoadTemplates()
-            Await TemplateLoader.LoadTemplateConfiguration()
-            Await TemplateLoader.LoadGeneralConfiguration()
-            Await TemplateLoader.LoadMappingConfiguration()
-            Await TemplateLoader.LoadMandatorConfiguration()
-
-            ' Save Schema data in 'My' Namespace
-            My.MappingConfiguration = TemplateLoader.MappingConfiguration
-            My.TemplateConfiguration = TemplateLoader.TemplateConfiguration
-            My.MandatorConfiguration = TemplateLoader.MandatorConfiguration
-            My.GeneralConfiguration = TemplateLoader.GeneralConfiguration
-            My.Helpers = New [Shared].Helpers(LogConfig)
-
-            Dim oBindingSource = New BindingList(Of Template)
-            For Each oTemplate As Template In TemplateLoader.TemplateList
-                oBindingSource.Add(oTemplate)
-            Next
+            SplashScreenManager.SetWaitFormDescription("Lade Vorlagen")
+            GridControlTemplates.DataSource = Await LoadTemplateData()
 
             SplashScreenManager.SetWaitFormDescription("Lade Winline Stammdaten")
-            WinLine = New WinlineData(LogConfig, Database, My.GeneralConfiguration, My.MappingConfiguration, My.MandatorConfiguration)
-            WinLine.Mandators.Clear()
-            WinLine.LoadEconomicYears()
-            Await WinLine.LoadMandators()
-
-            For Each oMandator As Mandator In WinLine.Mandators
-                SplashScreenManager.SetWaitFormDescription(String.Format(My.Resources.frmImportMainExtra.Lade__0__Konten, oMandator.Id))
-                Await WinLine.LoadAccounts(oMandator)
-                SplashScreenManager.SetWaitFormDescription(String.Format(My.Resources.frmImportMainExtra.Lade__0__Artikel, oMandator.Id))
-                Await WinLine.LoadArticles(oMandator)
-                SplashScreenManager.SetWaitFormDescription(String.Format(My.Resources.frmImportMainExtra.Lade__0__Belegarten, oMandator.Id))
-                Await WinLine.LoadDocumentKinds(oMandator)
-            Next
-
-            My.Winline = WinLine
-
-            GridControl1.DataSource = oBindingSource
+            My.Winline = New WinlineData(LogConfig, Database, My.GeneralConfiguration, My.MappingConfiguration, My.MandatorConfiguration)
+            Await LoadWinlineData(My.Winline)
 
             txtVersion.Caption = String.Format(My.Resources.frmMainExtra.Version___0_, My.Application.Info.Version.ToString)
             txtCulture.Caption = String.Format(My.Resources.frmMainExtra.Sprache___0_, My.Application.UICulture.ToString)
@@ -117,16 +82,79 @@ Public Class frmMain
             FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Laden_der_Winline_Daten)
 
         Finally
-            SplashScreenManager.CloseWaitForm()
+            HideLoadingUI()
 
         End Try
     End Sub
 
+    Private Async Function LoadWinlineData(Winline As WinlineData) As Task
+        Winline.Mandators.Clear()
+        Await Winline.LoadMandatorsAsync()
+
+        For Each oMandator As Mandator In Winline.Mandators
+            SplashScreenManager.SetWaitFormDescription(String.Format(My.Resources.frmImportMainExtra.Lade__0__Konten, oMandator.Id))
+            Await Winline.LoadAccountsAsync(oMandator)
+            SplashScreenManager.SetWaitFormDescription(String.Format(My.Resources.frmImportMainExtra.Lade__0__Artikel, oMandator.Id))
+            Await Winline.LoadArticlesAsync(oMandator)
+            SplashScreenManager.SetWaitFormDescription(String.Format(My.Resources.frmImportMainExtra.Lade__0__Belegarten, oMandator.Id))
+            Await Winline.LoadDocumentKindsAsync(oMandator)
+            SplashScreenManager.SetWaitFormDescription(String.Format("Lade {0}/Colli", oMandator.Id))
+            Await Winline.LoadPackingUnitsAsync(oMandator)
+        Next
+
+        My.Winline = Winline
+    End Function
+
+    Private Async Function LoadTemplateData() As Task(Of BindingList(Of Template))
+        ' Initialize Schemas
+        TemplateLoader = New TemplateLoader(LogConfig, Database)
+        Await TemplateLoader.LoadTemplates()
+        Await TemplateLoader.LoadTemplateConfiguration()
+        Await TemplateLoader.LoadTemplateFunctions()
+        Await TemplateLoader.LoadGeneralConfiguration()
+        Await TemplateLoader.LoadMappingConfiguration()
+        Await TemplateLoader.LoadMandatorConfiguration()
+        Await TemplateLoader.LoadFilterConfiguration()
+
+        ' Save Schema data in 'My' Namespace
+        My.MappingConfiguration = TemplateLoader.MappingConfiguration
+        My.TemplateConfiguration = TemplateLoader.TemplateConfiguration
+        My.MandatorConfiguration = TemplateLoader.MandatorConfiguration
+        My.GeneralConfiguration = TemplateLoader.GeneralConfiguration
+        My.FilterConfiguration = TemplateLoader.FilterConfiguration
+
+        Dim oBindingSource = New BindingList(Of Template)
+        For Each oTemplate As Template In TemplateLoader.TemplateList
+
+            ' Check template files and update modified date
+            Try
+                Dim oFilePath = IO.Path.Combine(My.GeneralConfiguration.TemplateDirectory, oTemplate.FileName)
+                Dim oFileInfo = New FileInfo(oFilePath)
+
+                If oFileInfo.Exists Then
+                    oTemplate.LastModified = oFileInfo.LastWriteTime
+                End If
+            Catch ex As Exception
+                Logger.Error(ex)
+            End Try
+
+            oBindingSource.Add(oTemplate)
+        Next
+        Return oBindingSource
+    End Function
+
     Private Sub btnOpenImportExportForm_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenImportExportForm.ItemClick
         Dim oTemplate As Template = GridViewTemplates.GetRow(GridViewTemplates.FocusedRowHandle)
         OpenImportExportForm(oTemplate)
     End Sub
 
+    Private Sub frmMain_KeyDown(sender As Object, e As KeyEventArgs) Handles MyBase.KeyDown
+        If e.KeyCode = Keys.F5 Then
+            Dim oTemplate As Template = GridViewTemplates.GetRow(GridViewTemplates.FocusedRowHandle)
+            OpenImportExportForm(oTemplate)
+        End If
+    End Sub
+
     Private Function TryCreateTemplateDirectories(pDirectories As List(Of String)) As Boolean
         For Each oDirectory In pDirectories
             If Directory.Exists(oDirectory) = False Then
@@ -168,14 +196,16 @@ Public Class frmMain
     End Sub
 
     Private Sub GridViewTemplates_DoubleClick(sender As Object, e As EventArgs) Handles GridViewTemplates.DoubleClick
-        Dim oTemplate As Template = GridViewTemplates.GetRow(GridViewTemplates.FocusedRowHandle)
-        OpenImportExportForm(oTemplate)
+        Dim oArgs As DXMouseEventArgs = TryCast(e, DXMouseEventArgs)
+        Dim oHitInfo = GridViewTemplates.CalcHitInfo(oArgs.Location)
+        If oHitInfo.InRow Then
+            Dim oTemplate As Template = GridViewTemplates.GetRow(oHitInfo.RowHandle)
+            OpenImportExportForm(oTemplate)
+        End If
     End Sub
 
     Private Sub OpenImportExportForm(pTemplate As Template)
         Try
-
-
             If pTemplate Is Nothing Then
                 MsgBox("Keine Vorlage ausgewählt! Bitte wählen Sie eine Vorlage aus!", MsgBoxStyle.Exclamation, Text)
                 Exit Sub
@@ -217,4 +247,62 @@ Public Class frmMain
 
         End Try
     End Sub
+
+    Private Async Sub btnReloadTemplates_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadTemplates.ItemClick
+        If SplashScreenManager.IsSplashFormVisible Then
+            Exit Sub
+        End If
+
+        ShowLoadingUI()
+
+        Try
+            SplashScreenManager.SetWaitFormDescription("Lade Vorlagen")
+            GridControlTemplates.DataSource = Await LoadTemplateData()
+
+        Catch ex As Exception
+            FormHelper.ShowError(ex, "Laden der Vorlagen")
+
+        Finally
+            HideLoadingUI()
+
+        End Try
+    End Sub
+
+    Private Async Sub btnReloadWinlineData_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadWinlineData.ItemClick
+        If SplashScreenManager.IsSplashFormVisible Then
+            Exit Sub
+        End If
+
+        ShowLoadingUI()
+
+        Try
+            SplashScreenManager.SetWaitFormDescription("Lade Winline Stammdaten")
+            Await LoadWinlineData(My.Winline)
+
+        Catch ex As Exception
+            FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Laden_der_Winline_Daten)
+
+        Finally
+            HideLoadingUI()
+
+        End Try
+    End Sub
+
+    Private Sub ShowLoadingUI()
+        SplashScreenManager.ShowWaitForm()
+        GridControlTemplates.Enabled = False
+        RibbonPageGroupData.Enabled = False
+        RibbonPageGroupStart.Enabled = False
+    End Sub
+
+    Private Sub HideLoadingUI()
+        GridControlTemplates.Enabled = True
+        RibbonPageGroupData.Enabled = True
+        RibbonPageGroupStart.Enabled = True
+        SplashScreenManager.CloseWaitForm()
+    End Sub
+
+    Private Sub RibbonControl1_Click(sender As Object, e As EventArgs) Handles RibbonControl1.Click
+
+    End Sub
 End Class

MultiTool.Form/frmRowEditor.Designer.vb

@@ -57,7 +57,7 @@ Partial Class frmRowEditor
         '
         'btnSave
         '
-        Me.btnSave.Caption = "Speichern und Schließen"
+        Me.btnSave.Caption = "Speichern und Schließen (F5)"
         Me.btnSave.Id = 1
         Me.btnSave.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.save
         Me.btnSave.Name = "btnSave"
@@ -187,7 +187,9 @@ Partial Class frmRowEditor
         Me.Controls.Add(Me.GridControl1)
         Me.Controls.Add(Me.RibbonStatusBar1)
         Me.Controls.Add(Me.RibbonControl1)
+        Me.Font = New System.Drawing.Font("Segoe UI", 8.25!)
         Me.IconOptions.SvgImage = CType(resources.GetObject("frmRowEditor.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.KeyPreview = True
         Me.Name = "frmRowEditor"
         Me.Ribbon = Me.RibbonControl1
         Me.StatusBar = Me.RibbonStatusBar1

MultiTool.Form/frmRowEditor.resx

@@ -120,7 +120,7 @@
   <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="frmRowEditor.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIIFAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi

MultiTool.Form/frmRowEditor.vb

@@ -1,18 +1,19 @@
 Imports System.Globalization
-Imports MultiTool.Shared.Documents
-Imports MultiTool.Shared.Documents.DocumentRow
-Imports MultiTool.Shared.Winline
-Imports MultiTool.Shared.Winline.Entities
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Constants
-Imports DigitalData.Modules.Language
+Imports MultiTool.Common.Documents
+Imports MultiTool.Common.Documents.DocumentRow
+Imports MultiTool.Common.Winline
+Imports MultiTool.Common.Winline.Entities
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Constants
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Base
 Imports DevExpress.XtraEditors
 Imports DevExpress.XtraEditors.Repository
 Imports DevExpress.XtraEditors.Controls
 Imports DevExpress.XtraGrid.Views.Grid
 
 Public Class frmRowEditor
+    Private ReadOnly LogConfig As LogConfig
     Private ReadOnly Logger As Logger
     Private ReadOnly FormHelper As FormHelper
 
@@ -44,6 +45,7 @@ Public Class frmRowEditor
     Public Sub New(pLogConfig As LogConfig, pColumns As List(Of String), pDocumentRow As DocumentRow, pMandator As Mandator, pWinline As WinlineData, pTable As Template.Table)
         InitializeComponent()
 
+        LogConfig = pLogConfig
         Logger = pLogConfig.GetLogger()
         FormHelper = New FormHelper(pLogConfig, Me)
 
@@ -117,7 +119,9 @@ Public Class frmRowEditor
                 End If
 
                 If oField.Value Is Nothing Then
-                    oDict.Add(oColumnName, New FieldValue())
+                    ' TODO: Do we need to create a new field value here?
+                    ' aka. do we need to configure fieldvalue from column settings
+                    oDict.Add(oColumnName, New FieldValue(LogConfig))
                 Else
                     oDict.Add(oColumnName, oField.Value)
                 End If
@@ -142,6 +146,10 @@ Public Class frmRowEditor
     End Sub
 
     Private Sub btnSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSave.ItemClick
+        SaveAndClose()
+    End Sub
+
+    Private Sub SaveAndClose()
         Try
             GridView1.CloseEditor()
 
@@ -150,12 +158,16 @@ Public Class frmRowEditor
                     Where(Function(f) f.Key = oRow.Item(COL_KEY)).
                     SingleOrDefault()
 
+                ' TODO: Why do we need to create new fieldvalues here?
+                ' aka. why would the be a value for which no fieldvalue exists yet?
+                ' If there are (non-virtual) fields in the template which do not have a value yet,
+                ' this might happen.
                 If oField.Key Is Nothing Then
-                    oField = New KeyValuePair(Of String, FieldValue)(oRow.Item(COL_KEY), New FieldValue())
+                    oField = New KeyValuePair(Of String, FieldValue)(oRow.Item(COL_KEY), New FieldValue(LogConfig))
                 End If
 
                 Dim oFieldValue As FieldValue = oField.Value
-                Dim oValueFromGrid As String = Utils.NotNull(oRow.Item(COL_VALUE_FINAL), String.Empty)
+                Dim oValueFromGrid As String = ObjectEx.NotNull(oRow.Item(COL_VALUE_FINAL), String.Empty)
 
                 ' Do the dirtiest date validation of all times
                 If oField.Value.DataType = ColumnType.Date And oValueFromGrid.Length > 0 Then
@@ -169,14 +181,15 @@ Public Class frmRowEditor
                 If Not oFieldValue.Final.Equals(oValueFromGrid) Then
                     ' If new value is not empty, any error will be removed.
                     ' Could cause problems in the future because a value might not equal to 'no error'.
-                    ' 03.12.21: For now we always remove the error if ANYTHING changed about the field
                     'If oValueFromGrid <> String.Empty Then
                     '    oFieldValue.Error = FieldError.None
                     'End If
-                    oFieldValue.Error = FieldError.None
+
+                    ' 03.12.21: For now we always remove the error if ANYTHING changed about the field
+                    oFieldValue.Errors.Clear()
 
                     ' Save the grid value to the Field
-                    oFieldValue.Final = oValueFromGrid.Trim()
+                    oFieldValue.SetValue("Final", oValueFromGrid.Trim())
 
                     If _DocumentRow.Fields.ContainsKey(oField.Key) Then
                         _DocumentRow.Fields.Item(oField.Key) = oFieldValue
@@ -259,11 +272,11 @@ Public Class frmRowEditor
                 Exit Sub
             End If
 
-            If oColumn.Config?.Function?.Name = FUNCTION_GLN Then
+            If oColumn.Config?.Functions.Any(Function(f) f.Name = FUNCTION_GLN) Then
                 e.RepositoryItem = AccountPicker
             End If
 
-            If oColumn.Config?.Function?.Name = FUNCTION_EAN Then
+            If oColumn.Config?.Functions.Any(Function(f) f.Name = FUNCTION_EAN) Then
                 e.RepositoryItem = ArticlePicker
             End If
 
@@ -280,7 +293,7 @@ Public Class frmRowEditor
     Private Sub GridView1_CustomDrawCell(sender As Object, e As DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs) Handles GridView1.CustomDrawCell
         Dim oDataRow As DataRow = GridView1.GetDataRow(e.RowHandle)
         Dim oKey As String = oDataRow.Item(COL_KEY)
-        Dim oValue As String = Utils.NotNull(oDataRow.Item(COL_VALUE_FINAL), String.Empty)
+        Dim oValue As String = ObjectEx.NotNull(oDataRow.Item(COL_VALUE_FINAL), String.Empty)
         Dim oColumn = _Table.Columns.
             Where(Function(c) c.Name = oKey).
             SingleOrDefault()
@@ -298,20 +311,13 @@ Public Class frmRowEditor
             If oField.Value.HasError Then
                 e.Appearance.BackColor = Color.LightCoral
             End If
-
-            ' TODO: Remove this workaround if the conditions for errors are good now
-            'If e.DisplayText = String.Empty And (
-            '    oField.Value.Error = FieldError.AccountNotFound Or
-            '    oField.Value.Error = FieldError.ArticleNotFound) Then
-            '    e.Appearance.BackColor = Color.LightCoral
-            'End If
         End If
+    End Sub
 
-
-
-        'If oField.Value.HasError Then
-        '    e.Appearance.BackColor = Color.LightCoral
-        'End If
+    Private Sub frmRowEditor_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown
+        If e.KeyCode = Keys.F5 Then
+            SaveAndClose()
+        End If
     End Sub
 End Class
 

MultiTool.Form/frmWaitForm.Designer.vb

@@ -40,10 +40,10 @@ Partial Class frmWaitForm
         Me.progressPanel1.Location = New System.Drawing.Point(0, 17)
         Me.progressPanel1.Margin = New System.Windows.Forms.Padding(0, 3, 0, 3)
         Me.progressPanel1.Name = "progressPanel1"
-        Me.progressPanel1.Size = New System.Drawing.Size(246, 39)
+        Me.progressPanel1.Size = New System.Drawing.Size(280, 46)
         Me.progressPanel1.TabIndex = 0
         Me.progressPanel1.Text = "progressPanel1"
-        ' 
+        '
         'tableLayoutPanel1
         '
         Me.tableLayoutPanel1.AutoSize = True
@@ -58,24 +58,26 @@ Partial Class frmWaitForm
         Me.tableLayoutPanel1.Padding = New System.Windows.Forms.Padding(0, 14, 0, 14)
         Me.tableLayoutPanel1.RowCount = 1
         Me.tableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
-        Me.tableLayoutPanel1.Size = New System.Drawing.Size(246, 73)
+        Me.tableLayoutPanel1.Size = New System.Drawing.Size(280, 80)
         Me.tableLayoutPanel1.TabIndex = 1
         '
-        'Form1
+        'frmWaitForm
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.AutoSize = True
         Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.ClientSize = New System.Drawing.Size(246, 73)
+        Me.ClientSize = New System.Drawing.Size(280, 80)
         Me.Controls.Add(Me.tableLayoutPanel1)
         Me.DoubleBuffered = True
-        Me.Name = "Form1"
-        Me.StartPosition = FormStartPosition.Manual
+        Me.Name = "frmWaitForm"
+        Me.ShowOnTopMode = DevExpress.XtraWaitForm.ShowFormOnTopMode.AboveParent
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.Manual
         Me.Text = "Form1"
-        Me.tableLayoutPanel1.ResumeLayout(false)
+        Me.tableLayoutPanel1.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
+
     End Sub
 
     Private WithEvents progressPanel1 As DevExpress.XtraWaitForm.ProgressPanel

MultiTool.Form/frmWaitForm.resx

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-	<!-- 
+  <!-- 
     Microsoft ResX Schema 
     
     Version 2.0
@@ -59,62 +59,62 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-		<xsd:import namespace="http://www.w3.org/XML/1998/namespace"></xsd:import>
-		<xsd:element name="root" msdata:IsDataSet="true">
-			<xsd:complexType>
-				<xsd:choice maxOccurs="unbounded">
-					<xsd:element name="metadata">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0"></xsd:element>
-							</xsd:sequence>
-							<xsd:attribute name="name" use="required" type="xsd:string"></xsd:attribute>
-							<xsd:attribute name="type" type="xsd:string"></xsd:attribute>
-							<xsd:attribute name="mimetype" type="xsd:string"></xsd:attribute>
-							<xsd:attribute ref="xml:space"></xsd:attribute>
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="assembly">
-						<xsd:complexType>
-							<xsd:attribute name="alias" type="xsd:string"></xsd:attribute>
-							<xsd:attribute name="name" type="xsd:string"></xsd:attribute>
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="data">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"></xsd:element>
-								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"></xsd:element>
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"></xsd:attribute>
-							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"></xsd:attribute>
-							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"></xsd:attribute>
-							<xsd:attribute ref="xml:space"></xsd:attribute>
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="resheader">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"></xsd:element>
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:complexType>
-		</xsd:element>
-	</xsd:schema>
-	<resheader name="resmimetype">
-		<value>text/microsoft-resx</value>
-	</resheader>
-	<resheader name="version">
-		<value>2.0</value>
-	</resheader>
-	<resheader name="reader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<resheader name="writer">
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
 </root>