WIP

2021-08-06 16:21:28 +02:00
parent eeb8ac9472
commit 50c1e86219
16 changed files with 547 additions and 187 deletions
--- a/EDIDocumentImport/frmMain.Designer.vb
+++ b/EDIDocumentImport/frmMain.Designer.vb
@@ -19,6 +19,7 @@ Partial Class frmMain
    'Do not modify it using the code editor.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
+        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.txtFilesLoaded = New DevExpress.XtraBars.BarHeaderItem()
@@ -27,13 +28,20 @@ Partial Class frmMain
        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
        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.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem7 = 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()
        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.GridControlFiles = New DevExpress.XtraGrid.GridControl()
        Me.GridViewFiles = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.colSelected = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.colFileName = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.colFilePath = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
@@ -54,6 +62,8 @@ Partial Class frmMain
        Me.SearchLookUpEdit1View = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.cmbCustomer = New DevExpress.XtraEditors.SearchLookUpEdit()
        Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.cmbDeliveryAddress = New DevExpress.XtraEditors.SearchLookUpEdit()
+        Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
        Me.LayoutItemOrderIssuer = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
@@ -68,11 +78,14 @@ Partial Class frmMain
        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.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()
@@ -98,6 +111,8 @@ Partial Class frmMain
        CType(Me.SearchLookUpEdit1View, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.cmbCustomer.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.cmbDeliveryAddress.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutItemOrderIssuer, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -112,19 +127,22 @@ Partial Class frmMain
        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.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.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.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl.MaxItemId = 11
+        Me.RibbonControl.MaxItemId = 15
        Me.RibbonControl.Name = "RibbonControl"
        Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
        Me.RibbonControl.Size = New System.Drawing.Size(1406, 158)
@@ -173,23 +191,50 @@ Partial Class frmMain
        '
        'BarButtonItem4
        '
-        Me.BarButtonItem4.Caption = "Daten übermitteln"
+        Me.BarButtonItem4.Caption = "Aktuelle Zeile übermitteln"
        Me.BarButtonItem4.Id = 10
        Me.BarButtonItem4.ImageOptions.SvgImage = Global.EDIDocumentImport.My.Resources.Resources.bo_validation
        Me.BarButtonItem4.Name = "BarButtonItem4"
        '
+        'BarButtonItem5
+        '
+        Me.BarButtonItem5.Caption = "Markierte Zeilen übermitteln"
+        Me.BarButtonItem5.Id = 11
+        Me.BarButtonItem5.ImageOptions.SvgImage = Global.EDIDocumentImport.My.Resources.Resources.itemtypechecked
+        Me.BarButtonItem5.Name = "BarButtonItem5"
+        '
+        'txtVersion
+        '
+        Me.txtVersion.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right
+        Me.txtVersion.Caption = "Version {0}"
+        Me.txtVersion.Id = 12
+        Me.txtVersion.Name = "txtVersion"
+        '
+        'BarButtonItem6
+        '
+        Me.BarButtonItem6.Caption = "Zeile löschen"
+        Me.BarButtonItem6.Id = 13
+        Me.BarButtonItem6.ImageOptions.SvgImage = Global.EDIDocumentImport.My.Resources.Resources.deletetablerows
+        Me.BarButtonItem6.Name = "BarButtonItem6"
+        '
+        'BarButtonItem7
+        '
+        Me.BarButtonItem7.Caption = "Artikel ersetzen"
+        Me.BarButtonItem7.Id = 14
+        Me.BarButtonItem7.ImageOptions.SvgImage = Global.EDIDocumentImport.My.Resources.Resources.tableproperties
+        Me.BarButtonItem7.Name = "BarButtonItem7"
+        '
        'RibbonPage1
        '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroup4, Me.RibbonPageGroup5})
        Me.RibbonPage1.Name = "RibbonPage1"
        Me.RibbonPage1.Text = "Start"
        '
        'RibbonPageGroup1
        '
        Me.RibbonPageGroup1.ItemLinks.Add(Me.btnLoadDocuments)
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem4)
        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
-        Me.RibbonPageGroup1.Text = "Start"
+        Me.RibbonPageGroup1.Text = "Daten laden"
        '
        'RibbonPageGroup2
        '
@@ -207,9 +252,24 @@ Partial Class frmMain
        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
        Me.RibbonPageGroup3.Text = "Debugging"
        '
+        'RibbonPageGroup4
+        '
+        Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem4)
+        Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem5)
+        Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
+        Me.RibbonPageGroup4.Text = "Daten übermitteln"
+        '
+        'RibbonPageGroup5
+        '
+        Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem6)
+        Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem7)
+        Me.RibbonPageGroup5.Name = "RibbonPageGroup5"
+        Me.RibbonPageGroup5.Text = "Belegpositionen"
+        '
        'RibbonStatusBar
        '
        Me.RibbonStatusBar.ItemLinks.Add(Me.txtFilesLoaded)
+        Me.RibbonStatusBar.ItemLinks.Add(Me.txtVersion)
        Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 752)
        Me.RibbonStatusBar.Name = "RibbonStatusBar"
        Me.RibbonStatusBar.Ribbon = Me.RibbonControl
@@ -228,17 +288,29 @@ Partial Class frmMain
        '
        'GridViewFiles
        '
-        Me.GridViewFiles.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colFileName, Me.colFilePath})
+        Me.GridViewFiles.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSelected, Me.colFileName, Me.colFilePath})
        Me.GridViewFiles.GridControl = Me.GridControlFiles
        Me.GridViewFiles.Name = "GridViewFiles"
        '
+        'colSelected
+        '
+        Me.colSelected.FieldName = "colSelected"
+        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"
+        Me.colSelected.UnboundType = DevExpress.Data.UnboundColumnType.[Boolean]
+        Me.colSelected.Visible = True
+        Me.colSelected.VisibleIndex = 0
+        Me.colSelected.Width = 30
+        '
        'colFileName
        '
        Me.colFileName.Caption = "Dateiname"
        Me.colFileName.FieldName = "Name"
        Me.colFileName.Name = "colFileName"
        Me.colFileName.Visible = True
-        Me.colFileName.VisibleIndex = 0
+        Me.colFileName.VisibleIndex = 1
+        Me.colFileName.Width = 99
        '
        'colFilePath
        '
@@ -246,7 +318,8 @@ Partial Class frmMain
        Me.colFilePath.FieldName = "FullName"
        Me.colFilePath.Name = "colFilePath"
        Me.colFilePath.Visible = True
-        Me.colFilePath.VisibleIndex = 1
+        Me.colFilePath.VisibleIndex = 2
+        Me.colFilePath.Width = 99
        '
        'SplitContainerControl1
        '
@@ -290,6 +363,8 @@ Partial Class frmMain
        Me.LayoutControl1.Controls.Add(Me.dateOrderDate)
        Me.LayoutControl1.Controls.Add(Me.cmbMandator)
        Me.LayoutControl1.Controls.Add(Me.cmbCustomer)
+        Me.LayoutControl1.Controls.Add(Me.cmbDeliveryAddress)
+        Me.LayoutControl1.Controls.Add(Me.cmbYears)
        Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.LayoutControl1.Location = New System.Drawing.Point(0, 0)
        Me.LayoutControl1.Name = "LayoutControl1"
@@ -301,116 +376,115 @@ Partial Class frmMain
        '
        'txtOrderIssuer
        '
-        Me.txtOrderIssuer.Location = New System.Drawing.Point(87, 105)
+        Me.txtOrderIssuer.Location = New System.Drawing.Point(92, 135)
        Me.txtOrderIssuer.MenuManager = Me.RibbonControl
        Me.txtOrderIssuer.Name = "txtOrderIssuer"
-        Me.txtOrderIssuer.Size = New System.Drawing.Size(184, 20)
+        Me.txtOrderIssuer.Size = New System.Drawing.Size(123, 20)
        Me.txtOrderIssuer.StyleController = Me.LayoutControl1
        Me.txtOrderIssuer.TabIndex = 6
        '
        'MemoEdit1
        '
-        Me.MemoEdit1.Location = New System.Drawing.Point(87, 135)
+        Me.MemoEdit1.Location = New System.Drawing.Point(92, 165)
        Me.MemoEdit1.MenuManager = Me.RibbonControl
        Me.MemoEdit1.Name = "MemoEdit1"
-        Me.MemoEdit1.Size = New System.Drawing.Size(608, 125)
+        Me.MemoEdit1.Size = New System.Drawing.Size(490, 95)
        Me.MemoEdit1.StyleController = Me.LayoutControl1
        Me.MemoEdit1.TabIndex = 12
        '
        'txtOrderNumber
        '
-        Me.txtOrderNumber.Location = New System.Drawing.Point(353, 105)
+        Me.txtOrderNumber.Location = New System.Drawing.Point(302, 135)
        Me.txtOrderNumber.MenuManager = Me.RibbonControl
        Me.txtOrderNumber.Name = "txtOrderNumber"
-        Me.txtOrderNumber.Size = New System.Drawing.Size(128, 20)
+        Me.txtOrderNumber.Size = New System.Drawing.Size(97, 20)
        Me.txtOrderNumber.StyleController = Me.LayoutControl1
        Me.txtOrderNumber.TabIndex = 7
        '
        'TextEdit5
        '
-        Me.TextEdit5.Location = New System.Drawing.Point(778, 15)
+        Me.TextEdit5.Location = New System.Drawing.Point(670, 15)
        Me.TextEdit5.MenuManager = Me.RibbonControl
        Me.TextEdit5.Name = "TextEdit5"
-        Me.TextEdit5.Size = New System.Drawing.Size(269, 20)
+        Me.TextEdit5.Size = New System.Drawing.Size(377, 20)
        Me.TextEdit5.StyleController = Me.LayoutControl1
        Me.TextEdit5.TabIndex = 3
        '
        'TextEdit6
        '
-        Me.TextEdit6.Location = New System.Drawing.Point(778, 45)
+        Me.TextEdit6.Location = New System.Drawing.Point(670, 45)
        Me.TextEdit6.MenuManager = Me.RibbonControl
        Me.TextEdit6.Name = "TextEdit6"
-        Me.TextEdit6.Size = New System.Drawing.Size(269, 20)
+        Me.TextEdit6.Size = New System.Drawing.Size(377, 20)
        Me.TextEdit6.StyleController = Me.LayoutControl1
        Me.TextEdit6.TabIndex = 5
        '
        'TextEdit7
        '
-        Me.TextEdit7.Location = New System.Drawing.Point(778, 105)
+        Me.TextEdit7.Location = New System.Drawing.Point(670, 105)
        Me.TextEdit7.MenuManager = Me.RibbonControl
        Me.TextEdit7.Name = "TextEdit7"
-        Me.TextEdit7.Size = New System.Drawing.Size(269, 20)
+        Me.TextEdit7.Size = New System.Drawing.Size(377, 20)
        Me.TextEdit7.StyleController = Me.LayoutControl1
        Me.TextEdit7.TabIndex = 11
        '
        'TextEdit8
        '
-        Me.TextEdit8.Location = New System.Drawing.Point(778, 75)
+        Me.TextEdit8.Location = New System.Drawing.Point(670, 75)
        Me.TextEdit8.MenuManager = Me.RibbonControl
        Me.TextEdit8.Name = "TextEdit8"
-        Me.TextEdit8.Size = New System.Drawing.Size(269, 20)
+        Me.TextEdit8.Size = New System.Drawing.Size(377, 20)
        Me.TextEdit8.StyleController = Me.LayoutControl1
        Me.TextEdit8.TabIndex = 9
        '
        'TextEdit9
        '
-        Me.TextEdit9.Location = New System.Drawing.Point(778, 135)
+        Me.TextEdit9.Location = New System.Drawing.Point(670, 135)
        Me.TextEdit9.MenuManager = Me.RibbonControl
        Me.TextEdit9.Name = "TextEdit9"
-        Me.TextEdit9.Size = New System.Drawing.Size(269, 20)
+        Me.TextEdit9.Size = New System.Drawing.Size(377, 20)
        Me.TextEdit9.StyleController = Me.LayoutControl1
        Me.TextEdit9.TabIndex = 13
        '
        'txtBELEGKEY
        '
-        Me.txtBELEGKEY.Location = New System.Drawing.Point(87, 15)
+        Me.txtBELEGKEY.Location = New System.Drawing.Point(453, 15)
        Me.txtBELEGKEY.MenuManager = Me.RibbonControl
        Me.txtBELEGKEY.Name = "txtBELEGKEY"
-        Me.txtBELEGKEY.Size = New System.Drawing.Size(184, 20)
+        Me.txtBELEGKEY.Size = New System.Drawing.Size(129, 20)
        Me.txtBELEGKEY.StyleController = Me.LayoutControl1
        Me.txtBELEGKEY.TabIndex = 0
        '
        'txtRunningNumber
        '
-        Me.txtRunningNumber.Location = New System.Drawing.Point(353, 15)
+        Me.txtRunningNumber.Location = New System.Drawing.Point(92, 15)
        Me.txtRunningNumber.MenuManager = Me.RibbonControl
        Me.txtRunningNumber.Name = "txtRunningNumber"
-        Me.txtRunningNumber.Size = New System.Drawing.Size(342, 20)
+        Me.txtRunningNumber.Size = New System.Drawing.Size(274, 20)
        Me.txtRunningNumber.StyleController = Me.LayoutControl1
        Me.txtRunningNumber.TabIndex = 2
        '
        'dateOrderDate
        '
        Me.dateOrderDate.EditValue = Nothing
-        Me.dateOrderDate.Location = New System.Drawing.Point(563, 105)
+        Me.dateOrderDate.Location = New System.Drawing.Point(486, 135)
        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(132, 20)
+        Me.dateOrderDate.Size = New System.Drawing.Size(96, 20)
        Me.dateOrderDate.StyleController = Me.LayoutControl1
        Me.dateOrderDate.TabIndex = 8
        '
        'cmbMandator
        '
-        Me.cmbMandator.Location = New System.Drawing.Point(87, 45)
+        Me.cmbMandator.Location = New System.Drawing.Point(92, 45)
        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.Properties.ValueMember = "Id"
-        Me.cmbMandator.Size = New System.Drawing.Size(608, 20)
+        Me.cmbMandator.Size = New System.Drawing.Size(274, 20)
        Me.cmbMandator.StyleController = Me.LayoutControl1
        Me.cmbMandator.TabIndex = 4
        '
@@ -423,15 +497,14 @@ Partial Class frmMain
        '
        'cmbCustomer
        '
-        Me.cmbCustomer.Location = New System.Drawing.Point(87, 75)
+        Me.cmbCustomer.Location = New System.Drawing.Point(92, 75)
        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.Properties.ValueMember = "Id"
-        Me.cmbCustomer.Size = New System.Drawing.Size(608, 20)
+        Me.cmbCustomer.Size = New System.Drawing.Size(490, 20)
        Me.cmbCustomer.StyleController = Me.LayoutControl1
        Me.cmbCustomer.TabIndex = 10
        '
@@ -442,11 +515,31 @@ Partial Class frmMain
        Me.GridView1.OptionsSelection.EnableAppearanceFocusedCell = False
        Me.GridView1.OptionsView.ShowGroupPanel = False
        '
+        'cmbDeliveryAddress
+        '
+        Me.cmbDeliveryAddress.Location = New System.Drawing.Point(92, 105)
+        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.StyleController = Me.LayoutControl1
+        Me.cmbDeliveryAddress.TabIndex = 14
+        '
+        'GridView2
+        '
+        Me.GridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus
+        Me.GridView2.Name = "GridView2"
+        Me.GridView2.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.GridView2.OptionsView.ShowGroupPanel = False
+        '
        '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.LayoutControlItemRunningNumber, Me.LayoutItemOrderDate, Me.LayoutControlItem8, Me.LayoutControlItem7, Me.LayoutControlItem1, Me.SimpleSeparator1, Me.LayoutControlItem5})
+        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.Name = "Root"
        Me.Root.Size = New System.Drawing.Size(1062, 275)
        Me.Root.TextVisible = False
@@ -454,112 +547,112 @@ 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(266, 30)
+        Me.LayoutItemOrderIssuer.Size = New System.Drawing.Size(210, 30)
        Me.LayoutItemOrderIssuer.Text = "Besteller"
-        Me.LayoutItemOrderIssuer.TextSize = New System.Drawing.Size(69, 13)
+        Me.LayoutItemOrderIssuer.TextSize = New System.Drawing.Size(74, 13)
        '
        'LayoutControlItem3
        '
        Me.LayoutControlItem3.Control = Me.MemoEdit1
-        Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 120)
+        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(690, 135)
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(577, 105)
        Me.LayoutControlItem3.Text = "Freitext"
-        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(69, 13)
+        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(74, 13)
        '
        'LayoutItemOrderNumber
        '
        Me.LayoutItemOrderNumber.Control = Me.txtOrderNumber
-        Me.LayoutItemOrderNumber.Location = New System.Drawing.Point(266, 90)
+        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(210, 30)
+        Me.LayoutItemOrderNumber.Size = New System.Drawing.Size(184, 30)
        Me.LayoutItemOrderNumber.Text = "Bestellnummer"
-        Me.LayoutItemOrderNumber.TextSize = New System.Drawing.Size(69, 13)
+        Me.LayoutItemOrderNumber.TextSize = New System.Drawing.Size(74, 13)
        '
        'LayoutControlItem6
        '
        Me.LayoutControlItem6.Control = Me.TextEdit5
-        Me.LayoutControlItem6.Location = New System.Drawing.Point(691, 0)
+        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(351, 30)
+        Me.LayoutControlItem6.Size = New System.Drawing.Size(464, 30)
        Me.LayoutControlItem6.Text = "Straße"
-        Me.LayoutControlItem6.TextSize = New System.Drawing.Size(69, 13)
+        Me.LayoutControlItem6.TextSize = New System.Drawing.Size(74, 13)
        '
        'LayoutControlItem9
        '
        Me.LayoutControlItem9.Control = Me.TextEdit8
-        Me.LayoutControlItem9.Location = New System.Drawing.Point(691, 60)
+        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(351, 30)
+        Me.LayoutControlItem9.Size = New System.Drawing.Size(464, 30)
        Me.LayoutControlItem9.Text = "PLZ"
-        Me.LayoutControlItem9.TextSize = New System.Drawing.Size(69, 13)
+        Me.LayoutControlItem9.TextSize = New System.Drawing.Size(74, 13)
        '
        'LayoutControlItem10
        '
        Me.LayoutControlItem10.Control = Me.TextEdit9
-        Me.LayoutControlItem10.Location = New System.Drawing.Point(691, 120)
+        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(351, 135)
+        Me.LayoutControlItem10.Size = New System.Drawing.Size(464, 135)
        Me.LayoutControlItem10.Text = "Kontakt"
-        Me.LayoutControlItem10.TextSize = New System.Drawing.Size(69, 13)
+        Me.LayoutControlItem10.TextSize = New System.Drawing.Size(74, 13)
        '
        'LayoutControlItem11
        '
        Me.LayoutControlItem11.Control = Me.txtBELEGKEY
-        Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 0)
+        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(266, 30)
+        Me.LayoutControlItem11.Size = New System.Drawing.Size(216, 30)
        Me.LayoutControlItem11.Text = "BELEGKEY"
-        Me.LayoutControlItem11.TextSize = New System.Drawing.Size(69, 13)
+        Me.LayoutControlItem11.TextSize = New System.Drawing.Size(74, 13)
        '
        'LayoutControlItemRunningNumber
        '
        Me.LayoutControlItemRunningNumber.Control = Me.txtRunningNumber
-        Me.LayoutControlItemRunningNumber.Location = New System.Drawing.Point(266, 0)
+        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(424, 30)
+        Me.LayoutControlItemRunningNumber.Size = New System.Drawing.Size(361, 30)
        Me.LayoutControlItemRunningNumber.Text = "Laufnummer"
-        Me.LayoutControlItemRunningNumber.TextSize = New System.Drawing.Size(69, 13)
+        Me.LayoutControlItemRunningNumber.TextSize = New System.Drawing.Size(74, 13)
        '
        'LayoutItemOrderDate
        '
        Me.LayoutItemOrderDate.Control = Me.dateOrderDate
-        Me.LayoutItemOrderDate.Location = New System.Drawing.Point(476, 90)
+        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(214, 30)
+        Me.LayoutItemOrderDate.Size = New System.Drawing.Size(183, 30)
        Me.LayoutItemOrderDate.Text = "Bestelldatum"
-        Me.LayoutItemOrderDate.TextSize = New System.Drawing.Size(69, 13)
+        Me.LayoutItemOrderDate.TextSize = New System.Drawing.Size(74, 13)
        '
        'LayoutControlItem8
        '
        Me.LayoutControlItem8.Control = Me.TextEdit7
-        Me.LayoutControlItem8.Location = New System.Drawing.Point(691, 90)
+        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(351, 30)
+        Me.LayoutControlItem8.Size = New System.Drawing.Size(464, 30)
        Me.LayoutControlItem8.Text = "Ort"
-        Me.LayoutControlItem8.TextSize = New System.Drawing.Size(69, 13)
+        Me.LayoutControlItem8.TextSize = New System.Drawing.Size(74, 13)
        '
        'LayoutControlItem7
        '
        Me.LayoutControlItem7.Control = Me.TextEdit6
-        Me.LayoutControlItem7.Location = New System.Drawing.Point(691, 30)
+        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(351, 30)
+        Me.LayoutControlItem7.Size = New System.Drawing.Size(464, 30)
        Me.LayoutControlItem7.Text = "Hausnummer"
-        Me.LayoutControlItem7.TextSize = New System.Drawing.Size(69, 13)
+        Me.LayoutControlItem7.TextSize = New System.Drawing.Size(74, 13)
        '
        'LayoutControlItem1
        '
@@ -567,26 +660,36 @@ 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(690, 30)
+        Me.LayoutControlItem1.Size = New System.Drawing.Size(361, 30)
        Me.LayoutControlItem1.Text = "Mandant"
-        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(69, 13)
+        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(74, 13)
        '
        'SimpleSeparator1
        '
        Me.SimpleSeparator1.AllowHotTrack = False
-        Me.SimpleSeparator1.Location = New System.Drawing.Point(690, 0)
+        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)
+        '
        'LayoutControlItem5
        '
        Me.LayoutControlItem5.Control = Me.cmbCustomer
        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(690, 30)
+        Me.LayoutControlItem5.Size = New System.Drawing.Size(577, 30)
        Me.LayoutControlItem5.Text = "Kunde"
-        Me.LayoutControlItem5.TextSize = New System.Drawing.Size(69, 13)
+        Me.LayoutControlItem5.TextSize = New System.Drawing.Size(74, 13)
        '
        'GridControlPositions
        '
@@ -633,6 +736,26 @@ 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!)
@@ -670,6 +793,8 @@ Partial Class frmMain
        CType(Me.SearchLookUpEdit1View, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.cmbCustomer.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.cmbDeliveryAddress.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutItemOrderIssuer, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
@@ -684,11 +809,14 @@ Partial Class frmMain
        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.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()

@@ -748,4 +876,16 @@ Partial Class frmMain
    Friend WithEvents cmbCustomer As DevExpress.XtraEditors.SearchLookUpEdit
    Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView
    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
+    Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents BarButtonItem7 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents colSelected As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents cmbYears As DevExpress.XtraEditors.ComboBoxEdit
+    Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem
 End Class