WIP

2021-08-11 16:17:59 +02:00
parent 50c1e86219
commit d165817f8a
14 changed files with 880 additions and 289 deletions
--- a/EDIDocumentImport/frmMain.Designer.vb
+++ b/EDIDocumentImport/frmMain.Designer.vb
@@ -32,6 +32,7 @@ Partial Class frmMain
        Me.txtVersion = New DevExpress.XtraBars.BarStaticItem()
        Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -64,28 +65,34 @@ Partial Class frmMain
        Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.cmbDeliveryAddress = New DevExpress.XtraEditors.SearchLookUpEdit()
        Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.cmbYears = New DevExpress.XtraEditors.ComboBoxEdit()
+        Me.txtCustomerGLN = New DevExpress.XtraEditors.TextEdit()
+        Me.txtDeliveryAddressGLN = New DevExpress.XtraEditors.TextEdit()
        Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
+        Me.TabbedControlGroup2 = New DevExpress.XtraLayout.TabbedControlGroup()
+        Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup()
+        Me.LayoutControlItemRunningNumber = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutItemOrderIssuer = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutItemOrderNumber = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItemRunningNumber = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutItemOrderDate = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem12 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem13 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup()
+        Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.SimpleSeparator1 = New DevExpress.XtraLayout.SimpleSeparator()
-        Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem6 = 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.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.cmbYears = New DevExpress.XtraEditors.ComboBoxEdit()
        CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -113,40 +120,50 @@ Partial Class frmMain
        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.cmbDeliveryAddress.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.cmbYears.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtCustomerGLN.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtDeliveryAddressGLN.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TabbedControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItemRunningNumber, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutItemOrderIssuer, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutItemOrderNumber, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItemRunningNumber, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutItemOrderDate, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.SimpleSeparator1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem6, 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.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.cmbYears.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'RibbonControl
        '
        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.BarButtonItem6, Me.BarButtonItem7})
+        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.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8})
        Me.RibbonControl.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl.MaxItemId = 15
+        Me.RibbonControl.MaxItemId = 16
        Me.RibbonControl.Name = "RibbonControl"
        Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
-        Me.RibbonControl.Size = New System.Drawing.Size(1406, 158)
+        Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
+        Me.RibbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
+        Me.RibbonControl.ShowToolbarCustomizeItem = False
+        Me.RibbonControl.Size = New System.Drawing.Size(1406, 132)
        Me.RibbonControl.StatusBar = Me.RibbonStatusBar
+        Me.RibbonControl.Toolbar.ShowCustomizeItem = False
        '
        'btnLoadDocuments
        '
@@ -224,6 +241,13 @@ Partial Class frmMain
        Me.BarButtonItem7.ImageOptions.SvgImage = Global.EDIDocumentImport.My.Resources.Resources.tableproperties
        Me.BarButtonItem7.Name = "BarButtonItem7"
        '
+        'BarButtonItem8
+        '
+        Me.BarButtonItem8.Caption = "Logverzeichnis öffnen"
+        Me.BarButtonItem8.Id = 15
+        Me.BarButtonItem8.ImageOptions.SvgImage = Global.EDIDocumentImport.My.Resources.Resources.singlepageview
+        Me.BarButtonItem8.Name = "BarButtonItem8"
+        '
        'RibbonPage1
        '
        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroup4, Me.RibbonPageGroup5})
@@ -242,6 +266,7 @@ Partial Class frmMain
        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1)
        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2)
        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3)
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem8)
        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
        Me.RibbonPageGroup2.Text = "Konfiguration"
        '
@@ -282,7 +307,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, 594)
+        Me.GridControlFiles.Size = New System.Drawing.Size(324, 620)
        Me.GridControlFiles.TabIndex = 2
        Me.GridControlFiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewFiles})
        '
@@ -294,7 +319,7 @@ Partial Class frmMain
        '
        'colSelected
        '
-        Me.colSelected.FieldName = "colSelected"
+        Me.colSelected.FieldName = "Selected"
        Me.colSelected.ImageOptions.SvgImage = CType(resources.GetObject("colSelected.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.colSelected.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
        Me.colSelected.Name = "colSelected"
@@ -308,6 +333,8 @@ Partial Class frmMain
        Me.colFileName.Caption = "Dateiname"
        Me.colFileName.FieldName = "Name"
        Me.colFileName.Name = "colFileName"
+        Me.colFileName.OptionsColumn.AllowEdit = False
+        Me.colFileName.OptionsColumn.ReadOnly = True
        Me.colFileName.Visible = True
        Me.colFileName.VisibleIndex = 1
        Me.colFileName.Width = 99
@@ -317,6 +344,8 @@ Partial Class frmMain
        Me.colFilePath.Caption = "Dateipfad"
        Me.colFilePath.FieldName = "FullName"
        Me.colFilePath.Name = "colFilePath"
+        Me.colFilePath.OptionsColumn.AllowEdit = False
+        Me.colFilePath.OptionsColumn.ReadOnly = True
        Me.colFilePath.Visible = True
        Me.colFilePath.VisibleIndex = 2
        Me.colFilePath.Width = 99
@@ -330,7 +359,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, 594)
+        Me.SplitContainerControl1.Size = New System.Drawing.Size(1396, 620)
        Me.SplitContainerControl1.SplitterPosition = 324
        Me.SplitContainerControl1.TabIndex = 3
        '
@@ -344,7 +373,7 @@ 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, 594)
+        Me.SplitContainerControl2.Size = New System.Drawing.Size(1062, 620)
        Me.SplitContainerControl2.SplitterPosition = 275
        Me.SplitContainerControl2.TabIndex = 0
        '
@@ -365,6 +394,8 @@ Partial Class frmMain
        Me.LayoutControl1.Controls.Add(Me.cmbCustomer)
        Me.LayoutControl1.Controls.Add(Me.cmbDeliveryAddress)
        Me.LayoutControl1.Controls.Add(Me.cmbYears)
+        Me.LayoutControl1.Controls.Add(Me.txtCustomerGLN)
+        Me.LayoutControl1.Controls.Add(Me.txtDeliveryAddressGLN)
        Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.LayoutControl1.Location = New System.Drawing.Point(0, 0)
        Me.LayoutControl1.Name = "LayoutControl1"
@@ -376,115 +407,115 @@ Partial Class frmMain
        '
        'txtOrderIssuer
        '
-        Me.txtOrderIssuer.Location = New System.Drawing.Point(92, 135)
+        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(123, 20)
+        Me.txtOrderIssuer.Size = New System.Drawing.Size(264, 20)
        Me.txtOrderIssuer.StyleController = Me.LayoutControl1
        Me.txtOrderIssuer.TabIndex = 6
        '
        'MemoEdit1
        '
-        Me.MemoEdit1.Location = New System.Drawing.Point(92, 165)
+        Me.MemoEdit1.Location = New System.Drawing.Point(123, 200)
        Me.MemoEdit1.MenuManager = Me.RibbonControl
        Me.MemoEdit1.Name = "MemoEdit1"
-        Me.MemoEdit1.Size = New System.Drawing.Size(490, 95)
+        Me.MemoEdit1.Size = New System.Drawing.Size(912, 48)
        Me.MemoEdit1.StyleController = Me.LayoutControl1
        Me.MemoEdit1.TabIndex = 12
        '
        'txtOrderNumber
        '
-        Me.txtOrderNumber.Location = New System.Drawing.Point(302, 135)
+        Me.txtOrderNumber.Location = New System.Drawing.Point(493, 170)
        Me.txtOrderNumber.MenuManager = Me.RibbonControl
        Me.txtOrderNumber.Name = "txtOrderNumber"
-        Me.txtOrderNumber.Size = New System.Drawing.Size(97, 20)
+        Me.txtOrderNumber.Size = New System.Drawing.Size(218, 20)
        Me.txtOrderNumber.StyleController = Me.LayoutControl1
        Me.txtOrderNumber.TabIndex = 7
        '
        'TextEdit5
        '
-        Me.TextEdit5.Location = New System.Drawing.Point(670, 15)
+        Me.TextEdit5.Location = New System.Drawing.Point(123, 50)
        Me.TextEdit5.MenuManager = Me.RibbonControl
        Me.TextEdit5.Name = "TextEdit5"
-        Me.TextEdit5.Size = New System.Drawing.Size(377, 20)
+        Me.TextEdit5.Size = New System.Drawing.Size(912, 20)
        Me.TextEdit5.StyleController = Me.LayoutControl1
        Me.TextEdit5.TabIndex = 3
        '
        'TextEdit6
        '
-        Me.TextEdit6.Location = New System.Drawing.Point(670, 45)
+        Me.TextEdit6.Location = New System.Drawing.Point(123, 80)
        Me.TextEdit6.MenuManager = Me.RibbonControl
        Me.TextEdit6.Name = "TextEdit6"
-        Me.TextEdit6.Size = New System.Drawing.Size(377, 20)
+        Me.TextEdit6.Size = New System.Drawing.Size(912, 20)
        Me.TextEdit6.StyleController = Me.LayoutControl1
        Me.TextEdit6.TabIndex = 5
        '
        'TextEdit7
        '
-        Me.TextEdit7.Location = New System.Drawing.Point(670, 105)
+        Me.TextEdit7.Location = New System.Drawing.Point(123, 140)
        Me.TextEdit7.MenuManager = Me.RibbonControl
        Me.TextEdit7.Name = "TextEdit7"
-        Me.TextEdit7.Size = New System.Drawing.Size(377, 20)
+        Me.TextEdit7.Size = New System.Drawing.Size(912, 20)
        Me.TextEdit7.StyleController = Me.LayoutControl1
        Me.TextEdit7.TabIndex = 11
        '
        'TextEdit8
        '
-        Me.TextEdit8.Location = New System.Drawing.Point(670, 75)
+        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(377, 20)
+        Me.TextEdit8.Size = New System.Drawing.Size(912, 20)
        Me.TextEdit8.StyleController = Me.LayoutControl1
        Me.TextEdit8.TabIndex = 9
        '
        'TextEdit9
        '
-        Me.TextEdit9.Location = New System.Drawing.Point(670, 135)
+        Me.TextEdit9.Location = New System.Drawing.Point(123, 170)
        Me.TextEdit9.MenuManager = Me.RibbonControl
        Me.TextEdit9.Name = "TextEdit9"
-        Me.TextEdit9.Size = New System.Drawing.Size(377, 20)
+        Me.TextEdit9.Size = New System.Drawing.Size(912, 20)
        Me.TextEdit9.StyleController = Me.LayoutControl1
        Me.TextEdit9.TabIndex = 13
        '
        'txtBELEGKEY
        '
-        Me.txtBELEGKEY.Location = New System.Drawing.Point(453, 15)
+        Me.txtBELEGKEY.Location = New System.Drawing.Point(760, 50)
        Me.txtBELEGKEY.MenuManager = Me.RibbonControl
        Me.txtBELEGKEY.Name = "txtBELEGKEY"
-        Me.txtBELEGKEY.Size = New System.Drawing.Size(129, 20)
+        Me.txtBELEGKEY.Size = New System.Drawing.Size(275, 20)
        Me.txtBELEGKEY.StyleController = Me.LayoutControl1
        Me.txtBELEGKEY.TabIndex = 0
        '
        'txtRunningNumber
        '
-        Me.txtRunningNumber.Location = New System.Drawing.Point(92, 15)
+        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(274, 20)
+        Me.txtRunningNumber.Size = New System.Drawing.Size(531, 20)
        Me.txtRunningNumber.StyleController = Me.LayoutControl1
        Me.txtRunningNumber.TabIndex = 2
        '
        'dateOrderDate
        '
        Me.dateOrderDate.EditValue = Nothing
-        Me.dateOrderDate.Location = New System.Drawing.Point(486, 135)
+        Me.dateOrderDate.Location = New System.Drawing.Point(817, 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(96, 20)
+        Me.dateOrderDate.Size = New System.Drawing.Size(218, 20)
        Me.dateOrderDate.StyleController = Me.LayoutControl1
        Me.dateOrderDate.TabIndex = 8
        '
        'cmbMandator
        '
-        Me.cmbMandator.Location = New System.Drawing.Point(92, 45)
+        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(274, 20)
+        Me.cmbMandator.Size = New System.Drawing.Size(531, 20)
        Me.cmbMandator.StyleController = Me.LayoutControl1
        Me.cmbMandator.TabIndex = 4
        '
@@ -497,14 +528,14 @@ Partial Class frmMain
        '
        'cmbCustomer
        '
-        Me.cmbCustomer.Location = New System.Drawing.Point(92, 75)
+        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)})
        Me.cmbCustomer.Properties.DisplayMember = "Name"
        Me.cmbCustomer.Properties.NullText = ""
        Me.cmbCustomer.Properties.PopupView = Me.GridView1
-        Me.cmbCustomer.Size = New System.Drawing.Size(490, 20)
+        Me.cmbCustomer.Size = New System.Drawing.Size(403, 20)
        Me.cmbCustomer.StyleController = Me.LayoutControl1
        Me.cmbCustomer.TabIndex = 10
        '
@@ -517,14 +548,14 @@ Partial Class frmMain
        '
        'cmbDeliveryAddress
        '
-        Me.cmbDeliveryAddress.Location = New System.Drawing.Point(92, 105)
+        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)})
        Me.cmbDeliveryAddress.Properties.NullText = ""
        Me.cmbDeliveryAddress.Properties.PopupSizeable = False
        Me.cmbDeliveryAddress.Properties.PopupView = Me.GridView2
-        Me.cmbDeliveryAddress.Size = New System.Drawing.Size(490, 20)
+        Me.cmbDeliveryAddress.Size = New System.Drawing.Size(403, 20)
        Me.cmbDeliveryAddress.StyleController = Me.LayoutControl1
        Me.cmbDeliveryAddress.TabIndex = 14
        '
@@ -535,84 +566,58 @@ Partial Class frmMain
        Me.GridView2.OptionsSelection.EnableAppearanceFocusedCell = False
        Me.GridView2.OptionsView.ShowGroupPanel = False
        '
+        'cmbYears
+        '
+        Me.cmbYears.Location = New System.Drawing.Point(760, 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(275, 20)
+        Me.cmbYears.StyleController = Me.LayoutControl1
+        Me.cmbYears.TabIndex = 15
+        '
+        'txtCustomerGLN
+        '
+        Me.txtCustomerGLN.Location = New System.Drawing.Point(632, 110)
+        Me.txtCustomerGLN.MenuManager = Me.RibbonControl
+        Me.txtCustomerGLN.Name = "txtCustomerGLN"
+        Me.txtCustomerGLN.Size = New System.Drawing.Size(403, 20)
+        Me.txtCustomerGLN.StyleController = Me.LayoutControl1
+        Me.txtCustomerGLN.TabIndex = 16
+        '
+        'txtDeliveryAddressGLN
+        '
+        Me.txtDeliveryAddressGLN.Location = New System.Drawing.Point(632, 140)
+        Me.txtDeliveryAddressGLN.MenuManager = Me.RibbonControl
+        Me.txtDeliveryAddressGLN.Name = "txtDeliveryAddressGLN"
+        Me.txtDeliveryAddressGLN.Size = New System.Drawing.Size(403, 20)
+        Me.txtDeliveryAddressGLN.StyleController = Me.LayoutControl1
+        Me.txtDeliveryAddressGLN.TabIndex = 17
+        '
        'Root
        '
        Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
        Me.Root.GroupBordersVisible = False
-        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutItemOrderIssuer, Me.LayoutControlItem3, Me.LayoutItemOrderNumber, Me.LayoutControlItem6, Me.LayoutControlItem9, Me.LayoutControlItem10, Me.LayoutControlItem11, Me.LayoutItemOrderDate, Me.LayoutControlItem8, Me.LayoutControlItem7, Me.LayoutControlItem1, Me.SimpleSeparator1, Me.LayoutControlItem2, Me.LayoutControlItem5, Me.LayoutControlItemRunningNumber, Me.LayoutControlItem4})
+        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.TextVisible = False
        '
-        'LayoutItemOrderIssuer
+        'TabbedControlGroup2
        '
-        Me.LayoutItemOrderIssuer.Control = Me.txtOrderIssuer
-        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(210, 30)
-        Me.LayoutItemOrderIssuer.Text = "Besteller"
-        Me.LayoutItemOrderIssuer.TextSize = New System.Drawing.Size(74, 13)
+        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.TabPages.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup2, Me.LayoutControlGroup1})
        '
-        'LayoutControlItem3
+        'LayoutControlGroup2
        '
-        Me.LayoutControlItem3.Control = Me.MemoEdit1
-        Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 150)
-        Me.LayoutControlItem3.Name = "LayoutControlItem3"
-        Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem3.Size = New System.Drawing.Size(577, 105)
-        Me.LayoutControlItem3.Text = "Freitext"
-        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(74, 13)
-        '
-        'LayoutItemOrderNumber
-        '
-        Me.LayoutItemOrderNumber.Control = Me.txtOrderNumber
-        Me.LayoutItemOrderNumber.Location = New System.Drawing.Point(210, 120)
-        Me.LayoutItemOrderNumber.Name = "LayoutItemOrderNumber"
-        Me.LayoutItemOrderNumber.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutItemOrderNumber.Size = New System.Drawing.Size(184, 30)
-        Me.LayoutItemOrderNumber.Text = "Bestellnummer"
-        Me.LayoutItemOrderNumber.TextSize = New System.Drawing.Size(74, 13)
-        '
-        'LayoutControlItem6
-        '
-        Me.LayoutControlItem6.Control = Me.TextEdit5
-        Me.LayoutControlItem6.Location = New System.Drawing.Point(578, 0)
-        Me.LayoutControlItem6.Name = "LayoutControlItem6"
-        Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem6.Size = New System.Drawing.Size(464, 30)
-        Me.LayoutControlItem6.Text = "Straße"
-        Me.LayoutControlItem6.TextSize = New System.Drawing.Size(74, 13)
-        '
-        'LayoutControlItem9
-        '
-        Me.LayoutControlItem9.Control = Me.TextEdit8
-        Me.LayoutControlItem9.Location = New System.Drawing.Point(578, 60)
-        Me.LayoutControlItem9.Name = "LayoutControlItem9"
-        Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem9.Size = New System.Drawing.Size(464, 30)
-        Me.LayoutControlItem9.Text = "PLZ"
-        Me.LayoutControlItem9.TextSize = New System.Drawing.Size(74, 13)
-        '
-        'LayoutControlItem10
-        '
-        Me.LayoutControlItem10.Control = Me.TextEdit9
-        Me.LayoutControlItem10.Location = New System.Drawing.Point(578, 120)
-        Me.LayoutControlItem10.Name = "LayoutControlItem10"
-        Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem10.Size = New System.Drawing.Size(464, 135)
-        Me.LayoutControlItem10.Text = "Kontakt"
-        Me.LayoutControlItem10.TextSize = New System.Drawing.Size(74, 13)
-        '
-        'LayoutControlItem11
-        '
-        Me.LayoutControlItem11.Control = Me.txtBELEGKEY
-        Me.LayoutControlItem11.Location = New System.Drawing.Point(361, 0)
-        Me.LayoutControlItem11.Name = "LayoutControlItem11"
-        Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem11.Size = New System.Drawing.Size(216, 30)
-        Me.LayoutControlItem11.Text = "BELEGKEY"
-        Me.LayoutControlItem11.TextSize = New System.Drawing.Size(74, 13)
+        Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItemRunningNumber, Me.LayoutControlItem11, Me.LayoutControlItem4, Me.LayoutControlItem1, Me.LayoutControlItem5, Me.LayoutControlItem2, Me.LayoutItemOrderIssuer, Me.LayoutControlItem3, Me.LayoutItemOrderNumber, Me.LayoutItemOrderDate, Me.LayoutControlItem12, Me.LayoutControlItem13})
+        Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControlGroup2.Name = "LayoutControlGroup2"
+        Me.LayoutControlGroup2.Size = New System.Drawing.Size(1018, 208)
+        Me.LayoutControlGroup2.Text = "Basisdaten"
        '
        'LayoutControlItemRunningNumber
        '
@@ -620,39 +625,29 @@ Partial Class frmMain
        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(361, 30)
+        Me.LayoutControlItemRunningNumber.Size = New System.Drawing.Size(637, 30)
        Me.LayoutControlItemRunningNumber.Text = "Laufnummer"
-        Me.LayoutControlItemRunningNumber.TextSize = New System.Drawing.Size(74, 13)
+        Me.LayoutControlItemRunningNumber.TextSize = New System.Drawing.Size(93, 13)
        '
-        'LayoutItemOrderDate
+        'LayoutControlItem11
        '
-        Me.LayoutItemOrderDate.Control = Me.dateOrderDate
-        Me.LayoutItemOrderDate.Location = New System.Drawing.Point(394, 120)
-        Me.LayoutItemOrderDate.Name = "LayoutItemOrderDate"
-        Me.LayoutItemOrderDate.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutItemOrderDate.Size = New System.Drawing.Size(183, 30)
-        Me.LayoutItemOrderDate.Text = "Bestelldatum"
-        Me.LayoutItemOrderDate.TextSize = New System.Drawing.Size(74, 13)
+        Me.LayoutControlItem11.Control = Me.txtBELEGKEY
+        Me.LayoutControlItem11.Location = New System.Drawing.Point(637, 0)
+        Me.LayoutControlItem11.Name = "LayoutControlItem11"
+        Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem11.Size = New System.Drawing.Size(381, 30)
+        Me.LayoutControlItem11.Text = "BELEGKEY"
+        Me.LayoutControlItem11.TextSize = New System.Drawing.Size(93, 13)
        '
-        'LayoutControlItem8
+        'LayoutControlItem4
        '
-        Me.LayoutControlItem8.Control = Me.TextEdit7
-        Me.LayoutControlItem8.Location = New System.Drawing.Point(578, 90)
-        Me.LayoutControlItem8.Name = "LayoutControlItem8"
-        Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem8.Size = New System.Drawing.Size(464, 30)
-        Me.LayoutControlItem8.Text = "Ort"
-        Me.LayoutControlItem8.TextSize = New System.Drawing.Size(74, 13)
-        '
-        'LayoutControlItem7
-        '
-        Me.LayoutControlItem7.Control = Me.TextEdit6
-        Me.LayoutControlItem7.Location = New System.Drawing.Point(578, 30)
-        Me.LayoutControlItem7.Name = "LayoutControlItem7"
-        Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem7.Size = New System.Drawing.Size(464, 30)
-        Me.LayoutControlItem7.Text = "Hausnummer"
-        Me.LayoutControlItem7.TextSize = New System.Drawing.Size(74, 13)
+        Me.LayoutControlItem4.Control = Me.cmbYears
+        Me.LayoutControlItem4.Location = New System.Drawing.Point(637, 30)
+        Me.LayoutControlItem4.Name = "LayoutControlItem4"
+        Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem4.Size = New System.Drawing.Size(381, 30)
+        Me.LayoutControlItem4.Text = "Wirtschaftsjahr"
+        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(93, 13)
        '
        'LayoutControlItem1
        '
@@ -660,26 +655,9 @@ Partial Class frmMain
        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(361, 30)
+        Me.LayoutControlItem1.Size = New System.Drawing.Size(637, 30)
        Me.LayoutControlItem1.Text = "Mandant"
-        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(74, 13)
-        '
-        'SimpleSeparator1
-        '
-        Me.SimpleSeparator1.AllowHotTrack = False
-        Me.SimpleSeparator1.Location = New System.Drawing.Point(577, 0)
-        Me.SimpleSeparator1.Name = "SimpleSeparator1"
-        Me.SimpleSeparator1.Size = New System.Drawing.Size(1, 255)
-        '
-        'LayoutControlItem2
-        '
-        Me.LayoutControlItem2.Control = Me.cmbDeliveryAddress
-        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(577, 30)
-        Me.LayoutControlItem2.Text = "Lieferadresse"
-        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(74, 13)
+        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(93, 13)
        '
        'LayoutControlItem5
        '
@@ -687,9 +665,137 @@ Partial Class frmMain
        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(577, 30)
+        Me.LayoutControlItem5.Size = New System.Drawing.Size(509, 30)
        Me.LayoutControlItem5.Text = "Kunde"
-        Me.LayoutControlItem5.TextSize = New System.Drawing.Size(74, 13)
+        Me.LayoutControlItem5.TextSize = New System.Drawing.Size(93, 13)
+        '
+        'LayoutControlItem2
+        '
+        Me.LayoutControlItem2.Control = Me.cmbDeliveryAddress
+        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(509, 30)
+        Me.LayoutControlItem2.Text = "Lieferadresse"
+        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(93, 13)
+        '
+        'LayoutItemOrderIssuer
+        '
+        Me.LayoutItemOrderIssuer.Control = Me.txtOrderIssuer
+        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.Text = "Besteller"
+        Me.LayoutItemOrderIssuer.TextSize = New System.Drawing.Size(93, 13)
+        '
+        'LayoutControlItem3
+        '
+        Me.LayoutControlItem3.Control = Me.MemoEdit1
+        Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 150)
+        Me.LayoutControlItem3.Name = "LayoutControlItem3"
+        Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(1018, 58)
+        Me.LayoutControlItem3.Text = "Freitext"
+        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(93, 13)
+        '
+        'LayoutItemOrderNumber
+        '
+        Me.LayoutItemOrderNumber.Control = Me.txtOrderNumber
+        Me.LayoutItemOrderNumber.Location = New System.Drawing.Point(370, 120)
+        Me.LayoutItemOrderNumber.Name = "LayoutItemOrderNumber"
+        Me.LayoutItemOrderNumber.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutItemOrderNumber.Size = New System.Drawing.Size(324, 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(694, 120)
+        Me.LayoutItemOrderDate.Name = "LayoutItemOrderDate"
+        Me.LayoutItemOrderDate.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutItemOrderDate.Size = New System.Drawing.Size(324, 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(509, 60)
+        Me.LayoutControlItem12.Name = "LayoutControlItem12"
+        Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem12.Size = New System.Drawing.Size(509, 30)
+        Me.LayoutControlItem12.Text = "Kunde GLN"
+        Me.LayoutControlItem12.TextSize = New System.Drawing.Size(93, 13)
+        '
+        'LayoutControlItem13
+        '
+        Me.LayoutControlItem13.Control = Me.txtDeliveryAddressGLN
+        Me.LayoutControlItem13.Location = New System.Drawing.Point(509, 90)
+        Me.LayoutControlItem13.Name = "LayoutControlItem13"
+        Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem13.Size = New System.Drawing.Size(509, 30)
+        Me.LayoutControlItem13.Text = "Lieferaddresse GLN"
+        Me.LayoutControlItem13.TextSize = New System.Drawing.Size(93, 13)
+        '
+        'LayoutControlGroup1
+        '
+        Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem8, Me.LayoutControlItem9, Me.LayoutControlItem7, Me.LayoutControlItem6})
+        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, 120)
+        Me.LayoutControlItem10.Name = "LayoutControlItem10"
+        Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem10.Size = New System.Drawing.Size(1018, 88)
+        Me.LayoutControlItem10.Text = "Kontakt"
+        Me.LayoutControlItem10.TextSize = New System.Drawing.Size(93, 13)
+        '
+        'LayoutControlItem8
+        '
+        Me.LayoutControlItem8.Control = Me.TextEdit7
+        Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 90)
+        Me.LayoutControlItem8.Name = "LayoutControlItem8"
+        Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem8.Size = New System.Drawing.Size(1018, 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(1018, 30)
+        Me.LayoutControlItem9.Text = "PLZ"
+        Me.LayoutControlItem9.TextSize = New System.Drawing.Size(93, 13)
+        '
+        'LayoutControlItem7
+        '
+        Me.LayoutControlItem7.Control = Me.TextEdit6
+        Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 30)
+        Me.LayoutControlItem7.Name = "LayoutControlItem7"
+        Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
+        Me.LayoutControlItem7.Size = New System.Drawing.Size(1018, 30)
+        Me.LayoutControlItem7.Text = "Hausnummer"
+        Me.LayoutControlItem7.TextSize = New System.Drawing.Size(93, 13)
+        '
+        'LayoutControlItem6
+        '
+        Me.LayoutControlItem6.Control = Me.TextEdit5
+        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 0)
+        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)
        '
        'GridControlPositions
        '
@@ -698,7 +804,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, 309)
+        Me.GridControlPositions.Size = New System.Drawing.Size(1062, 335)
        Me.GridControlPositions.TabIndex = 0
        Me.GridControlPositions.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewPositions})
        '
@@ -713,13 +819,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, 158)
+        Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 132)
        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, 594)
+        Me.SplitContainerControl3.Size = New System.Drawing.Size(1406, 620)
        Me.SplitContainerControl3.SplitterPosition = 1114
        Me.SplitContainerControl3.TabIndex = 6
        '
@@ -736,26 +842,6 @@ Partial Class frmMain
        Me.RichEditXml.Size = New System.Drawing.Size(0, 0)
        Me.RichEditXml.TabIndex = 0
        '
-        'LayoutControlItem4
-        '
-        Me.LayoutControlItem4.Control = Me.cmbYears
-        Me.LayoutControlItem4.Location = New System.Drawing.Point(361, 30)
-        Me.LayoutControlItem4.Name = "LayoutControlItem4"
-        Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem4.Size = New System.Drawing.Size(216, 30)
-        Me.LayoutControlItem4.Text = "Wirtschaftsjahr"
-        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(74, 13)
-        '
-        'cmbYears
-        '
-        Me.cmbYears.Location = New System.Drawing.Point(453, 45)
-        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(129, 20)
-        Me.cmbYears.StyleController = Me.LayoutControl1
-        Me.cmbYears.TabIndex = 15
-        '
        'frmMain
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -764,6 +850,7 @@ Partial Class frmMain
        Me.Controls.Add(Me.SplitContainerControl3)
        Me.Controls.Add(Me.RibbonStatusBar)
        Me.Controls.Add(Me.RibbonControl)
+        Me.IconOptions.SvgImage = Global.EDIDocumentImport.My.Resources.Resources.tilelabels
        Me.Name = "frmMain"
        Me.Ribbon = Me.RibbonControl
        Me.StatusBar = Me.RibbonStatusBar
@@ -795,28 +882,34 @@ Partial Class frmMain
        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.cmbDeliveryAddress.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.cmbYears.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtCustomerGLN.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtDeliveryAddressGLN.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TabbedControlGroup2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItemRunningNumber, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutItemOrderIssuer, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutItemOrderNumber, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItemRunningNumber, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutItemOrderDate, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.SimpleSeparator1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem6, 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.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.cmbYears.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -835,34 +928,20 @@ Partial Class frmMain
    Friend WithEvents MemoEdit1 As DevExpress.XtraEditors.MemoEdit
    Friend WithEvents txtOrderNumber As DevExpress.XtraEditors.TextEdit
    Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup
-    Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem
-    Friend WithEvents LayoutItemOrderIssuer As DevExpress.XtraLayout.LayoutControlItem
-    Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem
-    Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem
-    Friend WithEvents LayoutItemOrderNumber As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents GridControlPositions As DevExpress.XtraGrid.GridControl
    Friend WithEvents GridViewPositions As DevExpress.XtraGrid.Views.Grid.GridView
    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 LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents btnLoadDocuments As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents TextEdit6 As DevExpress.XtraEditors.TextEdit
    Friend WithEvents TextEdit7 As DevExpress.XtraEditors.TextEdit
    Friend WithEvents TextEdit8 As DevExpress.XtraEditors.TextEdit
-    Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem
-    Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem
-    Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem
-    Friend WithEvents SimpleSeparator1 As DevExpress.XtraLayout.SimpleSeparator
    Friend WithEvents TextEdit9 As DevExpress.XtraEditors.TextEdit
-    Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents txtBELEGKEY As DevExpress.XtraEditors.TextEdit
-    Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents txtRunningNumber As DevExpress.XtraEditors.TextEdit
-    Friend WithEvents LayoutControlItemRunningNumber As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents dateOrderDate As DevExpress.XtraEditors.DateEdit
-    Friend WithEvents LayoutItemOrderDate As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents txtFilesLoaded As DevExpress.XtraBars.BarHeaderItem
    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
@@ -878,7 +957,6 @@ Partial Class frmMain
    Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents cmbDeliveryAddress As DevExpress.XtraEditors.SearchLookUpEdit
    Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView
-    Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents txtVersion As DevExpress.XtraBars.BarStaticItem
@@ -887,5 +965,27 @@ Partial Class frmMain
    Friend WithEvents BarButtonItem7 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents colSelected As DevExpress.XtraGrid.Columns.GridColumn
    Friend WithEvents cmbYears As DevExpress.XtraEditors.ComboBoxEdit
+    Friend WithEvents TabbedControlGroup2 As DevExpress.XtraLayout.TabbedControlGroup
+    Friend WithEvents LayoutControlGroup2 As DevExpress.XtraLayout.LayoutControlGroup
+    Friend WithEvents LayoutControlItemRunningNumber As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutItemOrderIssuer As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutItemOrderNumber As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutItemOrderDate As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup
+    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
+    Friend WithEvents txtDeliveryAddressGLN As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents LayoutControlItem12 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem13 As DevExpress.XtraLayout.LayoutControlItem
 End Class