Handlingsabsrechnung, Spednich, etc.

SDL/Fakturierung/frmAbrechnungHandling.Designer.vb

@@ -27,6 +27,7 @@
         Me.Button2 = New System.Windows.Forms.Button()
         Me.dgvHandling = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.btnPreisliste = New System.Windows.Forms.Button()
+        Me.cbxDivers = New System.Windows.Forms.CheckBox()
         CType(Me.dgvHandling, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -82,11 +83,23 @@
         Me.btnPreisliste.Text = "Preisliste"
         Me.btnPreisliste.UseVisualStyleBackColor = True
         '
+        'cbxDivers
+        '
+        Me.cbxDivers.AutoSize = True
+        Me.cbxDivers.Location = New System.Drawing.Point(134, 421)
+        Me.cbxDivers.Name = "cbxDivers"
+        Me.cbxDivers.Size = New System.Drawing.Size(81, 17)
+        Me.cbxDivers.TabIndex = 5
+        Me.cbxDivers.Text = "CheckBox1"
+        Me.cbxDivers.UseVisualStyleBackColor = True
+        Me.cbxDivers.Visible = False
+        '
         'frmAbrechnungHandling
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.Controls.Add(Me.cbxDivers)
         Me.Controls.Add(Me.btnPreisliste)
         Me.Controls.Add(Me.dgvHandling)
         Me.Controls.Add(Me.Button2)
@@ -97,6 +110,7 @@
         Me.Text = "Handling"
         CType(Me.dgvHandling, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
+        Me.PerformLayout()
 
     End Sub
 
@@ -104,4 +118,5 @@
     Friend WithEvents Button2 As Button
     Friend WithEvents dgvHandling As VERAG_PROG_ALLGEMEIN.MyDatagridview
     Friend WithEvents btnPreisliste As Button
+    Friend WithEvents cbxDivers As CheckBox
 End Class

SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb

@@ -23,12 +23,12 @@ Partial Class usrCntlSpeditionsBuchSuche
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlSpeditionsBuchSuche))
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.cntxtCntxtSpeditionsbuch = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -48,6 +48,10 @@ Partial Class usrCntlSpeditionsBuchSuche
         Me.lblAbfertigungsarten = New System.Windows.Forms.Label()
         Me.Label17 = New System.Windows.Forms.Label()
         Me.pnlAnzeige = New System.Windows.Forms.Panel()
+        Me.btnHandling = New System.Windows.Forms.Button()
+        Me.cboHandlingssatz = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboHandlingssatz_AMBAR = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.btnHandling_AMBAR = New System.Windows.Forms.Button()
         Me.txtFiskalEndempfaenger = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.DataGridView = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.dgvLKW = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
@@ -76,11 +80,6 @@ Partial Class usrCntlSpeditionsBuchSuche
         Me.btnSpedBuchEinnahmen = New System.Windows.Forms.Button()
         Me.pnlBerichte = New System.Windows.Forms.Panel()
         Me.CheckBox5 = New System.Windows.Forms.CheckBox()
-        Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
-        Me.btnHandling = New System.Windows.Forms.Button()
-        Me.cboHandlingssatz = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.btnHandling_AMBAR = New System.Windows.Forms.Button()
-        Me.cboHandlingssatz_AMBAR = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cbxHandlingAbrechnen = New System.Windows.Forms.CheckBox()
         Me.cbxDetailbericht = New System.Windows.Forms.CheckBox()
         Me.Button24 = New System.Windows.Forms.Button()
@@ -218,6 +217,8 @@ Partial Class usrCntlSpeditionsBuchSuche
         Me.Label45 = New System.Windows.Forms.Label()
         Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.SplitContainer = New System.Windows.Forms.SplitContainer()
+        Me.pnlHandling = New System.Windows.Forms.Panel()
+        Me.pnlHandlingAmbar = New System.Windows.Forms.Panel()
         Me.cntxtCntxtSpeditionsbuch.SuspendLayout()
         Me.pnlRechts.SuspendLayout()
         Me.pnlAnzeige.SuspendLayout()
@@ -227,7 +228,6 @@ Partial Class usrCntlSpeditionsBuchSuche
         Me.Panel3.SuspendLayout()
         Me.Panel1.SuspendLayout()
         Me.pnlBerichte.SuspendLayout()
-        Me.FlowLayoutPanel1.SuspendLayout()
         Me.MenuStrip1.SuspendLayout()
         Me.pnl.SuspendLayout()
         Me.MenuStrip2.SuspendLayout()
@@ -243,6 +243,8 @@ Partial Class usrCntlSpeditionsBuchSuche
         Me.SplitContainer.Panel1.SuspendLayout()
         Me.SplitContainer.Panel2.SuspendLayout()
         Me.SplitContainer.SuspendLayout()
+        Me.pnlHandling.SuspendLayout()
+        Me.pnlHandlingAmbar.SuspendLayout()
         Me.SuspendLayout()
         '
         'TabPage1
@@ -428,6 +430,59 @@ Partial Class usrCntlSpeditionsBuchSuche
         Me.pnlAnzeige.Size = New System.Drawing.Size(1239, 452)
         Me.pnlAnzeige.TabIndex = 0
         '
+        'btnHandling
+        '
+        Me.btnHandling.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnHandling.Image = Global.SDL.My.Resources.Resources.statistik_small
+        Me.btnHandling.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnHandling.Location = New System.Drawing.Point(1, 2)
+        Me.btnHandling.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnHandling.Name = "btnHandling"
+        Me.btnHandling.Size = New System.Drawing.Size(159, 28)
+        Me.btnHandling.TabIndex = 59
+        Me.btnHandling.Text = "Handling an Außenstellen"
+        Me.btnHandling.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnHandling.UseVisualStyleBackColor = True
+        '
+        'cboHandlingssatz
+        '
+        Me.cboHandlingssatz._allowedValuesFreiText = Nothing
+        Me.cboHandlingssatz._allowFreiText = False
+        Me.cboHandlingssatz._value = ""
+        Me.cboHandlingssatz.DropDownWidth = 300
+        Me.cboHandlingssatz.FormattingEnabled = True
+        Me.cboHandlingssatz.Location = New System.Drawing.Point(1, 32)
+        Me.cboHandlingssatz.Name = "cboHandlingssatz"
+        Me.cboHandlingssatz.Size = New System.Drawing.Size(159, 21)
+        Me.cboHandlingssatz.TabIndex = 60
+        '
+        'cboHandlingssatz_AMBAR
+        '
+        Me.cboHandlingssatz_AMBAR._allowedValuesFreiText = Nothing
+        Me.cboHandlingssatz_AMBAR._allowFreiText = False
+        Me.cboHandlingssatz_AMBAR._value = ""
+        Me.cboHandlingssatz_AMBAR.DropDownWidth = 250
+        Me.cboHandlingssatz_AMBAR.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboHandlingssatz_AMBAR.FormattingEnabled = True
+        Me.cboHandlingssatz_AMBAR.Location = New System.Drawing.Point(10, 38)
+        Me.cboHandlingssatz_AMBAR.Name = "cboHandlingssatz_AMBAR"
+        Me.cboHandlingssatz_AMBAR.Size = New System.Drawing.Size(128, 22)
+        Me.cboHandlingssatz_AMBAR.TabIndex = 53
+        '
+        'btnHandling_AMBAR
+        '
+        Me.btnHandling_AMBAR.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnHandling_AMBAR.Image = Global.SDL.My.Resources.Resources.statistik_small
+        Me.btnHandling_AMBAR.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnHandling_AMBAR.Location = New System.Drawing.Point(10, 9)
+        Me.btnHandling_AMBAR.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnHandling_AMBAR.Name = "btnHandling_AMBAR"
+        Me.btnHandling_AMBAR.Size = New System.Drawing.Size(128, 28)
+        Me.btnHandling_AMBAR.TabIndex = 94
+        Me.btnHandling_AMBAR.Text = "Handling (AMBAR)"
+        Me.btnHandling_AMBAR.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnHandling_AMBAR.UseVisualStyleBackColor = True
+        '
         'txtFiskalEndempfaenger
         '
         Me.txtFiskalEndempfaenger._DateTimeOnly = False
@@ -462,35 +517,35 @@ Partial Class usrCntlSpeditionsBuchSuche
         Me.DataGridView.AllowUserToDeleteRows = False
         Me.DataGridView.AllowUserToOrderColumns = True
         Me.DataGridView.AllowUserToResizeRows = False
-        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
         Me.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.DataGridView.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch
-        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle5
         Me.DataGridView.Dock = System.Windows.Forms.DockStyle.Fill
         Me.DataGridView.Location = New System.Drawing.Point(450, 0)
         Me.DataGridView.Name = "DataGridView"
-        DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle9
+        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
         Me.DataGridView.Size = New System.Drawing.Size(789, 262)
         Me.DataGridView.TabIndex = 0
         '
@@ -502,35 +557,35 @@ Partial Class usrCntlSpeditionsBuchSuche
         Me.dgvLKW.AllowUserToOrderColumns = True
         Me.dgvLKW.AllowUserToResizeRows = False
         Me.dgvLKW.BackgroundColor = System.Drawing.Color.WhiteSmoke
-        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7
         Me.dgvLKW.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvLKW.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch
-        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle8
         Me.dgvLKW.Dock = System.Windows.Forms.DockStyle.Left
         Me.dgvLKW.Location = New System.Drawing.Point(0, 0)
         Me.dgvLKW.Name = "dgvLKW"
-        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle9
         Me.dgvLKW.Size = New System.Drawing.Size(450, 262)
         Me.dgvLKW.TabIndex = 35
         Me.dgvLKW.Visible = False
@@ -851,8 +906,9 @@ Partial Class usrCntlSpeditionsBuchSuche
         '
         Me.pnlBerichte.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.pnlBerichte.Controls.Add(Me.pnlHandlingAmbar)
+        Me.pnlBerichte.Controls.Add(Me.pnlHandling)
         Me.pnlBerichte.Controls.Add(Me.CheckBox5)
-        Me.pnlBerichte.Controls.Add(Me.FlowLayoutPanel1)
         Me.pnlBerichte.Controls.Add(Me.cbxHandlingAbrechnen)
         Me.pnlBerichte.Controls.Add(Me.cbxDetailbericht)
         Me.pnlBerichte.Controls.Add(Me.Button24)
@@ -890,76 +946,12 @@ Partial Class usrCntlSpeditionsBuchSuche
         Me.CheckBox5.Text = "mit DL-Kosten"
         Me.CheckBox5.UseVisualStyleBackColor = False
         '
-        'FlowLayoutPanel1
-        '
-        Me.FlowLayoutPanel1.Controls.Add(Me.btnHandling)
-        Me.FlowLayoutPanel1.Controls.Add(Me.cboHandlingssatz)
-        Me.FlowLayoutPanel1.Controls.Add(Me.btnHandling_AMBAR)
-        Me.FlowLayoutPanel1.Controls.Add(Me.cboHandlingssatz_AMBAR)
-        Me.FlowLayoutPanel1.Location = New System.Drawing.Point(3, 123)
-        Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
-        Me.FlowLayoutPanel1.Size = New System.Drawing.Size(319, 60)
-        Me.FlowLayoutPanel1.TabIndex = 97
-        '
-        'btnHandling
-        '
-        Me.btnHandling.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnHandling.Image = Global.SDL.My.Resources.Resources.statistik_small
-        Me.btnHandling.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnHandling.Location = New System.Drawing.Point(0, 0)
-        Me.btnHandling.Margin = New System.Windows.Forms.Padding(0)
-        Me.btnHandling.Name = "btnHandling"
-        Me.btnHandling.Size = New System.Drawing.Size(159, 28)
-        Me.btnHandling.TabIndex = 59
-        Me.btnHandling.Text = "Handling an Außenstellen"
-        Me.btnHandling.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnHandling.UseVisualStyleBackColor = True
-        '
-        'cboHandlingssatz
-        '
-        Me.cboHandlingssatz._allowedValuesFreiText = Nothing
-        Me.cboHandlingssatz._allowFreiText = False
-        Me.cboHandlingssatz._value = ""
-        Me.cboHandlingssatz.DropDownWidth = 300
-        Me.cboHandlingssatz.FormattingEnabled = True
-        Me.cboHandlingssatz.Location = New System.Drawing.Point(3, 31)
-        Me.cboHandlingssatz.Name = "cboHandlingssatz"
-        Me.cboHandlingssatz.Size = New System.Drawing.Size(159, 21)
-        Me.cboHandlingssatz.TabIndex = 60
-        '
-        'btnHandling_AMBAR
-        '
-        Me.btnHandling_AMBAR.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnHandling_AMBAR.Image = Global.SDL.My.Resources.Resources.statistik_small
-        Me.btnHandling_AMBAR.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnHandling_AMBAR.Location = New System.Drawing.Point(165, 28)
-        Me.btnHandling_AMBAR.Margin = New System.Windows.Forms.Padding(0)
-        Me.btnHandling_AMBAR.Name = "btnHandling_AMBAR"
-        Me.btnHandling_AMBAR.Size = New System.Drawing.Size(128, 28)
-        Me.btnHandling_AMBAR.TabIndex = 94
-        Me.btnHandling_AMBAR.Text = "Handling (AMBAR)"
-        Me.btnHandling_AMBAR.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnHandling_AMBAR.UseVisualStyleBackColor = True
-        '
-        'cboHandlingssatz_AMBAR
-        '
-        Me.cboHandlingssatz_AMBAR._allowedValuesFreiText = Nothing
-        Me.cboHandlingssatz_AMBAR._allowFreiText = False
-        Me.cboHandlingssatz_AMBAR._value = ""
-        Me.cboHandlingssatz_AMBAR.DropDownWidth = 250
-        Me.cboHandlingssatz_AMBAR.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboHandlingssatz_AMBAR.FormattingEnabled = True
-        Me.cboHandlingssatz_AMBAR.Location = New System.Drawing.Point(3, 59)
-        Me.cboHandlingssatz_AMBAR.Name = "cboHandlingssatz_AMBAR"
-        Me.cboHandlingssatz_AMBAR.Size = New System.Drawing.Size(128, 22)
-        Me.cboHandlingssatz_AMBAR.TabIndex = 53
-        '
         'cbxHandlingAbrechnen
         '
         Me.cbxHandlingAbrechnen.AutoSize = True
         Me.cbxHandlingAbrechnen.BackColor = System.Drawing.Color.WhiteSmoke
         Me.cbxHandlingAbrechnen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxHandlingAbrechnen.Location = New System.Drawing.Point(4, 107)
+        Me.cbxHandlingAbrechnen.Location = New System.Drawing.Point(4, 102)
         Me.cbxHandlingAbrechnen.Name = "cbxHandlingAbrechnen"
         Me.cbxHandlingAbrechnen.Size = New System.Drawing.Size(140, 17)
         Me.cbxHandlingAbrechnen.TabIndex = 96
@@ -3017,6 +3009,25 @@ Partial Class usrCntlSpeditionsBuchSuche
         Me.SplitContainer.SplitterWidth = 2
         Me.SplitContainer.TabIndex = 3
         '
+        'pnlHandling
+        '
+        Me.pnlHandling.Controls.Add(Me.cboHandlingssatz)
+        Me.pnlHandling.Controls.Add(Me.btnHandling)
+        Me.pnlHandling.Location = New System.Drawing.Point(3, 126)
+        Me.pnlHandling.Name = "pnlHandling"
+        Me.pnlHandling.Size = New System.Drawing.Size(163, 58)
+        Me.pnlHandling.TabIndex = 99
+        '
+        'pnlHandlingAmbar
+        '
+        Me.pnlHandlingAmbar.Controls.Add(Me.cboHandlingssatz_AMBAR)
+        Me.pnlHandlingAmbar.Controls.Add(Me.btnHandling_AMBAR)
+        Me.pnlHandlingAmbar.Location = New System.Drawing.Point(3, 122)
+        Me.pnlHandlingAmbar.Name = "pnlHandlingAmbar"
+        Me.pnlHandlingAmbar.Size = New System.Drawing.Size(159, 62)
+        Me.pnlHandlingAmbar.TabIndex = 36
+        Me.pnlHandlingAmbar.Visible = False
+        '
         'usrCntlSpeditionsBuchSuche
         '
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
@@ -3040,7 +3051,6 @@ Partial Class usrCntlSpeditionsBuchSuche
         Me.Panel1.PerformLayout()
         Me.pnlBerichte.ResumeLayout(False)
         Me.pnlBerichte.PerformLayout()
-        Me.FlowLayoutPanel1.ResumeLayout(False)
         Me.MenuStrip1.ResumeLayout(False)
         Me.MenuStrip1.PerformLayout()
         Me.pnl.ResumeLayout(False)
@@ -3063,6 +3073,8 @@ Partial Class usrCntlSpeditionsBuchSuche
         Me.SplitContainer.Panel2.ResumeLayout(False)
         CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SplitContainer.ResumeLayout(False)
+        Me.pnlHandling.ResumeLayout(False)
+        Me.pnlHandlingAmbar.ResumeLayout(False)
         Me.ResumeLayout(False)
 
     End Sub
@@ -3250,8 +3262,9 @@ Partial Class usrCntlSpeditionsBuchSuche
     Friend WithEvents cbxfehlZahlung_AVISOID As CheckBox
     Friend WithEvents cbxfehlZahlung_SENDUNG As CheckBox
     Friend WithEvents cbxHandlingAbrechnen As CheckBox
-    Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
     Friend WithEvents CheckBox5 As CheckBox
     Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem
     Friend WithEvents btnnachLeistungsNr As Button
+    Friend WithEvents pnlHandling As Panel
+    Friend WithEvents pnlHandlingAmbar As Panel
 End Class

SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx

@@ -129,9 +129,6 @@
   <metadata name="MenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>546, 17</value>
   </metadata>
-  <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>431, 17</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="ToolStripMenuItem3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb

@@ -582,11 +582,9 @@ Public Class usrCntlSpeditionsBuchSuche
             For Each p In pnlBerichte.Controls
                 p.Visible = False
             Next
-            btnHandling_AMBAR.Visible = True
-            cboHandlingssatz_AMBAR.Visible = True
-
-            btnHandling.Visible = False
-            cboHandlingssatz.Visible = False
+            cbxHandlingAbrechnen.Visible = True
+            pnlHandling.Visible = False
+            pnlHandlingAmbar.Visible = True
 
         End If
 
@@ -2930,10 +2928,9 @@ Public Class usrCntlSpeditionsBuchSuche
 
         If cbxHandlingAbrechnen.Checked Then
 
-            Select Case lstFiliale.SelectedItems.Count
-                Case 0 : MsgBox("Es muss mind. eine Filiale ausgewählt werden!") : Exit Sub
-
-            End Select
+            'Select Case lstFiliale.SelectedItems.Count
+            '    Case 0 : MsgBox("Es muss mind. eine Filiale ausgewählt werden!") : Exit Sub
+            'End Select
 
             createHandlingAbrechnung(dtAbrechnung, cboHandlingssatz_AMBAR._value, cboHandlingssatz_AMBAR._value, CDate(txtAbfertDat.Text), CDate(txtAbfertDatBis.Text), anhang_path, HandlingList)
         End If
@@ -2978,6 +2975,16 @@ Public Class usrCntlSpeditionsBuchSuche
 
                 If frm.ShowDialog() = DialogResult.OK Then
                     Dim kdNr As Integer = -1
+                    If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
+                        Select Case anFirma.Trim()
+                            Case "UNISPED" : kdNr = 3013303
+                            Case "IMEX" : kdNr = 3011904
+                            Case "VERAG" : kdNr = 3013401
+                            Case Else
+                                MsgBox("falscher Kunde!")
+                                Return False
+                        End Select
+                    Else
                         Select Case anFirma.Trim()
                             Case "UNISPED" : kdNr = 704028
                             Case "IMEX" : kdNr = 550574
@@ -2987,6 +2994,9 @@ Public Class usrCntlSpeditionsBuchSuche
                                 Return False
                         End Select
 
+                    End If
+
+
                     Dim counter = 0
 
 

SDL/USTV/frmMDM_USTVAntrag.Designer.vb

@@ -27,6 +27,8 @@ Partial Class frmMDM_USTVAntrag
         Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.pnlBottom = New System.Windows.Forms.Panel()
+        Me.lblVZAenderungsdatum = New System.Windows.Forms.Label()
+        Me.Label20 = New System.Windows.Forms.Label()
         Me.pbXMLExport = New System.Windows.Forms.PictureBox()
         Me.btnRMCQuartal = New System.Windows.Forms.Button()
         Me.Label18 = New System.Windows.Forms.Label()
@@ -122,7 +124,6 @@ Partial Class frmMDM_USTVAntrag
         Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.pnlAntragsPosDetails = New System.Windows.Forms.Panel()
         Me.Panel2 = New System.Windows.Forms.Panel()
-        Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
         Me.Panel4 = New System.Windows.Forms.Panel()
         Me.cbxKIUploaddelete = New System.Windows.Forms.CheckBox()
         Me.scanUSTVA = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
@@ -133,7 +134,6 @@ Partial Class frmMDM_USTVAntrag
         Me.Panel3 = New System.Windows.Forms.Panel()
         Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.pnlErstattungsdetails = New System.Windows.Forms.Panel()
-        Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Button3 = New System.Windows.Forms.Button()
@@ -150,6 +150,8 @@ Partial Class frmMDM_USTVAntrag
         Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
         Me.FakturiertToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
+        Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
         Me.pnlBottom.SuspendLayout()
         CType(Me.pbXMLExport, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.pbMail, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -182,6 +184,8 @@ Partial Class frmMDM_USTVAntrag
         '
         Me.pnlBottom.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
         Me.pnlBottom.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnlBottom.Controls.Add(Me.lblVZAenderungsdatum)
+        Me.pnlBottom.Controls.Add(Me.Label20)
         Me.pnlBottom.Controls.Add(Me.pbXMLExport)
         Me.pnlBottom.Controls.Add(Me.btnRMCQuartal)
         Me.pnlBottom.Controls.Add(Me.Label18)
@@ -200,11 +204,31 @@ Partial Class frmMDM_USTVAntrag
         Me.pnlBottom.Controls.Add(Me.Button1)
         Me.pnlBottom.Controls.Add(Me.lbl_EintrageVerarbetiet)
         Me.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.pnlBottom.Location = New System.Drawing.Point(0, 667)
+        Me.pnlBottom.Location = New System.Drawing.Point(0, 663)
         Me.pnlBottom.Name = "pnlBottom"
         Me.pnlBottom.Size = New System.Drawing.Size(1444, 100)
         Me.pnlBottom.TabIndex = 3
         '
+        'lblVZAenderungsdatum
+        '
+        Me.lblVZAenderungsdatum.ForeColor = System.Drawing.Color.Black
+        Me.lblVZAenderungsdatum.Location = New System.Drawing.Point(304, 67)
+        Me.lblVZAenderungsdatum.Name = "lblVZAenderungsdatum"
+        Me.lblVZAenderungsdatum.Size = New System.Drawing.Size(224, 19)
+        Me.lblVZAenderungsdatum.TabIndex = 58
+        Me.lblVZAenderungsdatum.Text = "-"
+        Me.lblVZAenderungsdatum.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
+        'Label20
+        '
+        Me.Label20.ForeColor = System.Drawing.Color.Black
+        Me.Label20.Location = New System.Drawing.Point(186, 67)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(112, 19)
+        Me.Label20.TabIndex = 57
+        Me.Label20.Text = "VZ-Änderungsdatum:"
+        Me.Label20.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
         'pbXMLExport
         '
         Me.pbXMLExport.Image = Global.SDL.My.Resources.Resources.xml
@@ -1602,7 +1626,7 @@ Partial Class frmMDM_USTVAntrag
         Me.pnlBody.Controls.Add(Me.TabControl1)
         Me.pnlBody.Location = New System.Drawing.Point(0, 230)
         Me.pnlBody.Name = "pnlBody"
-        Me.pnlBody.Size = New System.Drawing.Size(1444, 437)
+        Me.pnlBody.Size = New System.Drawing.Size(1444, 433)
         Me.pnlBody.TabIndex = 1
         '
         'TabControl1
@@ -1613,7 +1637,7 @@ Partial Class frmMDM_USTVAntrag
         Me.TabControl1.Location = New System.Drawing.Point(0, 0)
         Me.TabControl1.Name = "TabControl1"
         Me.TabControl1.SelectedIndex = 0
-        Me.TabControl1.Size = New System.Drawing.Size(1442, 435)
+        Me.TabControl1.Size = New System.Drawing.Size(1442, 431)
         Me.TabControl1.TabIndex = 1
         '
         'TabPage1
@@ -1623,7 +1647,7 @@ Partial Class frmMDM_USTVAntrag
         Me.TabPage1.Location = New System.Drawing.Point(4, 22)
         Me.TabPage1.Name = "TabPage1"
         Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(1434, 409)
+        Me.TabPage1.Size = New System.Drawing.Size(1434, 405)
         Me.TabPage1.TabIndex = 0
         Me.TabPage1.Text = "Antragspositionen"
         Me.TabPage1.UseVisualStyleBackColor = True
@@ -1646,14 +1670,14 @@ Partial Class frmMDM_USTVAntrag
         Me.dgvUSTVPositionen.RowHeadersVisible = False
         Me.dgvUSTVPositionen.RowHeadersWidth = 62
         Me.dgvUSTVPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1428, 134)
+        Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1428, 130)
         Me.dgvUSTVPositionen.TabIndex = 0
         '
         'pnlAntragsPosDetails
         '
         Me.pnlAntragsPosDetails.Controls.Add(Me.Panel2)
         Me.pnlAntragsPosDetails.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.pnlAntragsPosDetails.Location = New System.Drawing.Point(3, 143)
+        Me.pnlAntragsPosDetails.Location = New System.Drawing.Point(3, 139)
         Me.pnlAntragsPosDetails.Name = "pnlAntragsPosDetails"
         Me.pnlAntragsPosDetails.Size = New System.Drawing.Size(1428, 263)
         Me.pnlAntragsPosDetails.TabIndex = 2
@@ -1670,14 +1694,6 @@ Partial Class frmMDM_USTVAntrag
         Me.Panel2.Size = New System.Drawing.Size(1428, 263)
         Me.Panel2.TabIndex = 1
         '
-        'UstCntlUSTV_AntragPosition1
-        '
-        Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0)
-        Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
-        Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1272, 261)
-        Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
-        '
         'Panel4
         '
         Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke
@@ -1823,14 +1839,6 @@ Partial Class frmMDM_USTVAntrag
         Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1426, 261)
         Me.pnlErstattungsdetails.TabIndex = 0
         '
-        'UstCntlUSTV_AntragErstattungen1
-        '
-        Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0)
-        Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1"
-        Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1270, 259)
-        Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
-        '
         'Panel1
         '
         Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke
@@ -1902,13 +1910,13 @@ Partial Class frmMDM_USTVAntrag
         'AktivierenToolStripMenuItem
         '
         Me.AktivierenToolStripMenuItem.Name = "AktivierenToolStripMenuItem"
-        Me.AktivierenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.AktivierenToolStripMenuItem.Size = New System.Drawing.Size(138, 22)
         Me.AktivierenToolStripMenuItem.Text = "aktivieren"
         '
         'DeaktivierenToolStripMenuItem
         '
         Me.DeaktivierenToolStripMenuItem.Name = "DeaktivierenToolStripMenuItem"
-        Me.DeaktivierenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.DeaktivierenToolStripMenuItem.Size = New System.Drawing.Size(138, 22)
         Me.DeaktivierenToolStripMenuItem.Text = "deaktivieren"
         '
         'FakturiertZurücksetzenToolStripMenuItem
@@ -1921,7 +1929,7 @@ Partial Class frmMDM_USTVAntrag
         '
         Me.ncs_Belege.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.FakturiertToolStripMenuItem})
         Me.ncs_Belege.Name = "cns_vorauszahlen"
-        Me.ncs_Belege.Size = New System.Drawing.Size(196, 70)
+        Me.ncs_Belege.Size = New System.Drawing.Size(196, 48)
         '
         'ToolStripMenuItem1
         '
@@ -1949,11 +1957,27 @@ Partial Class frmMDM_USTVAntrag
         Me.FakturiertToolStripMenuItem.Text = "Fakturiert zurücksetzen"
         Me.FakturiertToolStripMenuItem.Visible = False
         '
+        'UstCntlUSTV_AntragPosition1
+        '
+        Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0)
+        Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
+        Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1272, 261)
+        Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
+        '
+        'UstCntlUSTV_AntragErstattungen1
+        '
+        Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0)
+        Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1"
+        Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1270, 259)
+        Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
+        '
         'frmMDM_USTVAntrag
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1444, 767)
+        Me.ClientSize = New System.Drawing.Size(1444, 763)
         Me.Controls.Add(Me.pnlHeader)
         Me.Controls.Add(Me.pnlBody)
         Me.Controls.Add(Me.pnlBottom)
@@ -2123,4 +2147,6 @@ Partial Class frmMDM_USTVAntrag
     Friend WithEvents btnSortNachLeist As Button
     Friend WithEvents txtVZOffen As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents Label19 As Label
+    Friend WithEvents lblVZAenderungsdatum As Label
+    Friend WithEvents Label20 As Label
 End Class

SDL/USTV/frmMDM_USTVAntrag.vb

@@ -60,14 +60,14 @@ Public Class frmMDM_USTVAntrag
         lblGesamtUSteuer.Text="-"
         lblGesamtErstattung.Text = "-"
         lblDiffernezbetrag.Text = "-"
+        lblVZAenderungsdatum.Text = "-"
 
         btnAntrageeinarbeiten.Enabled = Not UStVAn_ID <= 0
         FlowLayoutPanel.Enabled= Not UStVAn_ID <= 0
         btnEintragloeschen.Enabled= Not UStVAn_ID <= 0
         btnNeuerEintrag.Enabled= Not UStVAn_ID <= 0
         UstCntlUSTV_AntragPosition1.Enabled= Not UStVAn_ID <= 0
-        cbxLand.Visible= UStVAn_ID <= 0
-
+        cbxLand.Visible = UStVAn_ID <= 0
 
         With dgvUSTVPositionen
             .ClearSelection()
@@ -289,6 +289,17 @@ Public Class frmMDM_USTVAntrag
             Antrag_LandKz = SQL.DLookup("LandKz", "[Länderverzeichnis für die Außenhandelsstatistik]", "Landnr='" & USTV_ANTRAG.UStVAn_LandNr & "'", "FMZOLL")
             setValue(USTV_ANTRAG)
 
+
+            If USTV_ANTRAG.UStVAn_letzteAenderung IsNot Nothing AndAlso Not IsDBNull(USTV_ANTRAG.UStVAn_letzteAenderung) Then
+                lblVZAenderungsdatum.Text = CDate(USTV_ANTRAG.UStVAn_letzteAenderung).ToString
+            End If
+
+            If USTV_ANTRAG.UStVAn_letzteAenderungUser IsNot Nothing AndAlso Not IsDBNull(USTV_ANTRAG.UStVAn_letzteAenderungUser) Then
+                lblVZAenderungsdatum.Text &= "(" & USTV_ANTRAG.UStVAn_letzteAenderungUser & ")"
+            End If
+
+
+
             Dim KUNDE As New cKunde(USTV_ANTRAG.UStVAn_KuNr)
                 Dim KUNDE_ERW As New cKundenErweitert(USTV_ANTRAG.UStVAn_KuNr)
                 If KUNDE IsNot Nothing Then
@@ -3401,6 +3412,11 @@ Public Class frmMDM_USTVAntrag
                 .Columns("Berufungshöhe").HeaderText = "BE-Höhe"
                 .Columns("Berufungsgrund").HeaderText = "BE-Grund"
 
+
+                .Columns("Berufungsdatum").Visible = False
+                .Columns("Berufungshöhe").Visible = False
+                .Columns("Berufungsgrund").Visible = False
+
                 .Columns("UStVEr_VZ").HeaderText = "VZ"
                 .Columns("UStVEr_RZVZ").HeaderText = "RZVZ"
                 .Columns("UStVEr_Bank").HeaderText = "Bank"
@@ -3870,7 +3886,7 @@ Public Class frmMDM_USTVAntrag
 
                 Next
 
-                If setUSTVA Then SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 1, UStVAn_letzteAenderung = getDate(), UStVAn_letzteAenderung_User = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & "' WHERE [UStVAn_ID] IN (SELECT distinct([UStVAn_ID]) FROM [tblUStVPositionen] WHERE isnull([UStVPo_VZ],0) = 1 and isnull([UStVPo_VZ_RKID],0) = 0)", "FMZOLL") 'Aktualisierung
+                If setUSTVA Then SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 1, UStVAn_letzteAenderung = getDate(), UStVAn_letzteAenderungUser = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & "' WHERE [UStVAn_ID] IN (SELECT distinct([UStVAn_ID]) FROM [tblUStVPositionen] WHERE isnull([UStVPo_VZ],0) = 1 and isnull([UStVPo_VZ_RKID],0) = 0)", "FMZOLL") 'Aktualisierung
 
                 init()
             End If
@@ -3906,7 +3922,7 @@ Public Class frmMDM_USTVAntrag
                 Dim count_nichtAbgerVZ As Integer = -1
                 count_nichtAbgerVZ = CInt(SQL.getValueTxtBySql("SELECT COUNT(*) FROM [tblUStVPositionen] WHERE [UStVAn_ID] = " & USTV_ANTRAG.UStVAn_ID & "  and  [UStVPo_VZ] = 1 and isnull(UStVPo_VZ_RKID,0) = 0", "FMZOLL"))
                 If count_nichtAbgerVZ = 0 Then
-                    SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 0, UStVAn_letzteAenderung = getDate(), UStVAn_letzteAenderung_User = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & "' WHERE [UStVAn_ID] =" & USTV_ANTRAG.UStVAn_ID, "FMZOLL")
+                    SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 0, UStVAn_letzteAenderung = getDate(), UStVAn_letzteAenderungUser = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & "' WHERE [UStVAn_ID] =" & USTV_ANTRAG.UStVAn_ID, "FMZOLL")
                 End If
 
                 init()
@@ -4000,7 +4016,7 @@ Public Class frmMDM_USTVAntrag
 
                 Next
 
-                SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 1, UStVAn_letzteAenderung = getDate(), UStVAn_letzteAenderung_User = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & "' WHERE [UStVAn_ID] IN (SELECT distinct([UStVAn_ID]) FROM [tblUStVPositionen] WHERE isnull([UStVPo_VZ],0) = 1 and isnull([UStVPo_VZ_RKID],0) = 0)", "FMZOLL") 'Aktualisierung
+                SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 1, UStVAn_letzteAenderung = getDate(), UStVAn_letzteAenderungUser = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & "' WHERE [UStVAn_ID] IN (SELECT distinct([UStVAn_ID]) FROM [tblUStVPositionen] WHERE isnull([UStVPo_VZ],0) = 1 and isnull([UStVPo_VZ_RKID],0) = 0)", "FMZOLL") 'Aktualisierung
 
                 init()
             End If

SDL/USTV/usrCntlUSTV.vb

@@ -2065,7 +2065,8 @@ Public Class usrCntlUSTV
                             .btnPreisliste.Visible = False
                             .dgvHandling.RowHeadersVisible = False
                             .Button2.Text = "Importieren"
-
+                            .cbxDivers.Visible = True
+                            .cbxDivers.Text = "VZ und RZ-Beträge im Antrag erhöhen"
                         End With
 
                         frm.ShowDialog()
@@ -2073,20 +2074,22 @@ Public Class usrCntlUSTV
                         If frm.DialogResult = DialogResult.OK Then
 
 
-                                For Each r As DataRow In dt.Rows
+                            For Each r As DataGridViewRow In frm.dgvHandling.SelectedRows
 
-                                    Dim BelegNr = r.Item("BelegNr")
-                                    Dim USTV_ANTRAG = New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(r.Item("AntragID"))
+                                Dim BelegNr = r.Cells("BelegNr").Value
+                                Dim USTV_ANTRAG = New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(r.Cells("AntragID").Value)
 
                                 If USTV_ANTRAG.hasEntry Then
 
-                                    If r.Item("3470").ToString.ToLower = "ja" Then
+                                    If r.Cells("3470").Value.ToString.ToLower = "ja" Then
                                         USTV_ANTRAG.UStVAn_Sicherheit = True
                                     End If
 
+                                    Dim updateVURZ As Boolean = False
 
+                                    updateVURZ = frm.cbxDivers.Checked
 
-                                    Dim UStV_ERS = New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen(Belegdatum, BelegNr, fd.FileName)
+                                    Dim UStV_ERS = New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen(Belegdatum, BelegNr, fd.SafeFileName)
                                     If Not UStV_ERS.hasEntry Then
 
                                         Dim isVZ As Boolean = False
@@ -2095,7 +2098,7 @@ Public Class usrCntlUSTV
                                         UStV_ERS.UStVEr_interneNr = USTV_ANTRAG.getMaxinternePosNrErst()
                                         UStV_ERS.UStVAn_ID = USTV_ANTRAG.UStVAn_ID
                                         UStV_ERS.Belegnummer = BelegNr
-                                            UStV_ERS.UStVEr_USteuerbetragEUR = r.Item("BetragEUR")
+                                        UStV_ERS.UStVEr_USteuerbetragEUR = r.Cells("BetragEUR").Value
                                         UStV_ERS.UStVEr_Importfilename = fd.SafeFileName
                                         UStV_ERS.UStVEr_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
                                         UStV_ERS.UStVEr_Zeitstempel = Now
@@ -2105,52 +2108,62 @@ Public Class usrCntlUSTV
                                             UStV_ERS.UStVEr_USteuerbetrag = System.Math.Round(kurs.EXCHANGE_EURTOCUR(UStV_ERS.UStVEr_USteuerbetragEUR, USTV_ANTRAG.UStVAn_Währungscode, CDate(Belegdatum)), 2)
                                             UStV_ERS.UStVEr_Umrechnungskurs = Math.floor((CDbl(UStV_ERS.UStVEr_USteuerbetrag) / CDbl(UStV_ERS.UStVEr_USteuerbetragEUR) * 100 + 0.5)) / 100
                                         Else
-                                                UStV_ERS.UStVEr_USteuerbetrag = r.Item("BetragEUR")
+                                            UStV_ERS.UStVEr_USteuerbetrag = r.Cells("BetragEUR").Value
                                             UStV_ERS.UStVEr_Umrechnungskurs = 1
                                         End If
 
                                         Dim Bemerkung As String = ""
 
-                                        If Not String.IsNullOrWhiteSpace(r.Item("VZ")) AndAlso IsNumeric(r.Item("VZ")) AndAlso Not IsDBNull(r.Item("VZ")) AndAlso CDbl(r.Item("VZ")) <> 0 Then
-                                            Bemerkung &= "VZ: " & CDbl(r.Item("VZ")).ToString("N2") & " " & USTV_ANTRAG.UStVAn_Währungscode
+                                        If Not String.IsNullOrWhiteSpace(r.Cells("VZ").Value) AndAlso IsNumeric(r.Cells("VZ").Value) AndAlso Not IsDBNull(r.Cells("VZ").Value) AndAlso CDbl(r.Cells("VZ").Value) <> 0 Then
+                                            Bemerkung &= "VZ: " & CDbl(r.Cells("VZ").Value).ToString("N2") & " " & USTV_ANTRAG.UStVAn_Währungscode
                                             isVZ = True
-                                            UStV_ERS.UStVEr_VZ = CDbl(r.Item("VZ"))
+                                            UStV_ERS.UStVEr_VZ = CDbl(r.Cells("VZ").Value)
 
-                                                If USTV_ANTRAG.UStVAn_VZBetrag Is Nothing OrElse IsNothing(USTV_ANTRAG.UStVAn_VZBetrag) Then
+                                            If updateVURZ Then
+                                                If USTV_ANTRAG.UStVAn_VZBetrag Is Nothing OrElse IsDBNull(USTV_ANTRAG.UStVAn_VZBetrag) Then
                                                     USTV_ANTRAG.UStVAn_VZBetrag = UStV_ERS.UStVEr_VZ
+                                                Else
+                                                    USTV_ANTRAG.UStVAn_VZBetrag += UStV_ERS.UStVEr_VZ
                                                 End If
+                                            End If
+
 
                                         End If
 
-                                            If Not String.IsNullOrWhiteSpace(r.Item("Bank")) AndAlso IsNumeric(r.Item("Bank")) AndAlso Not IsDBNull(r.Item("Bank")) AndAlso CDbl(r.Item("Bank")) <> 0 Then
-                                                Bemerkung &= ", a.K. : " & CDbl(r.Item("Bank")).ToString("N2") & " " & USTV_ANTRAG.UStVAn_Währungscode
-                                                UStV_ERS.UStVEr_Bank = CDbl(r.Item("Bank"))
+                                        If Not String.IsNullOrWhiteSpace(r.Cells("Bank").Value) AndAlso IsNumeric(r.Cells("Bank").Value) AndAlso Not IsDBNull(r.Cells("Bank")) AndAlso CDbl(r.Cells("Bank").Value) <> 0 Then
+                                            Bemerkung &= ", a.K. : " & CDbl(r.Cells("Bank").Value).ToString("N2") & " " & USTV_ANTRAG.UStVAn_Währungscode
+                                            UStV_ERS.UStVEr_Bank = CDbl(r.Cells("Bank").Value)
                                         End If
 
                                         If isVZ Then
-                                            If Not String.IsNullOrWhiteSpace(r.Item("VZDiff")) AndAlso IsNumeric(r.Item("VZDiff")) AndAlso Not IsDBNull(r.Item("VZDiff")) AndAlso CDbl(r.Item("VZDiff")) <> 0 Then
-                                                Bemerkung &= ", VZDiff: " & CDbl(r.Item("VZDiff")).ToString("N2")
-                                                UStV_ERS.UStVEr_Differenz = CDbl(r.Item("VZDiff"))
+                                            If Not String.IsNullOrWhiteSpace(r.Cells("VZDiff").Value) AndAlso IsNumeric(r.Cells("VZDiff")) AndAlso Not IsDBNull(r.Cells("VZDiff")) AndAlso CDbl(r.Cells("VZDiff").Value) <> 0 Then
+                                                Bemerkung &= ", VZDiff: " & CDbl(r.Cells("VZDiff").Value).ToString("N2")
+                                                UStV_ERS.UStVEr_Differenz = CDbl(r.Cells("VZDiff").Value)
 
                                             End If
 
                                         Else
-                                            If Not String.IsNullOrWhiteSpace(r.Item("Diff")) AndAlso IsNumeric(r.Item("Diff")) AndAlso Not IsDBNull(r.Item("Diff")) AndAlso CDbl(r.Item("Diff")) <> 0 Then
-                                                Bemerkung &= ", Diff: " & CDbl(r.Item("Diff")).ToString("N2")
-                                                UStV_ERS.UStVEr_Differenz = CDbl(r.Item("Diff"))
+                                            If Not String.IsNullOrWhiteSpace(r.Cells("Diff").Value) AndAlso IsNumeric(r.Cells("Diff")) AndAlso Not IsDBNull(r.Cells("Diff")) AndAlso CDbl(r.Cells("Diff").Value) <> 0 Then
+                                                Bemerkung &= ", Diff: " & CDbl(r.Cells("Diff").Value).ToString("N2")
+                                                UStV_ERS.UStVEr_Differenz = CDbl(r.Cells("Diff").Value)
 
                                             End If
                                         End If
 
 
 
-                                        If Not String.IsNullOrWhiteSpace(r.Item("RZVZ")) AndAlso IsNumeric(r.Item("RZVZ")) AndAlso Not IsDBNull(r.Item("RZVZ")) AndAlso CDbl(r.Item("RZVZ")) <> 0 Then
-                                            UStV_ERS.UStVEr_RZVZ = CDbl(r.Item("RZVZ")).ToString("N2")
+                                        If Not String.IsNullOrWhiteSpace(r.Cells("RZVZ").Value) AndAlso IsNumeric(r.Cells("RZVZ")) AndAlso Not IsDBNull(r.Cells("RZVZ")) AndAlso CDbl(r.Cells("RZVZ").Value) <> 0 Then
+                                            UStV_ERS.UStVEr_RZVZ = CDbl(r.Cells("RZVZ").Value).ToString("N2")
+                                            If updateVURZ Then
                                                 If USTV_ANTRAG.UStVAn_RZBetragVZ Is Nothing OrElse IsDBNull(USTV_ANTRAG.UStVAn_RZBetragVZ) Then
                                                     USTV_ANTRAG.UStVAn_RZBetragVZ = UStV_ERS.UStVEr_RZVZ
+                                                Else
+                                                    USTV_ANTRAG.UStVAn_RZBetragVZ += UStV_ERS.UStVEr_RZVZ
                                                 End If
                                             End If
 
+                                        End If
+
                                         If Bemerkung <> "" Then
                                             If Bemerkung.StartsWith(", ") Then
                                                 Bemerkung = Bemerkung.Remove(0, 2)

SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb

@@ -541,6 +541,8 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.cbxAntragsfilter._showdate = False
         Me.cbxAntragsfilter._value = ""
         Me.cbxAntragsfilter.AutoSize = True
+        Me.cbxAntragsfilter.Checked = True
+        Me.cbxAntragsfilter.CheckState = System.Windows.Forms.CheckState.Checked
         Me.cbxAntragsfilter.Location = New System.Drawing.Point(779, 29)
         Me.cbxAntragsfilter.Name = "cbxAntragsfilter"
         Me.cbxAntragsfilter.Size = New System.Drawing.Size(134, 17)

VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb

@@ -63,6 +63,7 @@ Public Class cUSTVAntrag
     Property UStVAn_MWSTEingang_offen As Object = Nothing
     Property POSITIONEN As New List(Of cUStVPositionen) '= Nothing
     Property UStVAn_letzteAenderung As Object = Nothing
+    Property UStVAn_letzteAenderungUser As Object = Nothing
 
     Public hasEntry = False
 
@@ -135,6 +136,7 @@ Public Class cUSTVAntrag
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_Sicherheit", UStVAn_Sicherheit))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_MWSTEingang_offen", UStVAn_MWSTEingang_offen))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_letzteAenderung", UStVAn_letzteAenderung))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_letzteAenderungUser", UStVAn_letzteAenderungUser))
 
 
         Return list