WIP

EDIDocumentImport/ImporterForm.vbproj

@@ -221,6 +221,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="README.txt" />
+    <None Include="Resources\open21.svg" />
     <None Include="Resources\paymentrefund.svg" />
     <None Include="Resources\open2.svg" />
     <None Include="Resources\open.svg" />

EDIDocumentImport/My Project/Resources.Designer.vb

@@ -120,6 +120,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property open21() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("open21", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>

EDIDocumentImport/My Project/Resources.resx

@@ -121,6 +121,9 @@
   <data name="singlepageview" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.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.v19.2, Version=19.2.3.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.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -157,7 +160,7 @@
   <data name="showallfieldcodes" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\showallfieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="paymentrefund" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="open21" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\paymentrefund.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\open21.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>

EDIDocumentImport/Positions/Position.vb

@@ -9,6 +9,8 @@
         Public Property WinLinePrice As Double
         Public Property Price As Double
         Public Property Amount As Double
+        Public Property ReplacementArticleNumber As String
+        Public Property UseReplacementNumber As Boolean = False
     End Class
 
 End Namespace

EDIDocumentImport/Positions/PositionColumns.vb

@@ -18,35 +18,40 @@ Namespace Positions
             .Caption = "EAN",
             .VisibleIndex = 2
         }
+        Public Shared Property ColumnReplacementArticleNumber As New GridColumn With {
+            .FieldName = "ReplacementArticleNumber",
+            .Caption = "Ersatzartikel",
+            .VisibleIndex = 3
+        }
         Public Shared Property ColumnArticleNumberVendor As New GridColumn With {
             .FieldName = "ArticleNumberVendor",
             .Caption = "Artikel Lieferant",
-            .VisibleIndex = 3
+            .VisibleIndex = 4
         }
         Public Shared Property ColumnArticleDescription As New GridColumn With {
             .FieldName = "ArticleDescription",
             .Caption = "Artikel Beschreibung",
-            .VisibleIndex = 4
+            .VisibleIndex = 5
         }
         Public Shared Property ColumnAmount As New GridColumn With {
             .FieldName = "Amount",
             .Caption = "Menge",
-            .VisibleIndex = 5
+            .VisibleIndex = 6
         }
         Public Shared Property ColumnEDIPrice As New GridColumn With {
             .FieldName = "EDIPrice",
             .Caption = "Einzelpreis EDI",
-            .VisibleIndex = 6
+            .VisibleIndex = 7
         }
         Public Shared Property ColumnWinLinePrice As New GridColumn With {
             .FieldName = "WinLinePrice",
             .Caption = "Einzelpreis WinLine",
-            .VisibleIndex = 7
+            .VisibleIndex = 8
         }
         Public Shared Property ColumnPrice As New GridColumn With {
             .FieldName = "Price",
             .Caption = "Einzelpreis",
-            .VisibleIndex = 8
+            .VisibleIndex = 9
         }
 
         ''' <summary>
@@ -59,6 +64,7 @@ Namespace Positions
         Public Shared Property AllColumns As New List(Of GridColumn) From {
             ColumnRowNumber,
             ColumnArticleNumber,
+            ColumnReplacementArticleNumber,
             ColumnArticleNumberVendor,
             ColumnEuropeanArticleNumber,
             ColumnArticleDescription,

EDIDocumentImport/Positions/PositionData.vb

@@ -1,8 +1,19 @@
-Imports ImporterForm.Positions
+Imports DigitalData.Modules.Logging
+Imports ImporterForm.Positions
+Imports ImporterShared.Winline
 Imports ImporterShared.Schemas
 
 Public Class PositionData
-    Public Shared Function Load(pData As Orders.Input.MESOWebService, pDataOriginal As Orders.Input.MESOWebService) As List(Of Position)
+    Inherits ImporterShared.BaseClass
+
+    Private Winline As Data
+
+    Public Sub New(pLogConfig As LogConfig, pWinline As Data)
+        MyBase.New(pLogConfig, pLogConfig.GetLogger())
+        Winline = pWinline
+    End Sub
+
+    Public Function Load(pMandator As Mandator, pData As Orders.Input.MESOWebService, pDataOriginal As Orders.Input.MESOWebService) As List(Of Position)
         Dim oPositions = Orders.Helpers.GetOrderPositions(pData)
         Dim oPositionsOriginal = Orders.Helpers.GetOrderPositions(pDataOriginal)
         Dim oPositionList As New List(Of Position)
@@ -12,6 +23,13 @@ Public Class PositionData
                 Where(Function(p) p.Zeilennummer = oPosition.Zeilennummer).
                 SingleOrDefault()
 
+            Dim oReplacementNumber As String = Winline.GetReplacementArticleNumber(oPosition.Artikelnummer, pMandator)
+
+            ' If ArticleNumber is the same as the replacement Number, this Article does not have a replacement Number
+            If oReplacementNumber = oPosition.Artikelnummer Then
+                oReplacementNumber = Nothing
+            End If
+
             oPositionList.Add(New Position With {
                 .ArticleNumber = oPosition.Artikelnummer,
                 .RowNumber = oPosition.Zeilennummer,
@@ -21,7 +39,8 @@ Public Class PositionData
                 .WinLinePrice = 0,
                 .Price = 0,
                 .Amount = oPosition.Menge_bestellt,
-                .EuropeanArticleNumber = oPositionOriginal.Artikelnummer
+                .EuropeanArticleNumber = oPositionOriginal.Artikelnummer,
+                .ReplacementArticleNumber = oReplacementNumber
             })
         Next
 

EDIDocumentImport/Resources/open21.svg

@@ -0,0 +1,13 @@
+<?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="Open2" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Green{fill:#039C23;}
+	.Yellow{fill:#FFB115;}
+	.st0{opacity:0.75;}
+</style>
+  <g class="st0">
+    <path d="M19.2,10H12V7c0-0.6-0.4-1-1-1H3C2.4,6,2,6.5,2,7v18c0,0.2,0,0.3,0.1,0.4c0,0,0.1-0.1,0.1-0.2l5.5-10   C8,14.5,8.7,14,9.5,14h13.7L19.2,10z" class="Yellow" />
+  </g>
+  <path d="M29.3,16H9.6L4,26h19.8c0.5,0,1.1-0.2,1.3-0.6l4.9-8.9C30.1,16.2,29.8,16,29.3,16z" class="Yellow" />
+  <path d="M28,8c0-3.3-2.7-6-6-6s-6,2.7-6,6c0-2.2,1.8-4,4-4s4,1.8,4,4h-4l6,6l6-6H28z" class="Green" />
+</svg>

EDIDocumentImport/frmMain.Designer.vb

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmMain
     Inherits DevExpress.XtraBars.Ribbon.RibbonForm
 
     'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         If disposing AndAlso components IsNot Nothing Then
             components.Dispose()
@@ -17,22 +17,24 @@ Partial Class frmMain
     'NOTE: The following procedure is required by the Windows Form Designer
     'It can be modified using the Windows Form Designer.  
     'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
         Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl()
-        Me.btnLoadDocuments = New DevExpress.XtraBars.BarButtonItem()
+        Me.ApplicationMenu1 = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components)
-        Me.txtFilesLoaded = New DevExpress.XtraBars.BarHeaderItem()
+        Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnLoadDocuments = New DevExpress.XtraBars.BarButtonItem()
+        Me.txtFilesLoaded = New DevExpress.XtraBars.BarHeaderItem()
         Me.checkShowXml = New DevExpress.XtraBars.BarCheckItem()
         Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem()
         Me.txtVersion = New DevExpress.XtraBars.BarStaticItem()
         Me.btnDeletePosition = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
         Me.btnPreviewReport = New DevExpress.XtraBars.BarButtonItem()
         Me.btnReportPreview = New DevExpress.XtraBars.BarButtonItem()
         Me.btnReloadDocument = New DevExpress.XtraBars.BarButtonItem()
@@ -54,10 +56,9 @@ Partial Class frmMain
         Me.txtOrderIssuer = New DevExpress.XtraEditors.TextEdit()
         Me.MemoEdit1 = New DevExpress.XtraEditors.MemoEdit()
         Me.txtOrderNumber = New DevExpress.XtraEditors.TextEdit()
-        Me.TextEdit5 = New DevExpress.XtraEditors.TextEdit()
+        Me.txtStreetName = New DevExpress.XtraEditors.TextEdit()
-        Me.TextEdit6 = New DevExpress.XtraEditors.TextEdit()
+        Me.txtPlace = New DevExpress.XtraEditors.TextEdit()
-        Me.TextEdit7 = New DevExpress.XtraEditors.TextEdit()
+        Me.txtZIP = New DevExpress.XtraEditors.TextEdit()
-        Me.TextEdit8 = New DevExpress.XtraEditors.TextEdit()
         Me.TextEdit9 = New DevExpress.XtraEditors.TextEdit()
         Me.txtRunningNumber = New DevExpress.XtraEditors.TextEdit()
         Me.dateOrderDate = New DevExpress.XtraEditors.DateEdit()
@@ -73,16 +74,10 @@ Partial Class frmMain
         Me.txtCustomerGLN = New DevExpress.XtraEditors.TextEdit()
         Me.txtDeliveryAddressGLN = New DevExpress.XtraEditors.TextEdit()
         Me.txtDocumentReference = New DevExpress.XtraEditors.MemoEdit()
-        Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit()
+        Me.txtName = New DevExpress.XtraEditors.TextEdit()
+        Me.cmbDocumentKind = New DevExpress.XtraEditors.ComboBoxEdit()
         Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
         Me.TabbedControlGroup2 = New DevExpress.XtraLayout.TabbedControlGroup()
-        Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup()
-        Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem15 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup()
         Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
@@ -93,17 +88,22 @@ Partial Class frmMain
         Me.LayoutControlItem13 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItemRunningNumber = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem14 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItemRunningNumber = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup()
+        Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem15 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.GridControlPositions = New DevExpress.XtraGrid.GridControl()
         Me.GridViewPositions = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.SplitContainerControl3 = New DevExpress.XtraEditors.SplitContainerControl()
         Me.RichEditXml = New DevExpress.XtraRichEdit.RichEditControl()
-        Me.cmdDocumentKind = New DevExpress.XtraEditors.SearchLookUpEdit()
-        Me.GridView3 = New DevExpress.XtraGrid.Views.Grid.GridView()
         CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -115,10 +115,9 @@ Partial Class frmMain
         CType(Me.txtOrderIssuer.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.MemoEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtOrderNumber.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtStreetName.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TextEdit6.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtPlace.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TextEdit7.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtZIP.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TextEdit8.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TextEdit9.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtRunningNumber.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dateOrderDate.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -133,16 +132,10 @@ Partial Class frmMain
         CType(Me.txtCustomerGLN.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtDeliveryAddressGLN.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtDocumentReference.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtName.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.cmbDocumentKind.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TabbedControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem10, 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.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -153,45 +146,59 @@ Partial Class frmMain
         CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItemRunningNumber, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItemRunningNumber, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridControlPositions, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridViewPositions, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerControl3.SuspendLayout()
-        CType(Me.cmdDocumentKind.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'RibbonControl
         '
+        Me.RibbonControl.ApplicationButtonDropDownControl = Me.ApplicationMenu1
         Me.RibbonControl.ExpandCollapseItem.Id = 0
         Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnLoadDocuments, Me.txtFilesLoaded, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.checkShowXml, Me.BarButtonItem4, Me.BarButtonItem5, Me.txtVersion, Me.btnDeletePosition, Me.BarButtonItem7, Me.BarButtonItem8, Me.btnPreviewReport, Me.btnReportPreview, Me.btnReloadDocument})
         Me.RibbonControl.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl.MaxItemId = 19
+        Me.RibbonControl.MaxItemId = 20
         Me.RibbonControl.Name = "RibbonControl"
         Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
-        Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
+        Me.RibbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages
-        Me.RibbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
         Me.RibbonControl.ShowToolbarCustomizeItem = False
-        Me.RibbonControl.Size = New System.Drawing.Size(1406, 132)
+        Me.RibbonControl.Size = New System.Drawing.Size(1406, 158)
         Me.RibbonControl.StatusBar = Me.RibbonStatusBar
         Me.RibbonControl.Toolbar.ShowCustomizeItem = False
         '
-        'btnLoadDocuments
+        'ApplicationMenu1
         '
-        Me.btnLoadDocuments.Caption = "Dokumente einlesen"
+        Me.ApplicationMenu1.ItemLinks.Add(Me.BarButtonItem8)
-        Me.btnLoadDocuments.Id = 1
+        Me.ApplicationMenu1.ItemLinks.Add(Me.BarButtonItem3)
-        Me.btnLoadDocuments.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.import
+        Me.ApplicationMenu1.ItemLinks.Add(Me.BarButtonItem1)
-        Me.btnLoadDocuments.Name = "btnLoadDocuments"
+        Me.ApplicationMenu1.ItemLinks.Add(Me.BarButtonItem2)
+        Me.ApplicationMenu1.Name = "ApplicationMenu1"
+        Me.ApplicationMenu1.Ribbon = Me.RibbonControl
         '
-        'txtFilesLoaded
+        'BarButtonItem8
         '
-        Me.txtFilesLoaded.Caption = "Keine Dokumente geladen"
+        Me.BarButtonItem8.Caption = "Logverzeichnis öffnen"
-        Me.txtFilesLoaded.Id = 3
+        Me.BarButtonItem8.Id = 15
-        Me.txtFilesLoaded.Name = "txtFilesLoaded"
+        Me.BarButtonItem8.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.singlepageview
+        Me.BarButtonItem8.Name = "BarButtonItem8"
+        '
+        'BarButtonItem3
+        '
+        Me.BarButtonItem3.Caption = "Konfigurationsverzeichnis öffnen"
+        Me.BarButtonItem3.Id = 7
+        Me.BarButtonItem3.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.pagesetup
+        Me.BarButtonItem3.Name = "BarButtonItem3"
         '
         'BarButtonItem1
         '
@@ -207,12 +214,18 @@ Partial Class frmMain
         Me.BarButtonItem2.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.open
         Me.BarButtonItem2.Name = "BarButtonItem2"
         '
-        'BarButtonItem3
+        'btnLoadDocuments
         '
-        Me.BarButtonItem3.Caption = "Konfigurationsverzeichnis öffnen"
+        Me.btnLoadDocuments.Caption = "Dokumente einlesen"
-        Me.BarButtonItem3.Id = 7
+        Me.btnLoadDocuments.Id = 1
-        Me.BarButtonItem3.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.pagesetup
+        Me.btnLoadDocuments.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.import
-        Me.BarButtonItem3.Name = "BarButtonItem3"
+        Me.btnLoadDocuments.Name = "btnLoadDocuments"
+        '
+        'txtFilesLoaded
+        '
+        Me.txtFilesLoaded.Caption = "Keine Dokumente geladen"
+        Me.txtFilesLoaded.Id = 3
+        Me.txtFilesLoaded.Name = "txtFilesLoaded"
         '
         'checkShowXml
         '
@@ -256,13 +269,6 @@ Partial Class frmMain
         Me.BarButtonItem7.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.tableproperties
         Me.BarButtonItem7.Name = "BarButtonItem7"
         '
-        'BarButtonItem8
-        '
-        Me.BarButtonItem8.Caption = "Logverzeichnis öffnen"
-        Me.BarButtonItem8.Id = 15
-        Me.BarButtonItem8.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.singlepageview
-        Me.BarButtonItem8.Name = "BarButtonItem8"
-        '
         'btnPreviewReport
         '
         Me.btnPreviewReport.Caption = "Belegvorschau für aktuelle Zeile öffnen"
@@ -300,6 +306,8 @@ Partial Class frmMain
         'RibbonPageGroup2
         '
         Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3)
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem8)
         Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1)
         Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2)
         Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
@@ -345,7 +353,7 @@ Partial Class frmMain
         Me.GridControlFiles.MainView = Me.GridViewFiles
         Me.GridControlFiles.MenuManager = Me.RibbonControl
         Me.GridControlFiles.Name = "GridControlFiles"
-        Me.GridControlFiles.Size = New System.Drawing.Size(324, 620)
+        Me.GridControlFiles.Size = New System.Drawing.Size(324, 594)
         Me.GridControlFiles.TabIndex = 2
         Me.GridControlFiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewFiles})
         '
@@ -397,7 +405,7 @@ Partial Class frmMain
         Me.SplitContainerControl1.Panel1.Text = "Panel1"
         Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl2)
         Me.SplitContainerControl1.Panel2.Text = "Panel2"
-        Me.SplitContainerControl1.Size = New System.Drawing.Size(1396, 620)
+        Me.SplitContainerControl1.Size = New System.Drawing.Size(1396, 594)
         Me.SplitContainerControl1.SplitterPosition = 324
         Me.SplitContainerControl1.TabIndex = 3
         '
@@ -411,8 +419,8 @@ Partial Class frmMain
         Me.SplitContainerControl2.Panel1.Text = "Panel1"
         Me.SplitContainerControl2.Panel2.Controls.Add(Me.GridControlPositions)
         Me.SplitContainerControl2.Panel2.Text = "Panel2"
-        Me.SplitContainerControl2.Size = New System.Drawing.Size(1062, 620)
+        Me.SplitContainerControl2.Size = New System.Drawing.Size(1062, 594)
-        Me.SplitContainerControl2.SplitterPosition = 275
+        Me.SplitContainerControl2.SplitterPosition = 317
         Me.SplitContainerControl2.TabIndex = 0
         '
         'LayoutControlHead
@@ -420,10 +428,9 @@ Partial Class frmMain
         Me.LayoutControlHead.Controls.Add(Me.txtOrderIssuer)
         Me.LayoutControlHead.Controls.Add(Me.MemoEdit1)
         Me.LayoutControlHead.Controls.Add(Me.txtOrderNumber)
-        Me.LayoutControlHead.Controls.Add(Me.TextEdit5)
+        Me.LayoutControlHead.Controls.Add(Me.txtStreetName)
-        Me.LayoutControlHead.Controls.Add(Me.TextEdit6)
+        Me.LayoutControlHead.Controls.Add(Me.txtPlace)
-        Me.LayoutControlHead.Controls.Add(Me.TextEdit7)
+        Me.LayoutControlHead.Controls.Add(Me.txtZIP)
-        Me.LayoutControlHead.Controls.Add(Me.TextEdit8)
         Me.LayoutControlHead.Controls.Add(Me.TextEdit9)
         Me.LayoutControlHead.Controls.Add(Me.txtRunningNumber)
         Me.LayoutControlHead.Controls.Add(Me.dateOrderDate)
@@ -434,80 +441,71 @@ Partial Class frmMain
         Me.LayoutControlHead.Controls.Add(Me.txtCustomerGLN)
         Me.LayoutControlHead.Controls.Add(Me.txtDeliveryAddressGLN)
         Me.LayoutControlHead.Controls.Add(Me.txtDocumentReference)
-        Me.LayoutControlHead.Controls.Add(Me.TextEdit1)
+        Me.LayoutControlHead.Controls.Add(Me.txtName)
-        Me.LayoutControlHead.Controls.Add(Me.cmdDocumentKind)
+        Me.LayoutControlHead.Controls.Add(Me.cmbDocumentKind)
         Me.LayoutControlHead.Dock = System.Windows.Forms.DockStyle.Fill
         Me.LayoutControlHead.Enabled = False
         Me.LayoutControlHead.Location = New System.Drawing.Point(0, 0)
         Me.LayoutControlHead.Name = "LayoutControlHead"
         Me.LayoutControlHead.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1270, 166, 650, 400)
         Me.LayoutControlHead.Root = Me.Root
-        Me.LayoutControlHead.Size = New System.Drawing.Size(1062, 275)
+        Me.LayoutControlHead.Size = New System.Drawing.Size(1062, 317)
         Me.LayoutControlHead.TabIndex = 0
         Me.LayoutControlHead.Text = "LayoutControl1"
         '
         'txtOrderIssuer
         '
-        Me.txtOrderIssuer.Location = New System.Drawing.Point(123, 140)
+        Me.txtOrderIssuer.Location = New System.Drawing.Point(123, 170)
         Me.txtOrderIssuer.MenuManager = Me.RibbonControl
         Me.txtOrderIssuer.Name = "txtOrderIssuer"
-        Me.txtOrderIssuer.Size = New System.Drawing.Size(264, 20)
+        Me.txtOrderIssuer.Size = New System.Drawing.Size(402, 20)
         Me.txtOrderIssuer.StyleController = Me.LayoutControlHead
         Me.txtOrderIssuer.TabIndex = 6
         '
         'MemoEdit1
         '
-        Me.MemoEdit1.Location = New System.Drawing.Point(632, 170)
+        Me.MemoEdit1.Location = New System.Drawing.Point(631, 200)
         Me.MemoEdit1.MenuManager = Me.RibbonControl
         Me.MemoEdit1.Name = "MemoEdit1"
-        Me.MemoEdit1.Size = New System.Drawing.Size(403, 78)
+        Me.MemoEdit1.Size = New System.Drawing.Size(404, 90)
         Me.MemoEdit1.StyleController = Me.LayoutControlHead
         Me.MemoEdit1.TabIndex = 12
         '
         'txtOrderNumber
         '
-        Me.txtOrderNumber.Location = New System.Drawing.Point(493, 140)
+        Me.txtOrderNumber.Location = New System.Drawing.Point(631, 170)
         Me.txtOrderNumber.MenuManager = Me.RibbonControl
         Me.txtOrderNumber.Name = "txtOrderNumber"
-        Me.txtOrderNumber.Size = New System.Drawing.Size(217, 20)
+        Me.txtOrderNumber.Size = New System.Drawing.Size(166, 20)
         Me.txtOrderNumber.StyleController = Me.LayoutControlHead
         Me.txtOrderNumber.TabIndex = 7
         '
-        'TextEdit5
+        'txtStreetName
         '
-        Me.TextEdit5.Location = New System.Drawing.Point(123, 80)
+        Me.txtStreetName.Location = New System.Drawing.Point(123, 80)
-        Me.TextEdit5.MenuManager = Me.RibbonControl
+        Me.txtStreetName.MenuManager = Me.RibbonControl
-        Me.TextEdit5.Name = "TextEdit5"
+        Me.txtStreetName.Name = "txtStreetName"
-        Me.TextEdit5.Size = New System.Drawing.Size(599, 20)
+        Me.txtStreetName.Size = New System.Drawing.Size(912, 20)
-        Me.TextEdit5.StyleController = Me.LayoutControlHead
+        Me.txtStreetName.StyleController = Me.LayoutControlHead
-        Me.TextEdit5.TabIndex = 3
+        Me.txtStreetName.TabIndex = 3
         '
-        'TextEdit6
+        'txtPlace
         '
-        Me.TextEdit6.Location = New System.Drawing.Point(828, 80)
+        Me.txtPlace.Location = New System.Drawing.Point(346, 110)
-        Me.TextEdit6.MenuManager = Me.RibbonControl
+        Me.txtPlace.MenuManager = Me.RibbonControl
-        Me.TextEdit6.Name = "TextEdit6"
+        Me.txtPlace.Name = "txtPlace"
-        Me.TextEdit6.Size = New System.Drawing.Size(207, 20)
+        Me.txtPlace.Size = New System.Drawing.Size(689, 20)
-        Me.TextEdit6.StyleController = Me.LayoutControlHead
+        Me.txtPlace.StyleController = Me.LayoutControlHead
-        Me.TextEdit6.TabIndex = 5
+        Me.txtPlace.TabIndex = 11
         '
-        'TextEdit7
+        'txtZIP
         '
-        Me.TextEdit7.Location = New System.Drawing.Point(346, 110)
+        Me.txtZIP.Location = New System.Drawing.Point(123, 110)
-        Me.TextEdit7.MenuManager = Me.RibbonControl
+        Me.txtZIP.MenuManager = Me.RibbonControl
-        Me.TextEdit7.Name = "TextEdit7"
+        Me.txtZIP.Name = "txtZIP"
-        Me.TextEdit7.Size = New System.Drawing.Size(689, 20)
+        Me.txtZIP.Size = New System.Drawing.Size(117, 20)
-        Me.TextEdit7.StyleController = Me.LayoutControlHead
+        Me.txtZIP.StyleController = Me.LayoutControlHead
-        Me.TextEdit7.TabIndex = 11
+        Me.txtZIP.TabIndex = 9
-        '
-        'TextEdit8
-        '
-        Me.TextEdit8.Location = New System.Drawing.Point(123, 110)
-        Me.TextEdit8.MenuManager = Me.RibbonControl
-        Me.TextEdit8.Name = "TextEdit8"
-        Me.TextEdit8.Size = New System.Drawing.Size(117, 20)
-        Me.TextEdit8.StyleController = Me.LayoutControlHead
-        Me.TextEdit8.TabIndex = 9
         '
         'TextEdit9
         '
@@ -520,34 +518,34 @@ Partial Class frmMain
         '
         'txtRunningNumber
         '
-        Me.txtRunningNumber.Location = New System.Drawing.Point(702, 50)
+        Me.txtRunningNumber.Location = New System.Drawing.Point(123, 50)
         Me.txtRunningNumber.MenuManager = Me.RibbonControl
         Me.txtRunningNumber.Name = "txtRunningNumber"
-        Me.txtRunningNumber.Size = New System.Drawing.Size(124, 20)
+        Me.txtRunningNumber.Size = New System.Drawing.Size(402, 20)
         Me.txtRunningNumber.StyleController = Me.LayoutControlHead
         Me.txtRunningNumber.TabIndex = 2
         '
         'dateOrderDate
         '
         Me.dateOrderDate.EditValue = Nothing
-        Me.dateOrderDate.Location = New System.Drawing.Point(816, 140)
+        Me.dateOrderDate.Location = New System.Drawing.Point(903, 170)
         Me.dateOrderDate.MenuManager = Me.RibbonControl
         Me.dateOrderDate.Name = "dateOrderDate"
         Me.dateOrderDate.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
         Me.dateOrderDate.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
-        Me.dateOrderDate.Size = New System.Drawing.Size(219, 20)
+        Me.dateOrderDate.Size = New System.Drawing.Size(132, 20)
         Me.dateOrderDate.StyleController = Me.LayoutControlHead
         Me.dateOrderDate.TabIndex = 8
         '
         'cmbMandator
         '
-        Me.cmbMandator.Location = New System.Drawing.Point(123, 50)
+        Me.cmbMandator.Location = New System.Drawing.Point(123, 80)
         Me.cmbMandator.MenuManager = Me.RibbonControl
         Me.cmbMandator.Name = "cmbMandator"
         Me.cmbMandator.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
         Me.cmbMandator.Properties.NullText = ""
         Me.cmbMandator.Properties.PopupView = Me.SearchLookUpEdit1View
-        Me.cmbMandator.Size = New System.Drawing.Size(235, 20)
+        Me.cmbMandator.Size = New System.Drawing.Size(402, 20)
         Me.cmbMandator.StyleController = Me.LayoutControlHead
         Me.cmbMandator.TabIndex = 4
         '
@@ -577,7 +575,7 @@ Partial Class frmMain
         '
         'cmbCustomer
         '
-        Me.cmbCustomer.Location = New System.Drawing.Point(123, 80)
+        Me.cmbCustomer.Location = New System.Drawing.Point(123, 110)
         Me.cmbCustomer.MenuManager = Me.RibbonControl
         Me.cmbCustomer.Name = "cmbCustomer"
         Me.cmbCustomer.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
@@ -596,7 +594,7 @@ Partial Class frmMain
         '
         'cmbDeliveryAddress
         '
-        Me.cmbDeliveryAddress.Location = New System.Drawing.Point(123, 110)
+        Me.cmbDeliveryAddress.Location = New System.Drawing.Point(123, 140)
         Me.cmbDeliveryAddress.MenuManager = Me.RibbonControl
         Me.cmbDeliveryAddress.Name = "cmbDeliveryAddress"
         Me.cmbDeliveryAddress.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
@@ -616,17 +614,17 @@ Partial Class frmMain
         '
         'cmbYears
         '
-        Me.cmbYears.Location = New System.Drawing.Point(464, 50)
+        Me.cmbYears.Location = New System.Drawing.Point(631, 80)
         Me.cmbYears.MenuManager = Me.RibbonControl
         Me.cmbYears.Name = "cmbYears"
         Me.cmbYears.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
-        Me.cmbYears.Size = New System.Drawing.Size(132, 20)
+        Me.cmbYears.Size = New System.Drawing.Size(404, 20)
         Me.cmbYears.StyleController = Me.LayoutControlHead
         Me.cmbYears.TabIndex = 15
         '
         'txtCustomerGLN
         '
-        Me.txtCustomerGLN.Location = New System.Drawing.Point(631, 80)
+        Me.txtCustomerGLN.Location = New System.Drawing.Point(631, 110)
         Me.txtCustomerGLN.MenuManager = Me.RibbonControl
         Me.txtCustomerGLN.Name = "txtCustomerGLN"
         Me.txtCustomerGLN.Size = New System.Drawing.Size(404, 20)
@@ -635,7 +633,7 @@ Partial Class frmMain
         '
         'txtDeliveryAddressGLN
         '
-        Me.txtDeliveryAddressGLN.Location = New System.Drawing.Point(631, 110)
+        Me.txtDeliveryAddressGLN.Location = New System.Drawing.Point(631, 140)
         Me.txtDeliveryAddressGLN.MenuManager = Me.RibbonControl
         Me.txtDeliveryAddressGLN.Name = "txtDeliveryAddressGLN"
         Me.txtDeliveryAddressGLN.Size = New System.Drawing.Size(404, 20)
@@ -644,21 +642,32 @@ Partial Class frmMain
         '
         'txtDocumentReference
         '
-        Me.txtDocumentReference.Location = New System.Drawing.Point(123, 170)
+        Me.txtDocumentReference.Location = New System.Drawing.Point(123, 200)
         Me.txtDocumentReference.MenuManager = Me.RibbonControl
         Me.txtDocumentReference.Name = "txtDocumentReference"
-        Me.txtDocumentReference.Size = New System.Drawing.Size(403, 78)
+        Me.txtDocumentReference.Size = New System.Drawing.Size(402, 90)
         Me.txtDocumentReference.StyleController = Me.LayoutControlHead
         Me.txtDocumentReference.TabIndex = 19
         '
-        'TextEdit1
+        'txtName
         '
-        Me.TextEdit1.Location = New System.Drawing.Point(123, 50)
+        Me.txtName.Location = New System.Drawing.Point(123, 50)
-        Me.TextEdit1.MenuManager = Me.RibbonControl
+        Me.txtName.MenuManager = Me.RibbonControl
-        Me.TextEdit1.Name = "TextEdit1"
+        Me.txtName.Name = "txtName"
-        Me.TextEdit1.Size = New System.Drawing.Size(912, 20)
+        Me.txtName.Size = New System.Drawing.Size(912, 20)
-        Me.TextEdit1.StyleController = Me.LayoutControlHead
+        Me.txtName.StyleController = Me.LayoutControlHead
-        Me.TextEdit1.TabIndex = 20
+        Me.txtName.TabIndex = 20
+        '
+        'cmbDocumentKind
+        '
+        Me.cmbDocumentKind.Location = New System.Drawing.Point(631, 50)
+        Me.cmbDocumentKind.MenuManager = Me.RibbonControl
+        Me.cmbDocumentKind.Name = "cmbDocumentKind"
+        Me.cmbDocumentKind.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.cmbDocumentKind.Properties.PopupSizeable = True
+        Me.cmbDocumentKind.Size = New System.Drawing.Size(404, 20)
+        Me.cmbDocumentKind.StyleController = Me.LayoutControlHead
+        Me.cmbDocumentKind.TabIndex = 18
         '
         'Root
         '
@@ -666,7 +675,7 @@ Partial Class frmMain
         Me.Root.GroupBordersVisible = False
         Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.TabbedControlGroup2})
         Me.Root.Name = "Root"
-        Me.Root.Size = New System.Drawing.Size(1062, 275)
+        Me.Root.Size = New System.Drawing.Size(1062, 317)
         Me.Root.TextVisible = False
         '
         'TabbedControlGroup2
@@ -674,89 +683,21 @@ Partial Class frmMain
         Me.TabbedControlGroup2.Location = New System.Drawing.Point(0, 0)
         Me.TabbedControlGroup2.Name = "TabbedControlGroup2"
         Me.TabbedControlGroup2.SelectedTabPage = Me.LayoutControlGroup2
-        Me.TabbedControlGroup2.Size = New System.Drawing.Size(1042, 255)
+        Me.TabbedControlGroup2.Size = New System.Drawing.Size(1042, 297)
         Me.TabbedControlGroup2.TabPages.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup2, Me.LayoutControlGroup1})
         '
-        'LayoutControlGroup1
-        '
-        Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem8, Me.LayoutControlItem9, Me.LayoutControlItem15})
-        Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0)
-        Me.LayoutControlGroup1.Name = "LayoutControlGroup1"
-        Me.LayoutControlGroup1.Size = New System.Drawing.Size(1018, 208)
-        Me.LayoutControlGroup1.Text = "Diverse Adresse"
-        '
-        'LayoutControlItem10
-        '
-        Me.LayoutControlItem10.Control = Me.TextEdit9
-        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(1018, 118)
-        Me.LayoutControlItem10.Text = "Kontakt"
-        Me.LayoutControlItem10.TextSize = New System.Drawing.Size(93, 13)
-        '
-        'LayoutControlItem6
-        '
-        Me.LayoutControlItem6.Control = Me.TextEdit5
-        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 30)
-        Me.LayoutControlItem6.Name = "LayoutControlItem6"
-        Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem6.Size = New System.Drawing.Size(705, 30)
-        Me.LayoutControlItem6.Text = "Straße"
-        Me.LayoutControlItem6.TextSize = New System.Drawing.Size(93, 13)
-        '
-        'LayoutControlItem7
-        '
-        Me.LayoutControlItem7.Control = Me.TextEdit6
-        Me.LayoutControlItem7.Location = New System.Drawing.Point(705, 30)
-        Me.LayoutControlItem7.Name = "LayoutControlItem7"
-        Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem7.Size = New System.Drawing.Size(313, 30)
-        Me.LayoutControlItem7.Text = "Hausnummer"
-        Me.LayoutControlItem7.TextSize = New System.Drawing.Size(93, 13)
-        '
-        'LayoutControlItem8
-        '
-        Me.LayoutControlItem8.Control = Me.TextEdit7
-        Me.LayoutControlItem8.Location = New System.Drawing.Point(223, 60)
-        Me.LayoutControlItem8.Name = "LayoutControlItem8"
-        Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem8.Size = New System.Drawing.Size(795, 30)
-        Me.LayoutControlItem8.Text = "Ort"
-        Me.LayoutControlItem8.TextSize = New System.Drawing.Size(93, 13)
-        '
-        'LayoutControlItem9
-        '
-        Me.LayoutControlItem9.Control = Me.TextEdit8
-        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(223, 30)
-        Me.LayoutControlItem9.Text = "PLZ"
-        Me.LayoutControlItem9.TextSize = New System.Drawing.Size(93, 13)
-        '
-        'LayoutControlItem15
-        '
-        Me.LayoutControlItem15.Control = Me.TextEdit1
-        Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 0)
-        Me.LayoutControlItem15.Name = "LayoutControlItem15"
-        Me.LayoutControlItem15.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem15.Size = New System.Drawing.Size(1018, 30)
-        Me.LayoutControlItem15.Text = "Name"
-        Me.LayoutControlItem15.TextSize = New System.Drawing.Size(93, 13)
-        '
         'LayoutControlGroup2
         '
-        Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem5, Me.LayoutControlItem2, Me.LayoutItemOrderIssuer, Me.LayoutItemOrderNumber, Me.LayoutItemOrderDate, Me.LayoutControlItem12, Me.LayoutControlItem13, Me.LayoutControlItem1, Me.LayoutControlItem4, Me.LayoutControlItem11, Me.LayoutControlItemRunningNumber, Me.LayoutControlItem14, Me.LayoutControlItem3})
+        Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem5, Me.LayoutControlItem2, Me.LayoutItemOrderIssuer, Me.LayoutItemOrderNumber, Me.LayoutItemOrderDate, Me.LayoutControlItem12, Me.LayoutControlItem13, Me.LayoutControlItem1, Me.LayoutControlItem4, Me.LayoutControlItem14, Me.LayoutControlItemRunningNumber, Me.LayoutControlItem11, Me.LayoutControlItem3})
         Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 0)
         Me.LayoutControlGroup2.Name = "LayoutControlGroup2"
-        Me.LayoutControlGroup2.Size = New System.Drawing.Size(1018, 208)
+        Me.LayoutControlGroup2.Size = New System.Drawing.Size(1018, 250)
         Me.LayoutControlGroup2.Text = "Basisdaten"
         '
         'LayoutControlItem5
         '
         Me.LayoutControlItem5.Control = Me.cmbCustomer
-        Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 30)
+        Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 60)
         Me.LayoutControlItem5.Name = "LayoutControlItem5"
         Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem5.Size = New System.Drawing.Size(508, 30)
@@ -766,7 +707,7 @@ Partial Class frmMain
         'LayoutControlItem2
         '
         Me.LayoutControlItem2.Control = Me.cmbDeliveryAddress
-        Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 60)
+        Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 90)
         Me.LayoutControlItem2.Name = "LayoutControlItem2"
         Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem2.Size = New System.Drawing.Size(508, 30)
@@ -776,37 +717,37 @@ Partial Class frmMain
         'LayoutItemOrderIssuer
         '
         Me.LayoutItemOrderIssuer.Control = Me.txtOrderIssuer
-        Me.LayoutItemOrderIssuer.Location = New System.Drawing.Point(0, 90)
+        Me.LayoutItemOrderIssuer.Location = New System.Drawing.Point(0, 120)
         Me.LayoutItemOrderIssuer.Name = "LayoutItemOrderIssuer"
         Me.LayoutItemOrderIssuer.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutItemOrderIssuer.Size = New System.Drawing.Size(370, 30)
+        Me.LayoutItemOrderIssuer.Size = New System.Drawing.Size(508, 30)
         Me.LayoutItemOrderIssuer.Text = "Besteller"
         Me.LayoutItemOrderIssuer.TextSize = New System.Drawing.Size(93, 13)
         '
         'LayoutItemOrderNumber
         '
         Me.LayoutItemOrderNumber.Control = Me.txtOrderNumber
-        Me.LayoutItemOrderNumber.Location = New System.Drawing.Point(370, 90)
+        Me.LayoutItemOrderNumber.Location = New System.Drawing.Point(508, 120)
         Me.LayoutItemOrderNumber.Name = "LayoutItemOrderNumber"
         Me.LayoutItemOrderNumber.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutItemOrderNumber.Size = New System.Drawing.Size(323, 30)
+        Me.LayoutItemOrderNumber.Size = New System.Drawing.Size(272, 30)
         Me.LayoutItemOrderNumber.Text = "Bestellnummer"
         Me.LayoutItemOrderNumber.TextSize = New System.Drawing.Size(93, 13)
         '
         'LayoutItemOrderDate
         '
         Me.LayoutItemOrderDate.Control = Me.dateOrderDate
-        Me.LayoutItemOrderDate.Location = New System.Drawing.Point(693, 90)
+        Me.LayoutItemOrderDate.Location = New System.Drawing.Point(780, 120)
         Me.LayoutItemOrderDate.Name = "LayoutItemOrderDate"
         Me.LayoutItemOrderDate.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutItemOrderDate.Size = New System.Drawing.Size(325, 30)
+        Me.LayoutItemOrderDate.Size = New System.Drawing.Size(238, 30)
         Me.LayoutItemOrderDate.Text = "Bestelldatum"
         Me.LayoutItemOrderDate.TextSize = New System.Drawing.Size(93, 13)
         '
         'LayoutControlItem12
         '
         Me.LayoutControlItem12.Control = Me.txtCustomerGLN
-        Me.LayoutControlItem12.Location = New System.Drawing.Point(508, 30)
+        Me.LayoutControlItem12.Location = New System.Drawing.Point(508, 60)
         Me.LayoutControlItem12.Name = "LayoutControlItem12"
         Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem12.Size = New System.Drawing.Size(510, 30)
@@ -816,7 +757,7 @@ Partial Class frmMain
         'LayoutControlItem13
         '
         Me.LayoutControlItem13.Control = Me.txtDeliveryAddressGLN
-        Me.LayoutControlItem13.Location = New System.Drawing.Point(508, 60)
+        Me.LayoutControlItem13.Location = New System.Drawing.Point(508, 90)
         Me.LayoutControlItem13.Name = "LayoutControlItem13"
         Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem13.Size = New System.Drawing.Size(510, 30)
@@ -826,63 +767,121 @@ Partial Class frmMain
         'LayoutControlItem1
         '
         Me.LayoutControlItem1.Control = Me.cmbMandator
-        Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 30)
         Me.LayoutControlItem1.Name = "LayoutControlItem1"
         Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem1.Size = New System.Drawing.Size(341, 30)
+        Me.LayoutControlItem1.Size = New System.Drawing.Size(508, 30)
         Me.LayoutControlItem1.Text = "Mandant"
         Me.LayoutControlItem1.TextSize = New System.Drawing.Size(93, 13)
         '
         'LayoutControlItem4
         '
         Me.LayoutControlItem4.Control = Me.cmbYears
-        Me.LayoutControlItem4.Location = New System.Drawing.Point(341, 0)
+        Me.LayoutControlItem4.Location = New System.Drawing.Point(508, 30)
         Me.LayoutControlItem4.Name = "LayoutControlItem4"
         Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem4.Size = New System.Drawing.Size(238, 30)
+        Me.LayoutControlItem4.Size = New System.Drawing.Size(510, 30)
         Me.LayoutControlItem4.Text = "Wirtschaftsjahr"
         Me.LayoutControlItem4.TextSize = New System.Drawing.Size(93, 13)
         '
-        'LayoutControlItem11
-        '
-        Me.LayoutControlItem11.Control = Me.cmdDocumentKind
-        Me.LayoutControlItem11.Location = New System.Drawing.Point(809, 0)
-        Me.LayoutControlItem11.Name = "LayoutControlItem11"
-        Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem11.Size = New System.Drawing.Size(209, 30)
-        Me.LayoutControlItem11.Text = "Belegart"
-        Me.LayoutControlItem11.TextSize = New System.Drawing.Size(93, 13)
-        '
-        'LayoutControlItemRunningNumber
-        '
-        Me.LayoutControlItemRunningNumber.Control = Me.txtRunningNumber
-        Me.LayoutControlItemRunningNumber.Location = New System.Drawing.Point(579, 0)
-        Me.LayoutControlItemRunningNumber.Name = "LayoutControlItemRunningNumber"
-        Me.LayoutControlItemRunningNumber.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItemRunningNumber.Size = New System.Drawing.Size(230, 30)
-        Me.LayoutControlItemRunningNumber.Text = "Laufnummer"
-        Me.LayoutControlItemRunningNumber.TextSize = New System.Drawing.Size(93, 13)
-        '
         'LayoutControlItem14
         '
         Me.LayoutControlItem14.Control = Me.txtDocumentReference
-        Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 120)
+        Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 150)
         Me.LayoutControlItem14.Name = "LayoutControlItem14"
         Me.LayoutControlItem14.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem14.Size = New System.Drawing.Size(509, 88)
+        Me.LayoutControlItem14.Size = New System.Drawing.Size(508, 100)
         Me.LayoutControlItem14.Text = "Auftragsreferenz"
         Me.LayoutControlItem14.TextSize = New System.Drawing.Size(93, 13)
         '
+        'LayoutControlItemRunningNumber
+        '
+        Me.LayoutControlItemRunningNumber.Control = Me.txtRunningNumber
+        Me.LayoutControlItemRunningNumber.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControlItemRunningNumber.Name = "LayoutControlItemRunningNumber"
+        Me.LayoutControlItemRunningNumber.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItemRunningNumber.Size = New System.Drawing.Size(508, 30)
+        Me.LayoutControlItemRunningNumber.Text = "Laufnummer"
+        Me.LayoutControlItemRunningNumber.TextSize = New System.Drawing.Size(93, 13)
+        '
+        'LayoutControlItem11
+        '
+        Me.LayoutControlItem11.Control = Me.cmbDocumentKind
+        Me.LayoutControlItem11.Location = New System.Drawing.Point(508, 0)
+        Me.LayoutControlItem11.Name = "LayoutControlItem11"
+        Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem11.Size = New System.Drawing.Size(510, 30)
+        Me.LayoutControlItem11.Text = "Belegart"
+        Me.LayoutControlItem11.TextSize = New System.Drawing.Size(93, 13)
+        '
         'LayoutControlItem3
         '
         Me.LayoutControlItem3.Control = Me.MemoEdit1
-        Me.LayoutControlItem3.Location = New System.Drawing.Point(509, 120)
+        Me.LayoutControlItem3.Location = New System.Drawing.Point(508, 150)
         Me.LayoutControlItem3.Name = "LayoutControlItem3"
         Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem3.Size = New System.Drawing.Size(509, 88)
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(510, 100)
         Me.LayoutControlItem3.Text = "Freitext"
         Me.LayoutControlItem3.TextSize = New System.Drawing.Size(93, 13)
         '
+        'LayoutControlGroup1
+        '
+        Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem9, Me.LayoutControlItem15})
+        Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControlGroup1.Name = "LayoutControlGroup1"
+        Me.LayoutControlGroup1.Size = New System.Drawing.Size(1018, 250)
+        Me.LayoutControlGroup1.Text = "Diverse Adresse"
+        '
+        'LayoutControlItem10
+        '
+        Me.LayoutControlItem10.Control = Me.TextEdit9
+        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(1018, 160)
+        Me.LayoutControlItem10.Text = "Kontakt"
+        Me.LayoutControlItem10.TextSize = New System.Drawing.Size(93, 13)
+        '
+        'LayoutControlItem6
+        '
+        Me.LayoutControlItem6.Control = Me.txtStreetName
+        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 30)
+        Me.LayoutControlItem6.Name = "LayoutControlItem6"
+        Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem6.Size = New System.Drawing.Size(1018, 30)
+        Me.LayoutControlItem6.Text = "Straße"
+        Me.LayoutControlItem6.TextSize = New System.Drawing.Size(93, 13)
+        '
+        'LayoutControlItem8
+        '
+        Me.LayoutControlItem8.Control = Me.txtPlace
+        Me.LayoutControlItem8.Location = New System.Drawing.Point(223, 60)
+        Me.LayoutControlItem8.Name = "LayoutControlItem8"
+        Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem8.Size = New System.Drawing.Size(795, 30)
+        Me.LayoutControlItem8.Text = "Ort"
+        Me.LayoutControlItem8.TextSize = New System.Drawing.Size(93, 13)
+        '
+        'LayoutControlItem9
+        '
+        Me.LayoutControlItem9.Control = Me.txtZIP
+        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(223, 30)
+        Me.LayoutControlItem9.Text = "PLZ"
+        Me.LayoutControlItem9.TextSize = New System.Drawing.Size(93, 13)
+        '
+        'LayoutControlItem15
+        '
+        Me.LayoutControlItem15.Control = Me.txtName
+        Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControlItem15.Name = "LayoutControlItem15"
+        Me.LayoutControlItem15.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem15.Size = New System.Drawing.Size(1018, 30)
+        Me.LayoutControlItem15.Text = "Name"
+        Me.LayoutControlItem15.TextSize = New System.Drawing.Size(93, 13)
+        '
         'GridControlPositions
         '
         Me.GridControlPositions.Dock = System.Windows.Forms.DockStyle.Fill
@@ -891,7 +890,7 @@ Partial Class frmMain
         Me.GridControlPositions.MainView = Me.GridViewPositions
         Me.GridControlPositions.MenuManager = Me.RibbonControl
         Me.GridControlPositions.Name = "GridControlPositions"
-        Me.GridControlPositions.Size = New System.Drawing.Size(1062, 335)
+        Me.GridControlPositions.Size = New System.Drawing.Size(1062, 267)
         Me.GridControlPositions.TabIndex = 0
         Me.GridControlPositions.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewPositions})
         '
@@ -905,13 +904,13 @@ Partial Class frmMain
         Me.SplitContainerControl3.Collapsed = True
         Me.SplitContainerControl3.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
         Me.SplitContainerControl3.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 132)
+        Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 158)
         Me.SplitContainerControl3.Name = "SplitContainerControl3"
         Me.SplitContainerControl3.Panel1.Controls.Add(Me.SplitContainerControl1)
         Me.SplitContainerControl3.Panel1.Text = "Panel1"
         Me.SplitContainerControl3.Panel2.Controls.Add(Me.RichEditXml)
         Me.SplitContainerControl3.Panel2.Text = "Panel2"
-        Me.SplitContainerControl3.Size = New System.Drawing.Size(1406, 620)
+        Me.SplitContainerControl3.Size = New System.Drawing.Size(1406, 594)
         Me.SplitContainerControl3.SplitterPosition = 1114
         Me.SplitContainerControl3.TabIndex = 6
         '
@@ -928,25 +927,6 @@ Partial Class frmMain
         Me.RichEditXml.Size = New System.Drawing.Size(0, 0)
         Me.RichEditXml.TabIndex = 0
         '
-        'cmdDocumentKind
-        '
-        Me.cmdDocumentKind.Location = New System.Drawing.Point(932, 50)
-        Me.cmdDocumentKind.MenuManager = Me.RibbonControl
-        Me.cmdDocumentKind.Name = "cmdDocumentKind"
-        Me.cmdDocumentKind.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
-        Me.cmdDocumentKind.Properties.NullText = ""
-        Me.cmdDocumentKind.Properties.PopupView = Me.GridView3
-        Me.cmdDocumentKind.Size = New System.Drawing.Size(103, 20)
-        Me.cmdDocumentKind.StyleController = Me.LayoutControlHead
-        Me.cmdDocumentKind.TabIndex = 18
-        '
-        'GridView3
-        '
-        Me.GridView3.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus
-        Me.GridView3.Name = "GridView3"
-        Me.GridView3.OptionsSelection.EnableAppearanceFocusedCell = False
-        Me.GridView3.OptionsView.ShowGroupPanel = False
-        '
         'frmMain
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -961,6 +941,7 @@ Partial Class frmMain
         Me.StatusBar = Me.RibbonStatusBar
         Me.Text = "EDI Dokument Import"
         CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -972,10 +953,9 @@ Partial Class frmMain
         CType(Me.txtOrderIssuer.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.MemoEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtOrderNumber.Properties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtStreetName.Properties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TextEdit6.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtPlace.Properties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TextEdit7.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtZIP.Properties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TextEdit8.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TextEdit9.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtRunningNumber.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.dateOrderDate.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit()
@@ -990,16 +970,10 @@ Partial Class frmMain
         CType(Me.txtCustomerGLN.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtDeliveryAddressGLN.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtDocumentReference.Properties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtName.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.cmbDocumentKind.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TabbedControlGroup2, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem10, 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.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1010,16 +984,20 @@ Partial Class frmMain
         CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItemRunningNumber, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItemRunningNumber, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridControlPositions, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridViewPositions, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SplitContainerControl3.ResumeLayout(False)
-        CType(Me.cmdDocumentKind.Properties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -1043,11 +1021,10 @@ Partial Class frmMain
     Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents colFileName As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents colFilePath As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents TextEdit5 As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents txtStreetName As DevExpress.XtraEditors.TextEdit
     Friend WithEvents btnLoadDocuments As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents TextEdit6 As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents txtPlace As DevExpress.XtraEditors.TextEdit
-    Friend WithEvents TextEdit7 As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents txtZIP As DevExpress.XtraEditors.TextEdit
-    Friend WithEvents TextEdit8 As DevExpress.XtraEditors.TextEdit
     Friend WithEvents TextEdit9 As DevExpress.XtraEditors.TextEdit
     Friend WithEvents txtRunningNumber As DevExpress.XtraEditors.TextEdit
     Friend WithEvents dateOrderDate As DevExpress.XtraEditors.DateEdit
@@ -1088,7 +1065,6 @@ Partial Class frmMain
     Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem
     Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem
     Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem
-    Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem
     Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem
     Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents txtCustomerGLN As DevExpress.XtraEditors.TextEdit
@@ -1104,8 +1080,8 @@ Partial Class frmMain
     Friend WithEvents btnReloadDocument As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents colId As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents colName As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents txtName As DevExpress.XtraEditors.TextEdit
     Friend WithEvents LayoutControlItem15 As DevExpress.XtraLayout.LayoutControlItem
-    Friend WithEvents cmdDocumentKind As DevExpress.XtraEditors.SearchLookUpEdit
+    Friend WithEvents cmbDocumentKind As DevExpress.XtraEditors.ComboBoxEdit
-    Friend WithEvents GridView3 As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents ApplicationMenu1 As DevExpress.XtraBars.Ribbon.ApplicationMenu
 End Class

EDIDocumentImport/frmMain.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="ApplicationMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="colSelected.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

EDIDocumentImport/frmMain.vb

@@ -14,6 +14,7 @@ Imports ImporterShared.Documents
 Imports ImporterShared.Winline
 Imports ImporterShared.Schemas
 Imports ImporterForm.Positions
+Imports DevExpress.XtraLayout
 
 Public Class frmMain
     Public LogConfig As LogConfig
@@ -22,6 +23,7 @@ Public Class frmMain
     Public Database As MSSQLServer
     Public DocumentLoader As DocumentLoader
     Public GridBuilder As GridBuilder
+    Public PositionData As PositionData
 
     Public Winline As Data
     Public WebService As WebService
@@ -57,11 +59,13 @@ Public Class frmMain
             Database = New MSSQLServer(LogConfig, oConnectionString)
             Winline = New Data(LogConfig, Database, ConfigManager.Config)
             WebService = New WebService(LogConfig, ConfigManager.Config)
+            PositionData = New PositionData(LogConfig, Winline)
 
             ' Load WinLine Data
             Winline.Mandators.Clear()
             Winline.LoadMandators()
             Winline.LoadEconomicYears()
+            Winline.LoadDocumentKinds(Winline.Mandators)
             For Each oMandator In Winline.Mandators
                 Winline.LoadAccounts(oMandator)
             Next
@@ -69,8 +73,6 @@ Public Class frmMain
             ' Load data for UI Fields
             cmbMandator.Properties.DataSource = Winline.Mandators
 
-            cmbCustomer.Properties.DataSource = Winline.Accounts
-            cmbDeliveryAddress.Properties.DataSource = Winline.Accounts
 
             cmbYears.Properties.Items.AddRange(Winline.Years)
             cmbYears.SelectedItem = ConfigManager.Config.GetYear()
@@ -222,9 +224,6 @@ Public Class frmMain
         txtOrderIssuer.Text = oHead.Fakt_Ansprechpartner
         txtOrderNumber.Text = oHead.AuftragsBestellnummer
 
-        ' TODO: Get Doc Kind from Winline Class
-        cmdDocumentKind.Text = oHead.Belegart
-
         txtDocumentReference.Text = oHead.Auftragsreferenz
         dateOrderDate.EditValue = oHead.Datum_AuftragBestellung
 
@@ -235,52 +234,77 @@ Public Class frmMain
                 SingleOrDefault()
         cmbMandator.EditValue = oMandator
 
+        ' --- Find DocumentKinds ---------------------------------------------------------------------------------
+
+        Dim oMandatorKinds = Winline.DocumentKinds.
+            Where(Function(k) k.Mandator = oMandator.Id).
+            ToList()
+        Dim oSelectedKind = oMandatorKinds.
+            Where(Function(k) k.Id.ToString = oHead.Belegart).
+            SingleOrDefault()
+
+        cmbDocumentKind.Properties.Items.Clear()
+        cmbDocumentKind.Properties.Items.AddRange(oMandatorKinds)
+        cmbDocumentKind.SelectedItem = oSelectedKind
+
         ' --- Find Accounts --------------------------------------------------------------------------------------
 
+        Dim oMandatorAccounts = Winline.Accounts.
+            Where(Function(a) a.Mandator = oMandator.Id).
+            ToList()
+        cmbCustomer.Properties.DataSource = oMandatorAccounts
+        cmbDeliveryAddress.Properties.DataSource = oMandatorAccounts
+
         ' FAKTURA
 
         If oHead.Fakt_Kontonummer = oHeadOriginal.Fakt_Kontonummer Then
             cmbCustomer.ErrorText = GetValidationMessage("Faktura Konto")
             cmbCustomer.EditValue = Nothing
         Else
-            Dim oMatchingAccounts = Winline.Accounts.
+            Dim oMatchingAccounts = oMandatorAccounts.
-                Where(Function(oAccount) oAccount.Mandator = oMandator.Id).
                 Where(Function(oAccount) oAccount.Id = oHead.Fakt_Kontonummer)
 
             If oMatchingAccounts.Count() > 1 Then
-                Throw New Exceptions.MultipleAccountsException("Für die Kontonummer wurden mehrere Konten gefunden.")
+                cmbCustomer.EditValue = Nothing
-            End If
+                cmbCustomer.ErrorText = "Für die Kontonummer wurden mehrere Konten gefunden."
-
+            ElseIf oMatchingAccounts.Count() = 0 Then
-            If oMatchingAccounts.Count() = 0 Then
+                cmbCustomer.EditValue = Nothing
-                Throw New Exceptions.NoAccountException("Für die Kontonummer wurde kein Konto gefunden.")
+                cmbCustomer.ErrorText = "Für die Kontonummer wurde kein Konto gefunden."
-            End If
+            Else
-
                 cmbCustomer.EditValue = oMatchingAccounts.SingleOrDefault()
-
+            End If
         End If
 
         ' DEVLIERY
         If oHead.Lief_Kontonummer = oHeadOriginal.Lief_Kontonummer Then
+            If oHeadOriginal.Lief_Kontonummer = String.Empty Then
+                txtPlace.EditValue = oHeadOriginal.Lief_Ort
+                txtZIP.EditValue = oHeadOriginal.Lief_PLZ
+                txtStreetName.EditValue = oHeadOriginal.Lief_Strasse
+                txtName.EditValue = oHeadOriginal.Lief_Name
+            Else
                 cmbDeliveryAddress.ErrorText = GetValidationMessage("Lieferanten Konto")
                 cmbDeliveryAddress.EditValue = Nothing
+            End If
         Else
-            Dim oMatchingAccounts = Winline.Accounts.
+            Dim oMatchingAccounts = oMandatorAccounts.
-                Where(Function(oAccount) oAccount.Mandator = oMandator.Id).
                 Where(Function(oAccount) oAccount.Id = oHead.Lief_Kontonummer)
 
             If oMatchingAccounts.Count() > 1 Then
-                Throw New Exceptions.MultipleAccountsException("Für die Kontonummer wurden mehrere Konten gefunden.")
+                cmbCustomer.EditValue = Nothing
+                cmbCustomer.ErrorText = "Für die Kontonummer wurden mehrere Konten gefunden."
+            ElseIf oMatchingAccounts.Count() = 0 Then
+                cmbCustomer.EditValue = Nothing
+                cmbCustomer.ErrorText = "Für die Kontonummer wurde kein Konto gefunden."
+            Else
+                cmbCustomer.EditValue = oMatchingAccounts.SingleOrDefault()
             End If
 
-            If oMatchingAccounts.Count() = 0 Then
-                Throw New Exceptions.NoAccountException("Für die Kontonummer wurde kein Konto gefunden.")
-            End If
-
-            cmbDeliveryAddress.EditValue = oMatchingAccounts.SingleOrDefault()
-
         End If
 
-        Dim oPositionList = PositionData.Load(oData, oDataOriginal)
+        ' --- Find Positions ------------------------------------------------------------------------------------
+
+        Dim oPositionList = PositionData.Load(oMandator, oData, oDataOriginal)
         GridControlPositions.DataSource = oPositionList
         GridViewPositions.BestFitColumns()
     End Sub
@@ -345,6 +369,9 @@ Public Class frmMain
     End Sub
 
     Private Sub btnReloadDocument_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadDocument.ItemClick
+        Dim oResult = MsgBox("Wenn sie das Dokument neu laden, werden alle manuell geänderten Wert verworfen. Wollen Sie fortfahren?", MsgBoxStyle.YesNo Or MsgBoxStyle.Question, Text)
+
+        If oResult = MsgBoxResult.Yes Then
             Dim oDocument As Document = GetFocusedDocument()
 
             If oDocument Is Nothing Then
@@ -352,6 +379,7 @@ Public Class frmMain
             End If
 
             ShowDocument(oDocument)
+        End If
     End Sub
 
     Private Sub btnDeletePosition_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnDeletePosition.ItemClick
@@ -373,4 +401,9 @@ Public Class frmMain
     Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick
         MsgBox("Mach et!")
     End Sub
+
+    Private Sub BarButtonItem6_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
+        Dim oUserConfigDirectory = New FileInfo(ConfigManager.UserConfigPath).Directory
+        TryOpenDirectory(oUserConfigDirectory.FullName, "Konfigurationsverzeichnis")
+    End Sub
 End Class

ImporterShared/Config.vb

@@ -18,6 +18,7 @@
         Public Property ArticleRegex As String
     End Class
 
+    <DebuggerStepThrough>
     Public Function GetYear() As Integer
         If DefaultYearOverride > 0 Then
             Return DefaultYearOverride

ImporterShared/Documents/DocumentLoader.vb

@@ -52,7 +52,6 @@ Namespace Documents
             End Try
         End Function
 
-
         Private Function MatchDataFromWinLine(pDocument As Document, pMandators As List(Of Winline.Mandator)) As Document
             Dim oMandators As List(Of Winline.Mandator) = pMandators.
                 Where(Function(m) m.IsWhitelisted = True).

ImporterShared/ImporterShared.vbproj

@@ -112,6 +112,7 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     <Compile Include="Mapper.vb" />
+    <Compile Include="Schemas\IMesoWebService.vb" />
     <Compile Include="Schemas\Orders\Helpers.vb" />
     <Compile Include="Schemas\Orders\Input.vb" />
     <Compile Include="Schemas\Orders\Output.vb" />

ImporterShared/Schemas/IMesoWebService.vb

@@ -0,0 +1,6 @@
+Namespace Schemas
+    Public Interface IMesoWebservice
+        Property Items As Object()
+    End Interface
+
+End Namespace

ImporterShared/Schemas/Orders/Input.vb

@@ -27,6 +27,8 @@ Namespace Schemas.Orders.Input
      System.Xml.Serialization.XmlRootAttribute([Namespace]:="", IsNullable:=False)>
     Partial Public Class MESOWebService
 
+        Implements Schemas.IMesoWebservice
+
         Private itemsField() As Object
 
         Private templateTypeField As String
@@ -48,7 +50,7 @@ Namespace Schemas.Orders.Input
         '''<remarks/>
         <System.Xml.Serialization.XmlElementAttribute("EXIM-VRG_ordersT025", GetType(MESOWebServiceEXIMVRG_ordersT025), Form:=System.Xml.Schema.XmlSchemaForm.Unqualified),
          System.Xml.Serialization.XmlElementAttribute("EXIM-VRG_ordersT026", GetType(MESOWebServiceEXIMVRG_ordersT026), Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
-        Public Property Items() As Object()
+        Public Property Items() As Object() Implements Schemas.IMesoWebservice.Items
             Get
                 Return Me.itemsField
             End Get
@@ -147,11 +149,11 @@ Namespace Schemas.Orders.Input
     End Class
 
     '''<remarks/>
-    <System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0"),
+    <System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0"),  _
-     System.SerializableAttribute(),
+     System.SerializableAttribute(),  _
-     System.Diagnostics.DebuggerStepThroughAttribute(),
+     System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.ComponentModel.DesignerCategoryAttribute("code"),
+     System.ComponentModel.DesignerCategoryAttribute("code"),  _
-     System.Xml.Serialization.XmlTypeAttribute(AnonymousType:=True)>
+     System.Xml.Serialization.XmlTypeAttribute(AnonymousType:=true)>  _
     Partial Public Class MESOWebServiceEXIMVRG_ordersT025
         
         Private bELEGKEYField As String
@@ -197,243 +199,243 @@ Namespace Schemas.Orders.Input
         Private infotextField As String
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType:="string")>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType:="string")>  _
         Public Property BELEGKEY() As String
             Get
                 Return Me.bELEGKEYField
             End Get
             Set
-                Me.bELEGKEYField = Value
+                Me.bELEGKEYField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Fakt_Kontonummer() As String
             Get
                 Return Me.fakt_KontonummerField
             End Get
             Set
-                Me.fakt_KontonummerField = Value
+                Me.fakt_KontonummerField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Laufnummer() As String
             Get
                 Return Me.laufnummerField
             End Get
             Set
-                Me.laufnummerField = Value
+                Me.laufnummerField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Fakt_Name() As String
             Get
                 Return Me.fakt_NameField
             End Get
             Set
-                Me.fakt_NameField = Value
+                Me.fakt_NameField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Fakt_Strasse() As String
             Get
                 Return Me.fakt_StrasseField
             End Get
             Set
-                Me.fakt_StrasseField = Value
+                Me.fakt_StrasseField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Fakt_PLZ() As String
             Get
                 Return Me.fakt_PLZField
             End Get
             Set
-                Me.fakt_PLZField = Value
+                Me.fakt_PLZField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Fakt_Ort() As String
             Get
                 Return Me.fakt_OrtField
             End Get
             Set
-                Me.fakt_OrtField = Value
+                Me.fakt_OrtField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Fakt_Ansprechpartner() As String
             Get
                 Return Me.fakt_AnsprechpartnerField
             End Get
             Set
-                Me.fakt_AnsprechpartnerField = Value
+                Me.fakt_AnsprechpartnerField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Lief_Kontonummer() As String
             Get
                 Return Me.lief_KontonummerField
             End Get
             Set
-                Me.lief_KontonummerField = Value
+                Me.lief_KontonummerField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Lief_Name() As String
             Get
                 Return Me.lief_NameField
             End Get
             Set
-                Me.lief_NameField = Value
+                Me.lief_NameField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Lief_Strasse() As String
             Get
                 Return Me.lief_StrasseField
             End Get
             Set
-                Me.lief_StrasseField = Value
+                Me.lief_StrasseField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Lief_PLZ() As String
             Get
                 Return Me.lief_PLZField
             End Get
             Set
-                Me.lief_PLZField = Value
+                Me.lief_PLZField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Lief_Ort() As String
             Get
                 Return Me.lief_OrtField
             End Get
             Set
-                Me.lief_OrtField = Value
+                Me.lief_OrtField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Belegart() As String
             Get
                 Return Me.belegartField
             End Get
             Set
-                Me.belegartField = Value
+                Me.belegartField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute("Datum_Auftrag-Bestellung", Form:=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType:="string")>
+        <System.Xml.Serialization.XmlElementAttribute("Datum_Auftrag-Bestellung", Form:=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType:="string")>  _
         Public Property Datum_AuftragBestellung() As String
             Get
                 Return Me.datum_AuftragBestellungField
             End Get
             Set
-                Me.datum_AuftragBestellungField = Value
+                Me.datum_AuftragBestellungField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlIgnoreAttribute()>
+        <System.Xml.Serialization.XmlIgnoreAttribute()>  _
         Public Property Datum_AuftragBestellungSpecified() As Boolean
             Get
                 Return Me.datum_AuftragBestellungFieldSpecified
             End Get
             Set
-                Me.datum_AuftragBestellungFieldSpecified = Value
+                Me.datum_AuftragBestellungFieldSpecified = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute("Auftrags-Bestellnummer", Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute("Auftrags-Bestellnummer", Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property AuftragsBestellnummer() As String
             Get
                 Return Me.auftragsBestellnummerField
             End Get
             Set
-                Me.auftragsBestellnummerField = Value
+                Me.auftragsBestellnummerField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType:="string")>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType:="string")>  _
         Public Property Leistungsdatum() As String
             Get
                 Return Me.leistungsdatumField
             End Get
             Set
-                Me.leistungsdatumField = Value
+                Me.leistungsdatumField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlIgnoreAttribute()>
+        <System.Xml.Serialization.XmlIgnoreAttribute()>  _
         Public Property LeistungsdatumSpecified() As Boolean
             Get
                 Return Me.leistungsdatumFieldSpecified
             End Get
             Set
-                Me.leistungsdatumFieldSpecified = Value
+                Me.leistungsdatumFieldSpecified = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Auftragsreferenz() As String
             Get
                 Return Me.auftragsreferenzField
             End Get
             Set
-                Me.auftragsreferenzField = Value
+                Me.auftragsreferenzField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Infotext() As String
             Get
                 Return Me.infotextField
             End Get
             Set
-                Me.infotextField = Value
+                Me.infotextField = value
             End Set
         End Property
     End Class
     
     '''<remarks/>
-    <System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0"),
+    <System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0"),  _
-     System.SerializableAttribute(),
+     System.SerializableAttribute(),  _
-     System.Diagnostics.DebuggerStepThroughAttribute(),
+     System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.ComponentModel.DesignerCategoryAttribute("code"),
+     System.ComponentModel.DesignerCategoryAttribute("code"),  _
-     System.Xml.Serialization.XmlTypeAttribute(AnonymousType:=True)>
+     System.Xml.Serialization.XmlTypeAttribute(AnonymousType:=true)>  _
     Partial Public Class MESOWebServiceEXIMVRG_ordersT026
         
         Private bELEGKEYField As String
@@ -479,234 +481,235 @@ Namespace Schemas.Orders.Input
         Private zeilenrabatt4FieldSpecified As Boolean
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType:="string")>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType:="string")>  _
         Public Property BELEGKEY() As String
             Get
                 Return Me.bELEGKEYField
             End Get
             Set
-                Me.bELEGKEYField = Value
+                Me.bELEGKEYField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType:="string")>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType:="string")>  _
         Public Property Zeilennummer() As String
             Get
                 Return Me.zeilennummerField
             End Get
             Set
-                Me.zeilennummerField = Value
+                Me.zeilennummerField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Datentyp() As String
             Get
                 Return Me.datentypField
             End Get
             Set
-                Me.datentypField = Value
+                Me.datentypField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Artikelnummer() As String
             Get
                 Return Me.artikelnummerField
             End Get
             Set
-                Me.artikelnummerField = Value
+                Me.artikelnummerField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Bezeichnung() As String
             Get
                 Return Me.bezeichnungField
             End Get
             Set
-                Me.bezeichnungField = Value
+                Me.bezeichnungField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Notizblock() As String
             Get
                 Return Me.notizblockField
             End Get
             Set
-                Me.notizblockField = Value
+                Me.notizblockField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Lieferantenartikelnummer() As String
             Get
                 Return Me.lieferantenartikelnummerField
             End Get
             Set
-                Me.lieferantenartikelnummerField = Value
+                Me.lieferantenartikelnummerField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Menge_bestellt() As String
             Get
                 Return Me.menge_bestelltField
             End Get
             Set
-                Me.menge_bestelltField = Value
+                Me.menge_bestelltField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlIgnoreAttribute()>
+        <System.Xml.Serialization.XmlIgnoreAttribute()>  _
         Public Property Menge_bestelltSpecified() As Boolean
             Get
                 Return Me.menge_bestelltFieldSpecified
             End Get
             Set
-                Me.menge_bestelltFieldSpecified = Value
+                Me.menge_bestelltFieldSpecified = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Menge_geliefert() As String
             Get
                 Return Me.menge_geliefertField
             End Get
             Set
-                Me.menge_geliefertField = Value
+                Me.menge_geliefertField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Colli() As String
             Get
                 Return Me.colliField
             End Get
             Set
-                Me.colliField = Value
+                Me.colliField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Einzelpreis() As String
             Get
                 Return Me.einzelpreisField
             End Get
             Set
-                Me.einzelpreisField = Value
+                Me.einzelpreisField = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlIgnoreAttribute()>
+        <System.Xml.Serialization.XmlIgnoreAttribute()>  _
         Public Property EinzelpreisSpecified() As Boolean
             Get
                 Return Me.einzelpreisFieldSpecified
             End Get
             Set
-                Me.einzelpreisFieldSpecified = Value
+                Me.einzelpreisFieldSpecified = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Zeilenrabatt1() As String
             Get
                 Return Me.zeilenrabatt1Field
             End Get
             Set
-                Me.zeilenrabatt1Field = Value
+                Me.zeilenrabatt1Field = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlIgnoreAttribute()>
+        <System.Xml.Serialization.XmlIgnoreAttribute()>  _
         Public Property Zeilenrabatt1Specified() As Boolean
             Get
                 Return Me.zeilenrabatt1FieldSpecified
             End Get
             Set
-                Me.zeilenrabatt1FieldSpecified = Value
+                Me.zeilenrabatt1FieldSpecified = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Zeilenrabatt2() As String
             Get
                 Return Me.zeilenrabatt2Field
             End Get
             Set
-                Me.zeilenrabatt2Field = Value
+                Me.zeilenrabatt2Field = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlIgnoreAttribute()>
+        <System.Xml.Serialization.XmlIgnoreAttribute()>  _
         Public Property Zeilenrabatt2Specified() As Boolean
             Get
                 Return Me.zeilenrabatt2FieldSpecified
             End Get
             Set
-                Me.zeilenrabatt2FieldSpecified = Value
+                Me.zeilenrabatt2FieldSpecified = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Zeilenrabatt3() As String
             Get
                 Return Me.zeilenrabatt3Field
             End Get
             Set
-                Me.zeilenrabatt3Field = Value
+                Me.zeilenrabatt3Field = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlIgnoreAttribute()>
+        <System.Xml.Serialization.XmlIgnoreAttribute()>  _
         Public Property Zeilenrabatt3Specified() As Boolean
             Get
                 Return Me.zeilenrabatt3FieldSpecified
             End Get
             Set
-                Me.zeilenrabatt3FieldSpecified = Value
+                Me.zeilenrabatt3FieldSpecified = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>
+        <System.Xml.Serialization.XmlElementAttribute(Form:=System.Xml.Schema.XmlSchemaForm.Unqualified)>  _
         Public Property Zeilenrabatt4() As String
             Get
                 Return Me.zeilenrabatt4Field
             End Get
             Set
-                Me.zeilenrabatt4Field = Value
+                Me.zeilenrabatt4Field = value
             End Set
         End Property
         
         '''<remarks/>
-        <System.Xml.Serialization.XmlIgnoreAttribute()>
+        <System.Xml.Serialization.XmlIgnoreAttribute()>  _
         Public Property Zeilenrabatt4Specified() As Boolean
             Get
                 Return Me.zeilenrabatt4FieldSpecified
             End Get
             Set
-                Me.zeilenrabatt4FieldSpecified = Value
+                Me.zeilenrabatt4FieldSpecified = value
             End Set
         End Property
     End Class
 End Namespace
+

ImporterShared/Winline/Data.vb

@@ -14,9 +14,13 @@ Namespace Winline
 
         Public Accounts As New List(Of Account)
         Public Mandators As New List(Of Mandator)
+        Public DocumentKinds As New List(Of DocumentKind)
         Public Years As List(Of Integer)
 
+        Public Const ALL_MESOCOMP = "mesocomp"
+
         Public Const V21_ARTICLENUMBER = "c011"
+        Public Const V21_REPLACEMENTARTICLENUMBER = "c123"
 
         Public Const V50_ACCOUNTNUMBER = "c002"
         Public Const V50_ACCOUNTNAME = "c003"
@@ -37,10 +41,12 @@ Namespace Winline
             Config = pConfig
         End Sub
 
+        <DebuggerStepThrough>
         Public Function GetWinLineYear(pYear As Integer)
             Return (pYear - 1900) * 12
         End Function
 
+        <DebuggerStepThrough>
         Public Function GetWinLineYear()
             Return GetWinLineYear(Config.GetYear)
         End Function
@@ -111,42 +117,51 @@ Namespace Winline
             Years = oRange
         End Sub
 
-        Public Function GetDocumentKinds(pMandator As Mandator, pYear As Integer) As List(Of DocumentKind)
+        Public Sub LoadDocumentKinds(pMandators As List(Of Mandator))
             Dim oDocumentKinds As New List(Of DocumentKind)
+            Dim oMandatorString = String.Join(",", pMandators.Select(Function(m) $"'{m.Id}'").ToArray)
+            Dim oYear As Integer = GetWinLineYear()
 
+
+            DocumentKinds.Clear()
+
+            For Each oMandator As Mandator In pMandators
                 Try
                     Dim oSQL = $"
                         SELECT 
                         [c030],
-                    [c001] 
+                        [c001],
-                    FROM [t357] (NOLOCK) 
+                        [mesocomp]
+                        FROM [{oMandator.Database}].[dbo].[t357] (NOLOCK) 
                         WHERE (
                             [c001] LIKE 'Werk%(VK)' OR 
                             [c001] LIKE 'Werk%(WK)'
                         ) 
-                    AND [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {pYear}"
+                        AND [mesocomp] = '{oMandator.Id}' AND [mesoyear] = {oYear}"
                     Dim oTable As DataTable = Database.GetDatatable(oSQL)
 
                     If oTable.Rows.Count = 0 Then
-                    Logger.Warn("No DocumentKinds found")
+                        Logger.Warn("No DocumentKinds found for Mandator [{0}]", oMandator.Id)
-                    Return oDocumentKinds
+                        Continue For
-
                     End If
 
                     For Each oRow As DataRow In oTable.Rows
                         oDocumentKinds.Add(New DocumentKind With {
                             .Id = oRow.Item(T357_KINDID),
-                        .Name = oRow.Item(T357_KINDNAME)
+                            .Name = oRow.Item(T357_KINDNAME),
+                            .Mandator = oRow.Item(ALL_MESOCOMP)
                         })
                     Next
 
-                Return oDocumentKinds
                 Catch ex As Exception
                     Logger.Warn("Could not load DocumentKinds")
                     Logger.Error(ex)
-                Return oDocumentKinds
                 End Try
-        End Function
+            Next
+
+            DocumentKinds = oDocumentKinds.ToList()
+
+        End Sub
 
         Public Function TryGetAccount(pGLN As String, pMandator As Mandator) As Account
             Try
@@ -234,6 +249,47 @@ Namespace Winline
             End Try
         End Function
 
+        Public Function GetReplacementArticleNumber(pArticleNumber As String, pMandator As Mandator)
+            Try
+                Dim oYear As Integer = GetWinLineYear()
+                Dim oSQL As String = $"
+                SELECT 
+                    [c011], -- Artikelnummer 
+                    [c003], -- Artikelbezeichnung
+                    [c075], -- EAN-Nummer 
+                    [c123]  -- Ersatzartikelnummer
+                    FROM [{pMandator.Database}].[dbo].[v021]
+                    WHERE [c011] = '{pArticleNumber}'
+                    AND [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {oYear}"
+                Dim oTable As DataTable = Database.GetDatatable(oSQL)
+
+                ' ArticleNumber not found in this Mandator, continue to next one
+                If oTable.Rows.Count = 0 Then
+                    Logger.Debug("ArticleNumber [{0}] was not found in Mandator: [{1}]", pArticleNumber, pMandator.Id)
+                    Return Nothing
+
+                End If
+
+                ' Duplicate EAN, exit and do nothing about this number
+                If oTable.Rows.Count > 1 Then
+                    Logger.Warn("ArticleNumber [{0}] was found more than once", pArticleNumber)
+                    Return Nothing
+
+                End If
+
+                Dim oRow As DataRow = oTable.Rows.Item(0)
+                Dim oReplacementArticleNumber = Utils.NotNull(oRow.Item(V21_REPLACEMENTARTICLENUMBER), Nothing)
+
+                If oReplacementArticleNumber Is Nothing Then
+                    Return pArticleNumber
+                End If
+
+                Return GetReplacementArticleNumber(oReplacementArticleNumber, pMandator)
+            Catch ex As Exception
+                Return Nothing
+            End Try
+        End Function
+
         Public Function FindMatchingMandatorFromOrder(pData As Schemas.Orders.Input.MESOWebService) As Mandator
             Dim oPositions As List(Of Schemas.Orders.Input.MESOWebServiceEXIMVRG_ordersT026) = pData.Items.
                 Where(Function(i) TypeOf i Is Schemas.Orders.Input.MESOWebServiceEXIMVRG_ordersT026).

ImporterShared/Winline/Entities/DocumentKind.vb

@@ -2,6 +2,18 @@
     Public Class DocumentKind
         Public Id As Integer
         Public Name As String
-    End Class
+        Public Mandator As String
 
+        Public Overrides Function GetHashCode() As Integer
+            Return Id.GetHashCode()
+        End Function
+
+        Public Overrides Function Equals(obj As Object) As Boolean
+            Return DirectCast(obj, DocumentKind).Id = Id
+        End Function
+
+        Public Overrides Function ToString() As String
+            Return $"{Name} ({Id})"
+        End Function
+    End Class
 End Namespace