neu

2020-08-04 16:34:47 +02:00
parent 40295a2819
commit 89d8e0a3a8
95 changed files with 3655 additions and 697 deletions
--- a/SDL/Formulare/CMR/usrcntlCMR.Designer.vb
+++ b/SDL/Formulare/CMR/usrcntlCMR.Designer.vb
@@ -23,24 +23,15 @@ Partial Class usrcntlCMR
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
-        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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.Panel3 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
+        Me.LinkLabel7 = New System.Windows.Forms.LinkLabel()
+        Me.LinkLabel6 = New System.Windows.Forms.LinkLabel()
        Me.lbl_errCMR_1 = New System.Windows.Forms.Label()
        Me.txtAbsender = New VERAG_PROG_ALLGEMEIN.MyRichTextBox()
        Me.dgvLadungenKurz = New System.Windows.Forms.DataGridView()
-        Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.DataGridViewTextBoxColumn6 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.dgvLadungen = New System.Windows.Forms.DataGridView()
-        Me.ZeNr = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.anz = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.art = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.bez = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.statNr = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.gewicht = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.umfang = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.cbxKurz = New System.Windows.Forms.CheckBox()
        Me.lblKurz = New System.Windows.Forms.Label()
        Me.LinkLabel4 = New System.Windows.Forms.LinkLabel()
@@ -85,8 +76,17 @@ Partial Class usrcntlCMR
        Me.txtAuslieferungsort = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.txtFrachtführer = New VERAG_PROG_ALLGEMEIN.MyRichTextBox()
        Me.pic = New System.Windows.Forms.PictureBox()
-        Me.LinkLabel6 = New System.Windows.Forms.LinkLabel()
-        Me.LinkLabel7 = New System.Windows.Forms.LinkLabel()
+        Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.DataGridViewTextBoxColumn6 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.ZeNr = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.anz = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.art = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.bez = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.statNr = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.gewicht = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.umfang = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.Panel3.SuspendLayout()
        CType(Me.dgvLadungenKurz, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvLadungen, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -157,6 +157,28 @@ Partial Class usrcntlCMR
        Me.Panel3.Size = New System.Drawing.Size(857, 786)
        Me.Panel3.TabIndex = 0
        '
+        'LinkLabel7
+        '
+        Me.LinkLabel7.AutoSize = True
+        Me.LinkLabel7.BackColor = System.Drawing.Color.White
+        Me.LinkLabel7.Location = New System.Drawing.Point(453, 1024)
+        Me.LinkLabel7.Name = "LinkLabel7"
+        Me.LinkLabel7.Size = New System.Drawing.Size(33, 13)
+        Me.LinkLabel7.TabIndex = 496
+        Me.LinkLabel7.TabStop = True
+        Me.LinkLabel7.Text = "IMEX"
+        '
+        'LinkLabel6
+        '
+        Me.LinkLabel6.AutoSize = True
+        Me.LinkLabel6.BackColor = System.Drawing.Color.White
+        Me.LinkLabel6.Location = New System.Drawing.Point(161, 1024)
+        Me.LinkLabel6.Name = "LinkLabel6"
+        Me.LinkLabel6.Size = New System.Drawing.Size(33, 13)
+        Me.LinkLabel6.TabIndex = 495
+        Me.LinkLabel6.TabStop = True
+        Me.LinkLabel6.Text = "IMEX"
+        '
        'lbl_errCMR_1
        '
        Me.lbl_errCMR_1.AutoSize = True
@@ -191,14 +213,14 @@ Partial Class usrcntlCMR
        Me.dgvLadungenKurz.BackgroundColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.dgvLadungenKurz.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvLadungenKurz.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn2, Me.DataGridViewTextBoxColumn3, Me.DataGridViewTextBoxColumn4, Me.DataGridViewTextBoxColumn6})
-        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        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.dgvLadungenKurz.DefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        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.ControlText
+        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvLadungenKurz.DefaultCellStyle = DataGridViewCellStyle1
        Me.dgvLadungenKurz.GridColor = System.Drawing.Color.Gray
        Me.dgvLadungenKurz.Location = New System.Drawing.Point(32, 519)
        Me.dgvLadungenKurz.Name = "dgvLadungenKurz"
@@ -206,30 +228,6 @@ Partial Class usrcntlCMR
        Me.dgvLadungenKurz.Size = New System.Drawing.Size(796, 165)
        Me.dgvLadungenKurz.TabIndex = 490
        '
-        'DataGridViewTextBoxColumn2
-        '
-        Me.DataGridViewTextBoxColumn2.HeaderText = "Anzahl"
-        Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
-        Me.DataGridViewTextBoxColumn2.Width = 50
-        '
-        'DataGridViewTextBoxColumn3
-        '
-        Me.DataGridViewTextBoxColumn3.HeaderText = "Art der Verpack."
-        Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3"
-        Me.DataGridViewTextBoxColumn3.Width = 110
-        '
-        'DataGridViewTextBoxColumn4
-        '
-        Me.DataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.DataGridViewTextBoxColumn4.HeaderText = "Bezeichnung"
-        Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4"
-        '
-        'DataGridViewTextBoxColumn6
-        '
-        Me.DataGridViewTextBoxColumn6.HeaderText = "Brutto Gewicht"
-        Me.DataGridViewTextBoxColumn6.Name = "DataGridViewTextBoxColumn6"
-        Me.DataGridViewTextBoxColumn6.Width = 274
-        '
        'dgvLadungen
        '
        Me.dgvLadungen.AllowUserToAddRows = False
@@ -238,14 +236,14 @@ Partial Class usrcntlCMR
        Me.dgvLadungen.BackgroundColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.dgvLadungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvLadungen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.ZeNr, Me.anz, Me.art, Me.bez, Me.statNr, Me.gewicht, Me.umfang})
-        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        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.ControlText
-        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvLadungen.DefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        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.dgvLadungen.DefaultCellStyle = DataGridViewCellStyle2
        Me.dgvLadungen.GridColor = System.Drawing.Color.Gray
        Me.dgvLadungen.Location = New System.Drawing.Point(32, 519)
        Me.dgvLadungen.Name = "dgvLadungen"
@@ -254,47 +252,6 @@ Partial Class usrcntlCMR
        Me.dgvLadungen.TabIndex = 17
        Me.dgvLadungen.Visible = False
        '
-        'ZeNr
-        '
-        Me.ZeNr.HeaderText = "Zeichen/Nr."
-        Me.ZeNr.Name = "ZeNr"
-        Me.ZeNr.Width = 75
-        '
-        'anz
-        '
-        Me.anz.HeaderText = "Anzahl"
-        Me.anz.Name = "anz"
-        Me.anz.Width = 50
-        '
-        'art
-        '
-        Me.art.HeaderText = "Art der Verpack."
-        Me.art.Name = "art"
-        Me.art.Width = 107
-        '
-        'bez
-        '
-        Me.bez.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.bez.HeaderText = "Bezeichnung"
-        Me.bez.Name = "bez"
-        '
-        'statNr
-        '
-        Me.statNr.HeaderText = "Statistik Nr."
-        Me.statNr.Name = "statNr"
-        Me.statNr.Width = 84
-        '
-        'gewicht
-        '
-        Me.gewicht.HeaderText = "Brutto Gewicht"
-        Me.gewicht.Name = "gewicht"
-        '
-        'umfang
-        '
-        Me.umfang.HeaderText = "Umfang"
-        Me.umfang.Name = "umfang"
-        Me.umfang.Width = 90
-        '
        'cbxKurz
        '
        Me.cbxKurz.AutoSize = True
@@ -388,7 +345,7 @@ Partial Class usrcntlCMR
        '
        Me.PictureBox4.BackColor = System.Drawing.Color.White
        Me.PictureBox4.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.PictureBox4.Image = Global.SDL.My.Resources.search
+        Me.PictureBox4.Image = Global.SDL.My.Resources.Resources.search
        Me.PictureBox4.Location = New System.Drawing.Point(805, 286)
        Me.PictureBox4.Name = "PictureBox4"
        Me.PictureBox4.Size = New System.Drawing.Size(17, 17)
@@ -399,7 +356,7 @@ Partial Class usrcntlCMR
        '
        Me.PictureBox3.BackColor = System.Drawing.Color.White
        Me.PictureBox3.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.PictureBox3.Image = Global.SDL.My.Resources.search
+        Me.PictureBox3.Image = Global.SDL.My.Resources.Resources.search
        Me.PictureBox3.Location = New System.Drawing.Point(805, 151)
        Me.PictureBox3.Name = "PictureBox3"
        Me.PictureBox3.Size = New System.Drawing.Size(17, 17)
@@ -410,7 +367,7 @@ Partial Class usrcntlCMR
        '
        Me.PictureBox2.BackColor = System.Drawing.Color.White
        Me.PictureBox2.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.PictureBox2.Image = Global.SDL.My.Resources.search
+        Me.PictureBox2.Image = Global.SDL.My.Resources.Resources.search
        Me.PictureBox2.Location = New System.Drawing.Point(398, 151)
        Me.PictureBox2.Name = "PictureBox2"
        Me.PictureBox2.Size = New System.Drawing.Size(17, 17)
@@ -421,7 +378,7 @@ Partial Class usrcntlCMR
        '
        Me.PictureBox1.BackColor = System.Drawing.Color.White
        Me.PictureBox1.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.PictureBox1.Image = Global.SDL.My.Resources.search
+        Me.PictureBox1.Image = Global.SDL.My.Resources.Resources.search
        Me.PictureBox1.Location = New System.Drawing.Point(398, 23)
        Me.PictureBox1.Name = "PictureBox1"
        Me.PictureBox1.Size = New System.Drawing.Size(17, 17)
@@ -473,6 +430,7 @@ Partial Class usrcntlCMR
        Me.txtAusgefertigtAm._TimeOnly = False
        Me.txtAusgefertigtAm._value = ""
        Me.txtAusgefertigtAm._Waehrung = False
+        Me.txtAusgefertigtAm._WaehrungZeichen = True
        Me.txtAusgefertigtAm.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.txtAusgefertigtAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.txtAusgefertigtAm.Location = New System.Drawing.Point(301, 919)
@@ -600,6 +558,7 @@ Partial Class usrcntlCMR
        Me.txtAnhängerKg._TimeOnly = False
        Me.txtAnhängerKg._value = ""
        Me.txtAnhängerKg._Waehrung = False
+        Me.txtAnhängerKg._WaehrungZeichen = True
        Me.txtAnhängerKg.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.txtAnhängerKg.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.txtAnhängerKg.Location = New System.Drawing.Point(255, 1212)
@@ -623,6 +582,7 @@ Partial Class usrcntlCMR
        Me.txtKfzKg._TimeOnly = False
        Me.txtKfzKg._value = ""
        Me.txtKfzKg._Waehrung = False
+        Me.txtKfzKg._WaehrungZeichen = True
        Me.txtKfzKg.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.txtKfzKg.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.txtKfzKg.Location = New System.Drawing.Point(255, 1189)
@@ -646,6 +606,7 @@ Partial Class usrcntlCMR
        Me.txtAnhänger._TimeOnly = False
        Me.txtAnhänger._value = Nothing
        Me.txtAnhänger._Waehrung = False
+        Me.txtAnhänger._WaehrungZeichen = True
        Me.txtAnhänger.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.txtAnhänger.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.txtAnhänger.Location = New System.Drawing.Point(91, 1212)
@@ -669,6 +630,7 @@ Partial Class usrcntlCMR
        Me.txtDatum._TimeOnly = False
        Me.txtDatum._value = ""
        Me.txtDatum._Waehrung = False
+        Me.txtDatum._WaehrungZeichen = True
        Me.txtDatum.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.txtDatum.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.txtDatum.Location = New System.Drawing.Point(78, 421)
@@ -691,6 +653,7 @@ Partial Class usrcntlCMR
        Me.txtKfz._TimeOnly = False
        Me.txtKfz._value = Nothing
        Me.txtKfz._Waehrung = False
+        Me.txtKfz._WaehrungZeichen = True
        Me.txtKfz.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.txtKfz.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.txtKfz.Location = New System.Drawing.Point(91, 1189)
@@ -714,6 +677,7 @@ Partial Class usrcntlCMR
        Me.txtAusgefertigtIn._TimeOnly = False
        Me.txtAusgefertigtIn._value = Nothing
        Me.txtAusgefertigtIn._Waehrung = False
+        Me.txtAusgefertigtIn._WaehrungZeichen = True
        Me.txtAusgefertigtIn.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.txtAusgefertigtIn.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.txtAusgefertigtIn.Location = New System.Drawing.Point(106, 919)
@@ -736,6 +700,7 @@ Partial Class usrcntlCMR
        Me.txtLand._TimeOnly = False
        Me.txtLand._value = Nothing
        Me.txtLand._Waehrung = False
+        Me.txtLand._WaehrungZeichen = True
        Me.txtLand.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.txtLand.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.txtLand.Location = New System.Drawing.Point(78, 398)
@@ -758,6 +723,7 @@ Partial Class usrcntlCMR
        Me.txtOrt._TimeOnly = False
        Me.txtOrt._value = Nothing
        Me.txtOrt._Waehrung = False
+        Me.txtOrt._WaehrungZeichen = True
        Me.txtOrt.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.txtOrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.txtOrt.Location = New System.Drawing.Point(78, 375)
@@ -793,6 +759,7 @@ Partial Class usrcntlCMR
        Me.txtAnweisungenDesAbsenders._TimeOnly = False
        Me.txtAnweisungenDesAbsenders._value = Nothing
        Me.txtAnweisungenDesAbsenders._Waehrung = False
+        Me.txtAnweisungenDesAbsenders._WaehrungZeichen = True
        Me.txtAnweisungenDesAbsenders.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.txtAnweisungenDesAbsenders.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
        Me.txtAnweisungenDesAbsenders.Location = New System.Drawing.Point(42, 709)
@@ -841,6 +808,7 @@ Partial Class usrcntlCMR
        Me.txtBesondereVereinbarungen._TimeOnly = False
        Me.txtBesondereVereinbarungen._value = Nothing
        Me.txtBesondereVereinbarungen._Waehrung = False
+        Me.txtBesondereVereinbarungen._WaehrungZeichen = True
        Me.txtBesondereVereinbarungen.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.txtBesondereVereinbarungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
        Me.txtBesondereVereinbarungen.Location = New System.Drawing.Point(449, 852)
@@ -890,6 +858,7 @@ Partial Class usrcntlCMR
        Me.txtAuslieferungsLand._TimeOnly = False
        Me.txtAuslieferungsLand._value = Nothing
        Me.txtAuslieferungsLand._Waehrung = False
+        Me.txtAuslieferungsLand._WaehrungZeichen = True
        Me.txtAuslieferungsLand.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.txtAuslieferungsLand.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.txtAuslieferungsLand.Location = New System.Drawing.Point(78, 317)
@@ -912,6 +881,7 @@ Partial Class usrcntlCMR
        Me.txtAuslieferungsort._TimeOnly = False
        Me.txtAuslieferungsort._value = Nothing
        Me.txtAuslieferungsort._Waehrung = False
+        Me.txtAuslieferungsort._WaehrungZeichen = True
        Me.txtAuslieferungsort.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.txtAuslieferungsort.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.txtAuslieferungsort.Location = New System.Drawing.Point(78, 294)
@@ -939,7 +909,7 @@ Partial Class usrcntlCMR
        '
        'pic
        '
-        Me.pic.BackgroundImage = Global.SDL.My.Resources.CMR
+        Me.pic.BackgroundImage = Global.SDL.My.Resources.Resources.CMR
        Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.pic.Dock = System.Windows.Forms.DockStyle.Top
        Me.pic.Location = New System.Drawing.Point(0, 0)
@@ -948,27 +918,80 @@ Partial Class usrcntlCMR
        Me.pic.TabIndex = 3
        Me.pic.TabStop = False
        '
-        'LinkLabel6
+        'DataGridViewTextBoxColumn2
        '
-        Me.LinkLabel6.AutoSize = True
-        Me.LinkLabel6.BackColor = System.Drawing.Color.White
-        Me.LinkLabel6.Location = New System.Drawing.Point(161, 1024)
-        Me.LinkLabel6.Name = "LinkLabel6"
-        Me.LinkLabel6.Size = New System.Drawing.Size(33, 13)
-        Me.LinkLabel6.TabIndex = 495
-        Me.LinkLabel6.TabStop = True
-        Me.LinkLabel6.Text = "IMEX"
+        Me.DataGridViewTextBoxColumn2.HeaderText = "Anzahl"
+        Me.DataGridViewTextBoxColumn2.MaxInputLength = 50
+        Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
+        Me.DataGridViewTextBoxColumn2.Width = 50
        '
-        'LinkLabel7
+        'DataGridViewTextBoxColumn3
        '
-        Me.LinkLabel7.AutoSize = True
-        Me.LinkLabel7.BackColor = System.Drawing.Color.White
-        Me.LinkLabel7.Location = New System.Drawing.Point(453, 1024)
-        Me.LinkLabel7.Name = "LinkLabel7"
-        Me.LinkLabel7.Size = New System.Drawing.Size(33, 13)
-        Me.LinkLabel7.TabIndex = 496
-        Me.LinkLabel7.TabStop = True
-        Me.LinkLabel7.Text = "IMEX"
+        Me.DataGridViewTextBoxColumn3.HeaderText = "Art der Verpack."
+        Me.DataGridViewTextBoxColumn3.MaxInputLength = 50
+        Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3"
+        Me.DataGridViewTextBoxColumn3.Width = 110
+        '
+        'DataGridViewTextBoxColumn4
+        '
+        Me.DataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.DataGridViewTextBoxColumn4.HeaderText = "Bezeichnung"
+        Me.DataGridViewTextBoxColumn4.MaxInputLength = 80
+        Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4"
+        '
+        'DataGridViewTextBoxColumn6
+        '
+        Me.DataGridViewTextBoxColumn6.HeaderText = "Brutto Gewicht"
+        Me.DataGridViewTextBoxColumn6.MaxInputLength = 53
+        Me.DataGridViewTextBoxColumn6.Name = "DataGridViewTextBoxColumn6"
+        Me.DataGridViewTextBoxColumn6.Width = 274
+        '
+        'ZeNr
+        '
+        Me.ZeNr.HeaderText = "Zeichen/Nr."
+        Me.ZeNr.MaxInputLength = 50
+        Me.ZeNr.Name = "ZeNr"
+        Me.ZeNr.Width = 75
+        '
+        'anz
+        '
+        Me.anz.HeaderText = "Anzahl"
+        Me.anz.MaxInputLength = 50
+        Me.anz.Name = "anz"
+        Me.anz.Width = 50
+        '
+        'art
+        '
+        Me.art.HeaderText = "Art der Verpack."
+        Me.art.Name = "art"
+        Me.art.Width = 107
+        '
+        'bez
+        '
+        Me.bez.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.bez.HeaderText = "Bezeichnung"
+        Me.bez.MaxInputLength = 80
+        Me.bez.Name = "bez"
+        '
+        'statNr
+        '
+        Me.statNr.HeaderText = "Statistik Nr."
+        Me.statNr.MaxInputLength = 10
+        Me.statNr.Name = "statNr"
+        Me.statNr.Width = 84
+        '
+        'gewicht
+        '
+        Me.gewicht.HeaderText = "Brutto Gewicht"
+        Me.gewicht.MaxInputLength = 53
+        Me.gewicht.Name = "gewicht"
+        '
+        'umfang
+        '
+        Me.umfang.HeaderText = "Umfang"
+        Me.umfang.MaxInputLength = 53
+        Me.umfang.Name = "umfang"
+        Me.umfang.Width = 90
        '
        'usrcntlCMR
        '
@@ -1009,13 +1032,6 @@ Partial Class usrcntlCMR
    Public WithEvents txtUnterschriftFrachtführer As VERAG_PROG_ALLGEMEIN.MyRichTextBox
    Public WithEvents txtUnterschriftAbsender As VERAG_PROG_ALLGEMEIN.MyRichTextBox
    Public WithEvents txtBesondereVereinbarungen As VERAG_PROG_ALLGEMEIN.MyTextBox
-    Friend WithEvents ZeNr As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents anz As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents art As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents bez As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents statNr As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents gewicht As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents umfang As System.Windows.Forms.DataGridViewTextBoxColumn
    Friend WithEvents Panel1 As System.Windows.Forms.Panel
    Friend WithEvents lbl_errCMR_1 As System.Windows.Forms.Label
    Friend WithEvents lbl_errCMR_20 As System.Windows.Forms.Label
@@ -1042,13 +1058,20 @@ Partial Class usrcntlCMR
    Friend WithEvents LinkLabel3 As System.Windows.Forms.LinkLabel
    Friend WithEvents LinkLabel2 As System.Windows.Forms.LinkLabel
    Public WithEvents dgvLadungenKurz As System.Windows.Forms.DataGridView
-    Friend WithEvents DataGridViewTextBoxColumn2 As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents DataGridViewTextBoxColumn3 As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents DataGridViewTextBoxColumn4 As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents DataGridViewTextBoxColumn6 As System.Windows.Forms.DataGridViewTextBoxColumn
    Friend WithEvents cbxKurz As System.Windows.Forms.CheckBox
    Friend WithEvents lblKurz As System.Windows.Forms.Label
    Public WithEvents txtAbsender As VERAG_PROG_ALLGEMEIN.MyRichTextBox
    Friend WithEvents LinkLabel7 As LinkLabel
    Friend WithEvents LinkLabel6 As LinkLabel
+    Friend WithEvents DataGridViewTextBoxColumn2 As DataGridViewTextBoxColumn
+    Friend WithEvents DataGridViewTextBoxColumn3 As DataGridViewTextBoxColumn
+    Friend WithEvents DataGridViewTextBoxColumn4 As DataGridViewTextBoxColumn
+    Friend WithEvents DataGridViewTextBoxColumn6 As DataGridViewTextBoxColumn
+    Friend WithEvents ZeNr As DataGridViewTextBoxColumn
+    Friend WithEvents anz As DataGridViewTextBoxColumn
+    Friend WithEvents art As DataGridViewTextBoxColumn
+    Friend WithEvents bez As DataGridViewTextBoxColumn
+    Friend WithEvents statNr As DataGridViewTextBoxColumn
+    Friend WithEvents gewicht As DataGridViewTextBoxColumn
+    Friend WithEvents umfang As DataGridViewTextBoxColumn
 End Class
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlSonstigesPDF.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlSonstigesPDF.vb
@@ -16,9 +16,9 @@
    Sub New(PFAD)
        ' Dieser Aufruf ist für den Designer erforderlich.
        InitializeComponent()
-        If IO.File.Exists(PFAD) Then
+        If System.IO.File.Exists(PFAD) Then
            Me.PFAD = PFAD
-            Me.lblText.Text = IO.Path.GetFileName(PFAD)
+            Me.lblText.Text = System.IO.Path.GetFileName(PFAD)
        End If

    End Sub
@@ -36,7 +36,7 @@
    End Sub

    Private Sub pic_Click(sender As Object, e As EventArgs) Handles pic.Click
-        If IO.File.Exists(PFAD) Then Process.Start(PFAD)
+        If System.IO.File.Exists(PFAD) Then Process.Start(PFAD)
    End Sub

    Private Sub usrcntlFormOhneFelder_Load(sender As Object, e As EventArgs) Handles Me.Load
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb
@@ -138,7 +138,7 @@

        DataGridView.Rows.Clear()
        dgvZusatzleistung.Rows.Clear()
-           Select VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
            Case "IMEX"
                Select Case MyComboBox1._value
                    Case "VZ"
@@ -167,8 +167,8 @@
                        DataGridView.Rows.Add(cnt, "440", "P.P./Fixe Taxe", CDbl(12).ToString("C2")) : cnt += 1
                        DataGridView.Rows.Add(cnt, "260", "SVS", "lt. Tabelle") : cnt += 1
                        DataGridView.Rows.Add(cnt, "324", "EZOLL (AT) Zuschlag", CDbl(8).ToString("C2")) : cnt += 1
-                        DataGridView.Rows.Add(cnt, "700", "1 % Vorlageprovision (von Einfuhrabgaben)", "") : cnt += 1
-                        DataGridView.Rows.Add(cnt, "750", "2 % Kreditaufwendung (von Einfuhrabgaben)", "") : cnt += 1
+                        '  DataGridView.Rows.Add(cnt, "700", "1 % Vorlageprovision (von Einfuhrabgaben)", "") : cnt += 1
+                        '  DataGridView.Rows.Add(cnt, "750", "2 % Kreditaufwendung (von Einfuhrabgaben)", "") : cnt += 1
                        ' DataGridView.Rows.Add(cnt, "", "Warenort", CDbl(60).ToString("C2")) : cnt += 1

                        dgvZusatzleistung.Rows.Add("", "347", "Clearingkosten (EINMALIG nur bei 1. Abfertigung)", CDbl(80).ToString("C2"))
@@ -288,8 +288,8 @@
                        DataGridView.Rows.Add(cnt, "440", "P.P./Fixe Taxe", CDbl(12).ToString("C2")) : cnt += 1
                        DataGridView.Rows.Add(cnt, "260", "SVS", "lt. Tabelle") : cnt += 1
                        DataGridView.Rows.Add(cnt, "324", "EZOLL (AT) Zuschlag", CDbl(8).ToString("C2")) : cnt += 1
-                        DataGridView.Rows.Add(cnt, "700", "1 % Vorlageprovision (von Einfuhrabgaben)", "") : cnt += 1
-                        DataGridView.Rows.Add(cnt, "750", "2 % Kreditaufwendung (von Einfuhrabgaben)", "") : cnt += 1
+                        '  DataGridView.Rows.Add(cnt, "700", "1 % Vorlageprovision (von Einfuhrabgaben)", "") : cnt += 1
+                        ' DataGridView.Rows.Add(cnt, "750", "2 % Kreditaufwendung (von Einfuhrabgaben)", "") : cnt += 1
                        ' DataGridView.Rows.Add(cnt, "", "Warenort", CDbl(60).ToString("C2")) : cnt += 1

                        dgvZusatzleistung.Rows.Add("", "347", "Clearingkosten (EINMALIG nur bei 1. Abfertigung)", CDbl(80).ToString("C2"))
@@ -408,12 +408,12 @@

        DataGridView.ClearSelection()
    End Sub
+
    Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click
-      
        Dim zoll As New SDL.frmKundenUebersichtZOLL
        zoll.Show()
    End Sub
-     
+

    Private Sub DataGridView_UserAddedRow(sender As Object, e As DataGridViewRowEventArgs) Handles DataGridView.UserAddedRow
        initRowNr()
@@ -422,6 +422,7 @@
    Private Sub DataGridView_UserDeletedRow(sender As Object, e As DataGridViewRowEventArgs) Handles DataGridView.UserDeletedRow
        initRowNr()
    End Sub
+
    Sub initRowNr()
        Dim cnt = 1
        For Each r As DataGridViewRow In DataGridView.Rows
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb
@@ -184,11 +184,25 @@
    End Function

    Private Sub usrcntlVollmacht_AT_Load(sender As Object, e As EventArgs) Handles Me.Load
-        txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("0%", "0"))
-        txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("7%", "0,07"))
-        txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("19%", "0,19"))
-        txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20%", "0,20"))
-        txtEustProzent.changeItem("0,19")
+
+        If CDate(Now.ToShortDateString) >= CDate("01.07.2020") And CDate(Now.ToShortDateString) <= CDate("31.12.2020") Then
+
+            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("0%", "0"))
+            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("5%", "0,05"))
+            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16%", "0,16"))
+            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("7%", "0,07"))
+            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("19%", "0,19"))
+            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20%", "0,20"))
+            txtEustProzent.changeItem("0,16")
+        Else
+
+            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("0%", "0"))
+            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("7%", "0,07"))
+            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("19%", "0,19"))
+            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20%", "0,20"))
+            txtEustProzent.changeItem("0,19")
+        End If
+

        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Spedition AG", "AG"))
        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Customs Service GmbH", "CS"))
@@ -324,7 +338,13 @@
                Case "CS"
                    txtEustProzent.changeItem("0,20")
                Case "AG"
-                    txtEustProzent.changeItem("0,19")
+                    If CDate(Now.ToShortDateString) >= CDate("01.07.2020") And CDate(Now.ToShortDateString) <= CDate("31.12.2020") Then
+                        txtEustProzent.changeItem("0,16")
+                    Else
+                        txtEustProzent.changeItem("0,19")
+                    End If
+
+
            End Select
        End If
    End Sub
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -1396,7 +1396,7 @@ Public Class FormularManagerNEU


    Shared Function SonstPDF(usrCntl As usrcntlSonstigesPDF) As String
-        If IO.File.Exists(usrCntl.PFAD) Then
+        If System.IO.File.Exists(usrCntl.PFAD) Then
            Return usrCntl.PFAD
        End If
        Return ""
@@ -2910,12 +2910,12 @@ Public Class FormularManagerNEU

    Shared Function getPosNrByLNr(dt As DataTable, dt2 As DataTable, LNr As String) As String
        For i = 0 To dt.Rows.Count - 1
-            If dt.Rows(i)("LNr") = LNr Then
+            If dt.Rows(i)("LNr") IsNot DBNull.Value AndAlso dt.Rows(i)("LNr") = LNr Then
                Return If(dt.Rows(i)("Pos"), "")
            End If
        Next
        For i = 0 To dt2.Rows.Count - 1
-            If dt2.Rows(i)("ZLNr") = LNr Then
+            If dt2.Rows(i)("ZLNr") IsNot DBNull.Value AndAlso dt2.Rows(i)("ZLNr") = LNr Then
                Return "0"
            End If
        Next
@@ -3992,7 +3992,7 @@ Public Class FormularManagerNEU
                usrCntl.lblCRsaved.ForeColor = Color.Green
                '  VSQL.doSQL("UPDATE Kunden SET Bonität='" & cVorauskasse.ba_BonitaetsIndex & "', Bonitätsdatum='" & cVorauskasse.ba_Datum & "', Höchstkredit=" & If(cVorauskasse.ba_Hoechstkredit Is Nothing, "null", "'" & cVorauskasse.ba_Hoechstkredit & "'") & " WHERE KundenNr='" & cVorauskasse.ba_KundenNr & "'", "FMZOLL")

-                cVorauskasseOptions.insertVermerk(cVorauskasse.vk_FilialeNr, cVorauskasse.vk_AbfertigungsNr, 13,,, cVorauskasse.vk_VermerkId)
+                cVorauskasseOptions.insertVermerk(cVorauskasse.vk_FilialeNr, cVorauskasse.vk_AbfertigungsNr, 13,,, cVorauskasse.vk_VermerkId, , cVorauskasse.vk_Betrag)
                cVorauskasse.SAVE() 'VermerkId speichern
                Return True
            Else