Vermerke, Abf.Land

Aviso/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("3.9.2.7")>
+<Assembly: AssemblyVersion("3.9.3.0")>
-<Assembly: AssemblyFileVersion("3.9.2.7")>
+<Assembly: AssemblyFileVersion("3.9.3.0")>

Aviso/frmAddAktenvermerkShort.vb

@@ -114,7 +114,18 @@ Public Class frmAddAktenvermerkShort
                 cntxt.Items.Add(it)
 
                 AddHandler it.Click, Sub()
-                                         AvisoStatusFunctions.ummeldenAVISO(myAviso, it.Tag.ToString)
+                                         If it.Tag.ToString = "???" Then
+                                             myAviso.Grenzstelle = "???"
+                                             AvisoStatusFunctions.ummeldenAVISO(myAviso, it.Tag.ToString)
+                                             cGlobal.Aktive_ID = AvisoID
+                                             Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+                                             Dim f As New frmEintragAviso
+                                             f.ShowDialog(frmGrayOut)
+                                             frmGrayOut.Close()
+                                             myAviso = AvisoDAL.LesenAviso(AvisoID, "")
+                                         Else
+                                             AvisoStatusFunctions.ummeldenAVISO(myAviso, it.Tag.ToString)
+                                         End If
                                          Me.Close()
                                      End Sub
 

Aviso/frmAddSendungsvermerkShort.Designer.vb

@@ -73,6 +73,9 @@ Partial Class frmAddSendungsvermerkShort
         Me.PictureBox1 = New System.Windows.Forms.PictureBox()
         Me.PictureBox4 = New System.Windows.Forms.PictureBox()
         Me.Panel4 = New System.Windows.Forms.Panel()
+        Me.optGewPackAngefordert = New System.Windows.Forms.CheckBox()
+        Me.optKostenbestaetigungAngefordert = New System.Windows.Forms.CheckBox()
+        Me.optZolltarifnummerAngefordert = New System.Windows.Forms.CheckBox()
         Me.pnlMain.SuspendLayout()
         Me.pnlSendungsVermker.SuspendLayout()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -91,13 +94,16 @@ Partial Class frmAddSendungsvermerkShort
         Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnlMain.Location = New System.Drawing.Point(0, 0)
         Me.pnlMain.Name = "pnlMain"
-        Me.pnlMain.Size = New System.Drawing.Size(454, 503)
+        Me.pnlMain.Size = New System.Drawing.Size(454, 563)
         Me.pnlMain.TabIndex = 0
         '
         'pnlSendungsVermker
         '
         Me.pnlSendungsVermker.BackColor = System.Drawing.Color.White
         Me.pnlSendungsVermker.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnlSendungsVermker.Controls.Add(Me.optGewPackAngefordert)
+        Me.pnlSendungsVermker.Controls.Add(Me.optKostenbestaetigungAngefordert)
+        Me.pnlSendungsVermker.Controls.Add(Me.optZolltarifnummerAngefordert)
         Me.pnlSendungsVermker.Controls.Add(Me.txtSonstigesDokumentFehlt)
         Me.pnlSendungsVermker.Controls.Add(Me.cbxPackliste)
         Me.pnlSendungsVermker.Controls.Add(Me.Label4)
@@ -146,7 +152,7 @@ Partial Class frmAddSendungsvermerkShort
         Me.pnlSendungsVermker.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnlSendungsVermker.Location = New System.Drawing.Point(0, 0)
         Me.pnlSendungsVermker.Name = "pnlSendungsVermker"
-        Me.pnlSendungsVermker.Size = New System.Drawing.Size(454, 503)
+        Me.pnlSendungsVermker.Size = New System.Drawing.Size(454, 563)
         Me.pnlSendungsVermker.TabIndex = 0
         '
         'txtSonstigesDokumentFehlt
@@ -175,7 +181,7 @@ Partial Class frmAddSendungsvermerkShort
         Me.Label4.AutoSize = True
         Me.Label4.BackColor = System.Drawing.Color.WhiteSmoke
         Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label4.Location = New System.Drawing.Point(11, 333)
+        Me.Label4.Location = New System.Drawing.Point(11, 379)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(125, 17)
         Me.Label4.TabIndex = 96
@@ -185,7 +191,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.optFremd_ATB.AutoSize = True
         Me.optFremd_ATB.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optFremd_ATB.Location = New System.Drawing.Point(12, 380)
+        Me.optFremd_ATB.Location = New System.Drawing.Point(12, 426)
         Me.optFremd_ATB.Name = "optFremd_ATB"
         Me.optFremd_ATB.Size = New System.Drawing.Size(130, 17)
         Me.optFremd_ATB.TabIndex = 94
@@ -196,7 +202,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.optFremd_SendungAvisiert.AutoSize = True
         Me.optFremd_SendungAvisiert.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optFremd_SendungAvisiert.Location = New System.Drawing.Point(12, 357)
+        Me.optFremd_SendungAvisiert.Location = New System.Drawing.Point(12, 403)
         Me.optFremd_SendungAvisiert.Name = "optFremd_SendungAvisiert"
         Me.optFremd_SendungAvisiert.Size = New System.Drawing.Size(193, 17)
         Me.optFremd_SendungAvisiert.TabIndex = 93
@@ -217,7 +223,7 @@ Partial Class frmAddSendungsvermerkShort
         'optFrachtkostenAngefordert
         '
         Me.optFrachtkostenAngefordert.AutoSize = True
-        Me.optFrachtkostenAngefordert.Location = New System.Drawing.Point(12, 163)
+        Me.optFrachtkostenAngefordert.Location = New System.Drawing.Point(12, 162)
         Me.optFrachtkostenAngefordert.Name = "optFrachtkostenAngefordert"
         Me.optFrachtkostenAngefordert.Size = New System.Drawing.Size(145, 17)
         Me.optFrachtkostenAngefordert.TabIndex = 91
@@ -248,7 +254,7 @@ Partial Class frmAddSendungsvermerkShort
         'cbxRgBest
         '
         Me.cbxRgBest.AutoSize = True
-        Me.cbxRgBest.Location = New System.Drawing.Point(270, 187)
+        Me.cbxRgBest.Location = New System.Drawing.Point(270, 185)
         Me.cbxRgBest.Name = "cbxRgBest"
         Me.cbxRgBest.Size = New System.Drawing.Size(146, 17)
         Me.cbxRgBest.TabIndex = 86
@@ -258,7 +264,7 @@ Partial Class frmAddSendungsvermerkShort
         'optUeberwachungsdok
         '
         Me.optUeberwachungsdok.AutoSize = True
-        Me.optUeberwachungsdok.Location = New System.Drawing.Point(270, 164)
+        Me.optUeberwachungsdok.Location = New System.Drawing.Point(270, 163)
         Me.optUeberwachungsdok.Name = "optUeberwachungsdok"
         Me.optUeberwachungsdok.Size = New System.Drawing.Size(114, 17)
         Me.optUeberwachungsdok.TabIndex = 85
@@ -270,7 +276,7 @@ Partial Class frmAddSendungsvermerkShort
         Me.lblErrSpedition.AutoSize = True
         Me.lblErrSpedition.BackColor = System.Drawing.Color.WhiteSmoke
         Me.lblErrSpedition.ForeColor = System.Drawing.Color.Red
-        Me.lblErrSpedition.Location = New System.Drawing.Point(175, 238)
+        Me.lblErrSpedition.Location = New System.Drawing.Point(175, 284)
         Me.lblErrSpedition.Name = "lblErrSpedition"
         Me.lblErrSpedition.Size = New System.Drawing.Size(158, 13)
         Me.lblErrSpedition.TabIndex = 17
@@ -282,7 +288,7 @@ Partial Class frmAddSendungsvermerkShort
         Me.Label2.AutoSize = True
         Me.Label2.BackColor = System.Drawing.Color.WhiteSmoke
         Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
-        Me.Label2.Location = New System.Drawing.Point(175, 238)
+        Me.Label2.Location = New System.Drawing.Point(175, 284)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(57, 13)
         Me.Label2.TabIndex = 84
@@ -293,7 +299,7 @@ Partial Class frmAddSendungsvermerkShort
         Me.lblErrGrund.AutoSize = True
         Me.lblErrGrund.BackColor = System.Drawing.Color.WhiteSmoke
         Me.lblErrGrund.ForeColor = System.Drawing.Color.Red
-        Me.lblErrGrund.Location = New System.Drawing.Point(147, 307)
+        Me.lblErrGrund.Location = New System.Drawing.Point(147, 353)
         Me.lblErrGrund.Name = "lblErrGrund"
         Me.lblErrGrund.Size = New System.Drawing.Size(149, 13)
         Me.lblErrGrund.TabIndex = 26
@@ -344,7 +350,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.txtSpedition.BackColor = System.Drawing.Color.WhiteSmoke
         Me.txtSpedition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSpedition.Location = New System.Drawing.Point(177, 254)
+        Me.txtSpedition.Location = New System.Drawing.Point(177, 300)
         Me.txtSpedition.MaxLength = 50
         Me.txtSpedition.Name = "txtSpedition"
         Me.txtSpedition.Size = New System.Drawing.Size(125, 20)
@@ -365,7 +371,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.optSpeditionWeitergeleitet.AutoSize = True
         Me.optSpeditionWeitergeleitet.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optSpeditionWeitergeleitet.Location = New System.Drawing.Point(12, 256)
+        Me.optSpeditionWeitergeleitet.Location = New System.Drawing.Point(12, 302)
         Me.optSpeditionWeitergeleitet.Name = "optSpeditionWeitergeleitet"
         Me.optSpeditionWeitergeleitet.Size = New System.Drawing.Size(163, 17)
         Me.optSpeditionWeitergeleitet.TabIndex = 19
@@ -376,7 +382,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.optFreierText.AutoSize = True
         Me.optFreierText.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optFreierText.Location = New System.Drawing.Point(12, 283)
+        Me.optFreierText.Location = New System.Drawing.Point(12, 329)
         Me.optFreierText.Name = "optFreierText"
         Me.optFreierText.Size = New System.Drawing.Size(105, 17)
         Me.optFreierText.TabIndex = 27
@@ -387,7 +393,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.optATAangefordert.AutoSize = True
         Me.optATAangefordert.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.optATAangefordert.Location = New System.Drawing.Point(164, 380)
+        Me.optATAangefordert.Location = New System.Drawing.Point(164, 426)
         Me.optATAangefordert.Name = "optATAangefordert"
         Me.optATAangefordert.Size = New System.Drawing.Size(208, 17)
         Me.optATAangefordert.TabIndex = 15
@@ -397,7 +403,7 @@ Partial Class frmAddSendungsvermerkShort
         'optVorkasseAngefordert
         '
         Me.optVorkasseAngefordert.AutoSize = True
-        Me.optVorkasseAngefordert.Location = New System.Drawing.Point(12, 186)
+        Me.optVorkasseAngefordert.Location = New System.Drawing.Point(12, 184)
         Me.optVorkasseAngefordert.Name = "optVorkasseAngefordert"
         Me.optVorkasseAngefordert.Size = New System.Drawing.Size(144, 17)
         Me.optVorkasseAngefordert.TabIndex = 14
@@ -418,7 +424,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.Label3.AutoSize = True
         Me.Label3.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.Label3.Location = New System.Drawing.Point(308, 257)
+        Me.Label3.Location = New System.Drawing.Point(308, 303)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(57, 13)
         Me.Label3.TabIndex = 22
@@ -428,7 +434,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.lblErr240Zeichen.AutoSize = True
         Me.lblErr240Zeichen.ForeColor = System.Drawing.Color.Red
-        Me.lblErr240Zeichen.Location = New System.Drawing.Point(219, 418)
+        Me.lblErr240Zeichen.Location = New System.Drawing.Point(219, 464)
         Me.lblErr240Zeichen.Name = "lblErr240Zeichen"
         Me.lblErr240Zeichen.Size = New System.Drawing.Size(95, 13)
         Me.lblErr240Zeichen.TabIndex = 32
@@ -440,7 +446,7 @@ Partial Class frmAddSendungsvermerkShort
         Me.txtDetail.AcceptsReturn = True
         Me.txtDetail.BackColor = System.Drawing.Color.White
         Me.txtDetail.ForeColor = System.Drawing.SystemColors.InfoText
-        Me.txtDetail.Location = New System.Drawing.Point(12, 434)
+        Me.txtDetail.Location = New System.Drawing.Point(12, 480)
         Me.txtDetail.MaxLength = 240
         Me.txtDetail.Multiline = True
         Me.txtDetail.Name = "txtDetail"
@@ -453,7 +459,7 @@ Partial Class frmAddSendungsvermerkShort
         'lblZustzlFreitext
         '
         Me.lblZustzlFreitext.AutoSize = True
-        Me.lblZustzlFreitext.Location = New System.Drawing.Point(9, 418)
+        Me.lblZustzlFreitext.Location = New System.Drawing.Point(9, 464)
         Me.lblZustzlFreitext.Name = "lblZustzlFreitext"
         Me.lblZustzlFreitext.Size = New System.Drawing.Size(142, 13)
         Me.lblZustzlFreitext.TabIndex = 31
@@ -463,7 +469,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.txtSendungSpedition.BackColor = System.Drawing.Color.WhiteSmoke
         Me.txtSendungSpedition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSendungSpedition.Location = New System.Drawing.Point(144, 254)
+        Me.txtSendungSpedition.Location = New System.Drawing.Point(144, 300)
         Me.txtSendungSpedition.MaxLength = 50
         Me.txtSendungSpedition.Name = "txtSendungSpedition"
         Me.txtSendungSpedition.Size = New System.Drawing.Size(25, 20)
@@ -484,7 +490,7 @@ Partial Class frmAddSendungsvermerkShort
         'btnOK
         '
         Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnOK.Location = New System.Drawing.Point(320, 434)
+        Me.btnOK.Location = New System.Drawing.Point(320, 480)
         Me.btnOK.Name = "btnOK"
         Me.btnOK.Size = New System.Drawing.Size(124, 54)
         Me.btnOK.TabIndex = 34
@@ -507,7 +513,7 @@ Partial Class frmAddSendungsvermerkShort
         Me.Label9.AutoSize = True
         Me.Label9.BackColor = System.Drawing.Color.WhiteSmoke
         Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
-        Me.Label9.Location = New System.Drawing.Point(354, 307)
+        Me.Label9.Location = New System.Drawing.Point(354, 353)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(90, 13)
         Me.Label9.TabIndex = 30
@@ -540,7 +546,7 @@ Partial Class frmAddSendungsvermerkShort
         Me.Label17.AutoSize = True
         Me.Label17.BackColor = System.Drawing.Color.WhiteSmoke
         Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Italic)
-        Me.Label17.Location = New System.Drawing.Point(144, 307)
+        Me.Label17.Location = New System.Drawing.Point(144, 353)
         Me.Label17.Name = "Label17"
         Me.Label17.Size = New System.Drawing.Size(182, 13)
         Me.Label17.TabIndex = 29
@@ -551,7 +557,7 @@ Partial Class frmAddSendungsvermerkShort
         Me.Label13.AutoSize = True
         Me.Label13.BackColor = System.Drawing.Color.WhiteSmoke
         Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label13.Location = New System.Drawing.Point(9, 229)
+        Me.Label13.Location = New System.Drawing.Point(9, 275)
         Me.Label13.Name = "Label13"
         Me.Label13.Size = New System.Drawing.Size(84, 17)
         Me.Label13.TabIndex = 16
@@ -583,7 +589,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.txtFreierText.BackColor = System.Drawing.Color.WhiteSmoke
         Me.txtFreierText.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
-        Me.txtFreierText.Location = New System.Drawing.Point(122, 281)
+        Me.txtFreierText.Location = New System.Drawing.Point(122, 327)
         Me.txtFreierText.MaxLength = 80
         Me.txtFreierText.Name = "txtFreierText"
         Me.txtFreierText.Size = New System.Drawing.Size(322, 23)
@@ -604,7 +610,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.Label20.AutoSize = True
         Me.Label20.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.Label20.Location = New System.Drawing.Point(267, 257)
+        Me.Label20.Location = New System.Drawing.Point(267, 303)
         Me.Label20.Name = "Label20"
         Me.Label20.Size = New System.Drawing.Size(0, 13)
         Me.Label20.TabIndex = 21
@@ -634,7 +640,7 @@ Partial Class frmAddSendungsvermerkShort
         '
         Me.PictureBox4.BackColor = System.Drawing.Color.WhiteSmoke
         Me.PictureBox4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.PictureBox4.Location = New System.Drawing.Point(-1, 219)
+        Me.PictureBox4.Location = New System.Drawing.Point(-1, 265)
         Me.PictureBox4.Name = "PictureBox4"
         Me.PictureBox4.Size = New System.Drawing.Size(453, 189)
         Me.PictureBox4.TabIndex = 78
@@ -650,11 +656,41 @@ Partial Class frmAddSendungsvermerkShort
         Me.Panel4.Size = New System.Drawing.Size(454, 0)
         Me.Panel4.TabIndex = 1
         '
+        'optGewPackAngefordert
+        '
+        Me.optGewPackAngefordert.AutoSize = True
+        Me.optGewPackAngefordert.Location = New System.Drawing.Point(12, 236)
+        Me.optGewPackAngefordert.Name = "optGewPackAngefordert"
+        Me.optGewPackAngefordert.Size = New System.Drawing.Size(245, 17)
+        Me.optGewPackAngefordert.TabIndex = 101
+        Me.optGewPackAngefordert.Text = "Gewicht/Packstücke mangelhaft - angefordert"
+        Me.optGewPackAngefordert.UseVisualStyleBackColor = True
+        '
+        'optKostenbestaetigungAngefordert
+        '
+        Me.optKostenbestaetigungAngefordert.AutoSize = True
+        Me.optKostenbestaetigungAngefordert.Location = New System.Drawing.Point(270, 214)
+        Me.optKostenbestaetigungAngefordert.Name = "optKostenbestaetigungAngefordert"
+        Me.optKostenbestaetigungAngefordert.Size = New System.Drawing.Size(177, 17)
+        Me.optKostenbestaetigungAngefordert.TabIndex = 99
+        Me.optKostenbestaetigungAngefordert.Text = "Kostenbestätigung - angefordert"
+        Me.optKostenbestaetigungAngefordert.UseVisualStyleBackColor = True
+        '
+        'optZolltarifnummerAngefordert
+        '
+        Me.optZolltarifnummerAngefordert.AutoSize = True
+        Me.optZolltarifnummerAngefordert.Location = New System.Drawing.Point(12, 214)
+        Me.optZolltarifnummerAngefordert.Name = "optZolltarifnummerAngefordert"
+        Me.optZolltarifnummerAngefordert.Size = New System.Drawing.Size(154, 17)
+        Me.optZolltarifnummerAngefordert.TabIndex = 98
+        Me.optZolltarifnummerAngefordert.Text = "Zolltarifnummer angefordert"
+        Me.optZolltarifnummerAngefordert.UseVisualStyleBackColor = True
+        '
         'frmAddSendungsvermerkShort
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(454, 503)
+        Me.ClientSize = New System.Drawing.Size(454, 563)
         Me.Controls.Add(Me.pnlMain)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
@@ -720,4 +756,7 @@ Partial Class frmAddSendungsvermerkShort
     Friend WithEvents optKundeNichtErreichbar As CheckBox
     Friend WithEvents optAbsenderbestätigung As CheckBox
     Friend WithEvents cbxPackliste As CheckBox
+    Friend WithEvents optGewPackAngefordert As CheckBox
+    Friend WithEvents optKostenbestaetigungAngefordert As CheckBox
+    Friend WithEvents optZolltarifnummerAngefordert As CheckBox
 End Class

Aviso/frmAddSendungsvermerkShort.vb

@@ -162,6 +162,9 @@ Public Class frmAddSendungsvermerkShort
         If cbxCMR.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "CMR bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 11)
         If cbxPackliste.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Packliste bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 90)
         If cbxRgBest.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Rechnungsbestätigung bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 55)
+        If optGewPackAngefordert.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Gewicht/Packstücke bei Sendung '" & txtSendung.Text.Trim & "' mangelhaft - angefordert", 103)
+        If optZolltarifnummerAngefordert.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Zolltarifnummer bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 105)
+        If optKostenbestaetigungAngefordert.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Kostenbestaetigung bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 107)
 
         If optFrachtkostenAngefordert.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Frachtkosten bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 74)
         If optAbsenderbestätigung.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Absenderbestätigung bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 76)

Aviso/frmSendungsdetailsNEU.Designer.vb

@@ -289,6 +289,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtKdAuftragsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.LinkLabel4 = New System.Windows.Forms.LinkLabel()
         Me.Panel5 = New System.Windows.Forms.Panel()
+        Me.cboAbfertigungsLand = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.lblSNDChat_MsgCnt = New System.Windows.Forms.Label()
         Me.picAVISOMessengerSNDChat = New System.Windows.Forms.PictureBox()
         Me.txtAnzahlPos = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -323,6 +324,7 @@ Partial Class frmSendungsdetailsNEU
         Me.pnlheader = New System.Windows.Forms.Panel()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.Panel7 = New System.Windows.Forms.Panel()
+        Me.btnLKWUmmelden = New System.Windows.Forms.Button()
         Me.Button24 = New System.Windows.Forms.Button()
         Me.cboVorpapier3 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cboVorpapier2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -430,6 +432,8 @@ Partial Class frmSendungsdetailsNEU
         Me.NurÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.cntDigicust = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.StatusAbrufenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.XXXToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnl.SuspendLayout()
         Me.Panel4.SuspendLayout()
         Me.TabControl1.SuspendLayout()
@@ -496,6 +500,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ContextMenuStrip1.SuspendLayout()
         Me.ContextMenuStrip2.SuspendLayout()
         Me.cntDigicust.SuspendLayout()
+        Me.ContextMenuStrip3.SuspendLayout()
         Me.SuspendLayout()
         '
         'pnl
@@ -4108,6 +4113,7 @@ Partial Class frmSendungsdetailsNEU
         '
         Me.Panel5.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
         Me.Panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel5.Controls.Add(Me.cboAbfertigungsLand)
         Me.Panel5.Controls.Add(Me.lblSNDChat_MsgCnt)
         Me.Panel5.Controls.Add(Me.picAVISOMessengerSNDChat)
         Me.Panel5.Controls.Add(Me.txtAnzahlPos)
@@ -4134,6 +4140,21 @@ Partial Class frmSendungsdetailsNEU
         Me.Panel5.Size = New System.Drawing.Size(1214, 69)
         Me.Panel5.TabIndex = 0
         '
+        'cboAbfertigungsLand
+        '
+        Me.cboAbfertigungsLand._allowedValuesFreiText = Nothing
+        Me.cboAbfertigungsLand._allowFreiText = False
+        Me.cboAbfertigungsLand._value = ""
+        Me.cboAbfertigungsLand.BackColor = System.Drawing.Color.White
+        Me.cboAbfertigungsLand.DropDownWidth = 80
+        Me.cboAbfertigungsLand.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.cboAbfertigungsLand.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboAbfertigungsLand.FormattingEnabled = True
+        Me.cboAbfertigungsLand.Location = New System.Drawing.Point(427, 27)
+        Me.cboAbfertigungsLand.Name = "cboAbfertigungsLand"
+        Me.cboAbfertigungsLand.Size = New System.Drawing.Size(50, 24)
+        Me.cboAbfertigungsLand.TabIndex = 12
+        '
         'lblSNDChat_MsgCnt
         '
         Me.lblSNDChat_MsgCnt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -4298,9 +4319,9 @@ Partial Class frmSendungsdetailsNEU
         Me.cboAbfertigungsart.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.cboAbfertigungsart.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.cboAbfertigungsart.FormattingEnabled = True
-        Me.cboAbfertigungsart.Location = New System.Drawing.Point(422, 27)
+        Me.cboAbfertigungsart.Location = New System.Drawing.Point(477, 27)
         Me.cboAbfertigungsart.Name = "cboAbfertigungsart"
-        Me.cboAbfertigungsart.Size = New System.Drawing.Size(315, 24)
+        Me.cboAbfertigungsart.Size = New System.Drawing.Size(256, 24)
         Me.cboAbfertigungsart.TabIndex = 12
         '
         'lblAbfertigungsart
@@ -4308,11 +4329,11 @@ Partial Class frmSendungsdetailsNEU
         Me.lblAbfertigungsart.AutoSize = True
         Me.lblAbfertigungsart.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblAbfertigungsart.ForeColor = System.Drawing.Color.White
-        Me.lblAbfertigungsart.Location = New System.Drawing.Point(418, 7)
+        Me.lblAbfertigungsart.Location = New System.Drawing.Point(424, 7)
         Me.lblAbfertigungsart.Name = "lblAbfertigungsart"
-        Me.lblAbfertigungsart.Size = New System.Drawing.Size(109, 17)
+        Me.lblAbfertigungsart.Size = New System.Drawing.Size(145, 17)
         Me.lblAbfertigungsart.TabIndex = 6
-        Me.lblAbfertigungsart.Text = "Abfertigungsart:"
+        Me.lblAbfertigungsart.Text = "Abfertigungsland/-art:"
         '
         'pnlFremd
         '
@@ -4624,6 +4645,7 @@ Partial Class frmSendungsdetailsNEU
         '
         'Panel7
         '
+        Me.Panel7.Controls.Add(Me.btnLKWUmmelden)
         Me.Panel7.Controls.Add(Me.Button24)
         Me.Panel7.Controls.Add(Me.cboVorpapier3)
         Me.Panel7.Controls.Add(Me.cboVorpapier2)
@@ -4646,6 +4668,20 @@ Partial Class frmSendungsdetailsNEU
         Me.Panel7.Size = New System.Drawing.Size(1214, 87)
         Me.Panel7.TabIndex = 3
         '
+        'btnLKWUmmelden
+        '
+        Me.btnLKWUmmelden.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnLKWUmmelden.Image = Global.AVISO.My.Resources.Resources.lorry_ummelden
+        Me.btnLKWUmmelden.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.btnLKWUmmelden.Location = New System.Drawing.Point(640, 1)
+        Me.btnLKWUmmelden.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnLKWUmmelden.Name = "btnLKWUmmelden"
+        Me.btnLKWUmmelden.Size = New System.Drawing.Size(51, 85)
+        Me.btnLKWUmmelden.TabIndex = 110
+        Me.btnLKWUmmelden.Text = "um-" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "melden"
+        Me.btnLKWUmmelden.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.btnLKWUmmelden.UseVisualStyleBackColor = True
+        '
         'Button24
         '
         Me.Button24.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -4656,7 +4692,7 @@ Partial Class frmSendungsdetailsNEU
         Me.Button24.FlatAppearance.BorderSize = 0
         Me.Button24.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button24.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button24.Location = New System.Drawing.Point(357, -1)
+        Me.Button24.Location = New System.Drawing.Point(342, -1)
         Me.Button24.Name = "Button24"
         Me.Button24.Size = New System.Drawing.Size(15, 15)
         Me.Button24.TabIndex = 1
@@ -4669,7 +4705,7 @@ Partial Class frmSendungsdetailsNEU
         Me.cboVorpapier3._value = ""
         Me.cboVorpapier3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
         Me.cboVorpapier3.FormattingEnabled = True
-        Me.cboVorpapier3.Location = New System.Drawing.Point(163, 62)
+        Me.cboVorpapier3.Location = New System.Drawing.Point(148, 62)
         Me.cboVorpapier3.Name = "cboVorpapier3"
         Me.cboVorpapier3.Size = New System.Drawing.Size(209, 24)
         Me.cboVorpapier3.TabIndex = 12
@@ -4681,7 +4717,7 @@ Partial Class frmSendungsdetailsNEU
         Me.cboVorpapier2._value = ""
         Me.cboVorpapier2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
         Me.cboVorpapier2.FormattingEnabled = True
-        Me.cboVorpapier2.Location = New System.Drawing.Point(163, 39)
+        Me.cboVorpapier2.Location = New System.Drawing.Point(148, 39)
         Me.cboVorpapier2.Name = "cboVorpapier2"
         Me.cboVorpapier2.Size = New System.Drawing.Size(209, 24)
         Me.cboVorpapier2.TabIndex = 9
@@ -4689,7 +4725,7 @@ Partial Class frmSendungsdetailsNEU
         'txtVorpapier3Pos
         '
         Me.txtVorpapier3Pos.Cursor = System.Windows.Forms.Cursors.IBeam
-        Me.txtVorpapier3Pos.Location = New System.Drawing.Point(378, 60)
+        Me.txtVorpapier3Pos.Location = New System.Drawing.Point(363, 60)
         Me.txtVorpapier3Pos.MaxLength = 500
         Me.txtVorpapier3Pos.Name = "txtVorpapier3Pos"
         Me.txtVorpapier3Pos.Size = New System.Drawing.Size(88, 25)
@@ -4699,7 +4735,7 @@ Partial Class frmSendungsdetailsNEU
         'txtVorpapier2Pos
         '
         Me.txtVorpapier2Pos.Cursor = System.Windows.Forms.Cursors.IBeam
-        Me.txtVorpapier2Pos.Location = New System.Drawing.Point(378, 37)
+        Me.txtVorpapier2Pos.Location = New System.Drawing.Point(363, 37)
         Me.txtVorpapier2Pos.MaxLength = 500
         Me.txtVorpapier2Pos.Name = "txtVorpapier2Pos"
         Me.txtVorpapier2Pos.Size = New System.Drawing.Size(88, 25)
@@ -4709,7 +4745,7 @@ Partial Class frmSendungsdetailsNEU
         'lblPos
         '
         Me.lblPos.AutoSize = True
-        Me.lblPos.Location = New System.Drawing.Point(375, 0)
+        Me.lblPos.Location = New System.Drawing.Point(360, 0)
         Me.lblPos.Name = "lblPos"
         Me.lblPos.Size = New System.Drawing.Size(28, 13)
         Me.lblPos.TabIndex = 2
@@ -4718,7 +4754,7 @@ Partial Class frmSendungsdetailsNEU
         'txtVorpapierPos
         '
         Me.txtVorpapierPos.Cursor = System.Windows.Forms.Cursors.IBeam
-        Me.txtVorpapierPos.Location = New System.Drawing.Point(378, 14)
+        Me.txtVorpapierPos.Location = New System.Drawing.Point(363, 14)
         Me.txtVorpapierPos.MaxLength = 500
         Me.txtVorpapierPos.Name = "txtVorpapierPos"
         Me.txtVorpapierPos.Size = New System.Drawing.Size(88, 25)
@@ -4728,7 +4764,7 @@ Partial Class frmSendungsdetailsNEU
         'lblZuweisungVP
         '
         Me.lblZuweisungVP.AutoSize = True
-        Me.lblZuweisungVP.Location = New System.Drawing.Point(160, 0)
+        Me.lblZuweisungVP.Location = New System.Drawing.Point(145, 0)
         Me.lblZuweisungVP.Name = "lblZuweisungVP"
         Me.lblZuweisungVP.Size = New System.Drawing.Size(110, 13)
         Me.lblZuweisungVP.TabIndex = 0
@@ -4741,7 +4777,7 @@ Partial Class frmSendungsdetailsNEU
         Me.cboVorpapier._value = ""
         Me.cboVorpapier.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
         Me.cboVorpapier.FormattingEnabled = True
-        Me.cboVorpapier.Location = New System.Drawing.Point(163, 16)
+        Me.cboVorpapier.Location = New System.Drawing.Point(148, 16)
         Me.cboVorpapier.Name = "cboVorpapier"
         Me.cboVorpapier.Size = New System.Drawing.Size(209, 24)
         Me.cboVorpapier.TabIndex = 6
@@ -4749,16 +4785,16 @@ Partial Class frmSendungsdetailsNEU
         'lblGrenze
         '
         Me.lblGrenze.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
-        Me.lblGrenze.Location = New System.Drawing.Point(483, 16)
+        Me.lblGrenze.Location = New System.Drawing.Point(468, 16)
         Me.lblGrenze.Name = "lblGrenze"
-        Me.lblGrenze.Size = New System.Drawing.Size(202, 62)
+        Me.lblGrenze.Size = New System.Drawing.Size(169, 62)
         Me.lblGrenze.TabIndex = 10
         Me.lblGrenze.Text = "SUB"
         '
         'lblGrenzeSnd
         '
         Me.lblGrenzeSnd.AutoSize = True
-        Me.lblGrenzeSnd.Location = New System.Drawing.Point(484, 0)
+        Me.lblGrenzeSnd.Location = New System.Drawing.Point(469, 0)
         Me.lblGrenzeSnd.Name = "lblGrenzeSnd"
         Me.lblGrenzeSnd.Size = New System.Drawing.Size(44, 13)
         Me.lblGrenzeSnd.TabIndex = 3
@@ -5504,14 +5540,26 @@ Partial Class frmSendungsdetailsNEU
         '
         Me.cntDigicust.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StatusAbrufenToolStripMenuItem})
         Me.cntDigicust.Name = "cntDigicust"
-        Me.cntDigicust.Size = New System.Drawing.Size(181, 48)
+        Me.cntDigicust.Size = New System.Drawing.Size(151, 26)
         '
         'StatusAbrufenToolStripMenuItem
         '
         Me.StatusAbrufenToolStripMenuItem.Name = "StatusAbrufenToolStripMenuItem"
-        Me.StatusAbrufenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.StatusAbrufenToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
         Me.StatusAbrufenToolStripMenuItem.Text = "Status abrufen"
         '
+        'ContextMenuStrip3
+        '
+        Me.ContextMenuStrip3.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.XXXToolStripMenuItem})
+        Me.ContextMenuStrip3.Name = "cntxt"
+        Me.ContextMenuStrip3.Size = New System.Drawing.Size(96, 26)
+        '
+        'XXXToolStripMenuItem
+        '
+        Me.XXXToolStripMenuItem.Name = "XXXToolStripMenuItem"
+        Me.XXXToolStripMenuItem.Size = New System.Drawing.Size(95, 22)
+        Me.XXXToolStripMenuItem.Text = "XXX"
+        '
         'frmSendungsdetailsNEU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
@@ -5613,6 +5661,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ContextMenuStrip1.ResumeLayout(False)
         Me.ContextMenuStrip2.ResumeLayout(False)
         Me.cntDigicust.ResumeLayout(False)
+        Me.ContextMenuStrip3.ResumeLayout(False)
         Me.ResumeLayout(False)
 
     End Sub
@@ -6013,4 +6062,8 @@ Partial Class frmSendungsdetailsNEU
     Friend WithEvents Panel24 As Panel
     Friend WithEvents cntDigicust As ContextMenuStrip
     Friend WithEvents StatusAbrufenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents cboAbfertigungsLand As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents btnLKWUmmelden As Button
+    Friend WithEvents ContextMenuStrip3 As ContextMenuStrip
+    Friend WithEvents XXXToolStripMenuItem As ToolStripMenuItem
 End Class

Aviso/frmSendungsdetailsNEU.resx

@@ -2511,6 +2511,9 @@
   <metadata name="cntDigicust.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 56</value>
   </metadata>
+  <metadata name="ContextMenuStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>129, 56</value>
+  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAgIAAAAEAIAAoCAEAFgAAACgAAACAAAAAAAEAAAEAIAAAAAAAAAgBABMLAAATCwAAAAAAAAAA

Aviso/frmSendungsdetailsNEU.vb

@@ -280,12 +280,23 @@ Public Class frmSendungsdetailsNEU
 
     End Sub
 
+    Sub initGrenzstelle
 
+        lblGrenze.Text = ""
+        If AVISO.Grenzstelle.Replace("???", "") = "" Then
+            'lblGrenze.Text = SQL.getValueTxtBySql("Select basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS")
+            lblGrenze.Text = SQL.getValueTxtBySql("SELECT Code +' - ' + [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & If(AVISO.Zollstelle, "") & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL")
+        Else
+            Dim GRZ As New VERAG_PROG_ALLGEMEIN.cGrenzstelle(AVISO.Grenzstelle)
+            If GRZ IsNot Nothing AndAlso GRZ.hasEntry Then
+                lblGrenze.Text = AVISO.Grenzstelle & vbNewLine & If(GRZ.grz_ZollamtDST, "") & " " & If(GRZ.grz_ZollamtBezeichnung, "")
+            End If
+        End If
+    End Sub
 
     Private Sub frmSendungsdetails_Load(sender As Object, e As EventArgs) Handles Me.Load
         VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
         Try
-            lblGrenze.Text = ""
 
             Panel5.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor
             Panel15.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor
@@ -296,21 +307,7 @@ Public Class frmSendungsdetailsNEU
 
             txtWarenwertWaehrung.initSearchBox(Me.FindForm, " [Code] , [Description] As Land FROM tbl_DY_ZollDE_I0400_Waehrungsliste", {"Code", "Description"}, " (StartDate Is null Or StartDate< GETDATE()) And (EndDate Is null Or EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 150, 200)
 
-            If AVISO.Grenzstelle.Replace("???", "") = "" Then
+            initGrenzstelle
-                'lblGrenze.Text = SQL.getValueTxtBySql("Select basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS")
-                lblGrenze.Text = SQL.getValueTxtBySql("SELECT Code +' - ' + [Description]  FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & If(AVISO.Zollstelle, "") & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL")
-
-            Else
-
-                Dim GRZ As New VERAG_PROG_ALLGEMEIN.cGrenzstelle(AVISO.Grenzstelle)
-                If GRZ IsNot Nothing AndAlso GRZ.hasEntry Then
-
-                    lblGrenze.Text = If(GRZ.grz_ZollamtDST, "") & " " & If(GRZ.grz_ZollamtBezeichnung, "")
-
-                End If
-
-
-            End If
 
             initVorpapiere()
 
@@ -415,6 +412,34 @@ Public Class frmSendungsdetailsNEU
                 Button19.Visible = True
             End If
 
+            ContextMenuStrip3.Items.Clear()
+            Dim dt = SQL.loadDgvBySql("SELECT [grz_Grenzstelle],grz_BezeichnungCBO FROM [AVISO].[dbo].[tblGrenzstelle] where grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "'", "AVISO")
+            If dt IsNot Nothing Then
+                dt.Rows.Add({"???", "??? - andere"})
+                For Each r As DataRow In dt.Rows
+                    Dim it As New ToolStripMenuItem
+                    it.Text = r("grz_BezeichnungCBO").ToString
+                    it.Tag = r("grz_Grenzstelle").ToString
+                    ContextMenuStrip3.Items.Add(it)
+                    AddHandler it.Click, Sub()
+                                             If it.Tag.ToString = "???" Then
+                                                 SAVE_ME()
+                                                 AVISO.Grenzstelle = "???"
+                                                 AvisoStatusFunctions.ummeldenAVISO(AVISO, it.Tag.ToString)
+                                                 cGlobal.Aktive_ID = AvisoId
+                                                 Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+                                                 Dim f As New frmEintragAviso
+                                                 f.ShowDialog(frmGrayOut)
+                                                 frmGrayOut.Close()
+                                                 AVISO = AvisoDAL.LesenAviso(AvisoId, "")
+                                             Else
+                                                 AvisoStatusFunctions.ummeldenAVISO(AVISO, it.Tag.ToString)
+                                             End If
+                                             Me.initDataBinding()
+                                         End Sub
+                Next
+            End If
+
 
             cboFiliale._allowFreiText = Nothing
             Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER
@@ -1098,7 +1123,8 @@ Public Class frmSendungsdetailsNEU
             '  lblEmpfAufschubEustTxt.Visible = False
             'KundenAtrNr:
 
-            cboAbfertigungsart.fillWithSQL("SELECT [Abfertigungsart],[Abfertigungsbezeichnung] FROM [Abfertigungsarten] ", True, "FMZOLL", True)
+            cboAbfertigungsLand.fillWithSQL("SELECT [AbfertigungsLand],AbfertigungsLand FROM [AbfertigungsLaender] WHERE Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' OR (Firma is null and cluster is null)", False, "FMZOLL", True)
+
             Dim whereFiliale = ""
             'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
             '    Case "VERAG"
@@ -1183,7 +1209,9 @@ Public Class frmSendungsdetailsNEU
             txtAbfertigungsnummer.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr, String.Empty)
             txtUnterNr.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).UnterNr, String.Empty)
             If txtUnterNr.Text = "" Then txtUnterNr.Text = "0"
+            cboAbfertigungsLand._value = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Zollsystem_Land, String.Empty)
             cboAbfertigungsart._value = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID, String.Empty)
+            ' checkinitOLDAbfertigungsart(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID) --> weiter unten
 
             '     txtEmpfaengerBonitaet.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Bonitaet, "")
             '  txtEmpfaengerAnsprechpartner.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Ansprechperson, "")
@@ -1417,8 +1445,10 @@ Public Class frmSendungsdetailsNEU
             initTab()
             initGesColliGewicht()
             '  initKdInfo(-1)
+            initGrenzstelle()
 
             initSND_CHAT(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
+            checkinitOLDAbfertigungsart(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID)
 
 
             SENDUNG_LIST(CURRENT_INDEX).LOAD_VORKOSTEN()
@@ -1647,6 +1677,7 @@ Public Class frmSendungsdetailsNEU
         If SENDUNG_LIST(CURRENT_INDEX).FilialenNr <= 0 Then SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr = Nothing
         SENDUNG_LIST(CURRENT_INDEX).UnterNr = IIf(IsNumeric(txtUnterNr.Text), txtUnterNr.Text, Nothing)
         SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID = IIf(IsNumeric(cboAbfertigungsart._value), cboAbfertigungsart._value, Nothing)
+        SENDUNG_LIST(CURRENT_INDEX).tblSnd_Zollsystem_Land = cboAbfertigungsLand._value
 
         ' SENDUNG_LIST(CURRENT_INDEX).tblSnd_Bonitaet = txtEmpfaengerBonitaet.Text
         '  SENDUNG_LIST(CURRENT_INDEX).tblSnd_Ansprechperson = txtEmpfaengerAnsprechpartner.Text
@@ -2976,11 +3007,13 @@ Public Class frmSendungsdetailsNEU
         Label4.Visible = (cboFiliale._value = "7001")
 
         Dim tmp = cboAbfertigungsart._value
-        If IsNumeric(cboFiliale._value) Then
+        initAbfertigungsart()
-            cboAbfertigungsart.fillWithSQL("SELECT Abfertigungsarten.Abfertigungsart,[Abfertigungsbezeichnung] FROM [Abfertigungsarten] INNER JOIN tblAbfertigungsartenFiliale ON tblAbfertigungsartenFiliale.Abfertigungsart=Abfertigungsarten.Abfertigungsart  where Filialennr=" & cboFiliale._value & "", True, "FMZOLL", True)
+
-        Else
+        'If IsNumeric(cboFiliale._value) Then
-            cboAbfertigungsart.fillWithSQL("SELECT Abfertigungsart,[Abfertigungsbezeichnung]  FROM [Abfertigungsarten]", True, "FMZOLL", True)
+        '    cboAbfertigungsart.fillWithSQL("SELECT Abfertigungsarten.Abfertigungsart,[Abfertigungsbezeichnung] FROM [Abfertigungsarten] INNER JOIN tblAbfertigungsartenFiliale ON tblAbfertigungsartenFiliale.Abfertigungsart=Abfertigungsarten.Abfertigungsart  where Filialennr=" & cboFiliale._value & "", True, "FMZOLL", True)
-        End If
+        'Else
+        '    cboAbfertigungsart.fillWithSQL("SELECT Abfertigungsart,[Abfertigungsbezeichnung]  FROM [Abfertigungsarten]", True, "FMZOLL", True)
+        'End If
         cboAbfertigungsart.changeItem(tmp)
         If cboAbfertigungsart._value = "" And cboAbfertigungsart.Items.Count = 2 Then
             cboAbfertigungsart.SelectedItem = cboAbfertigungsart.Items(1)
@@ -6508,4 +6541,45 @@ Public Class frmSendungsdetailsNEU
         initdgvDigicust()
 
     End Sub
+
+    Sub initAbfertigungsart(Optional fillwithAbfNr As Boolean = False, Optional AbfNr As Object = Nothing)
+        Dim abfTmp As String = cboAbfertigungsart._value
+        cboAbfertigungsart.fillWithSQL("
+            SELECT AA.Abfertigungsart,AA.[Abfertigungsbezeichnung] FROM [Abfertigungsarten]as  AA 
+            INNER JOIN AbfertigungsLaenderAbfertigungsarten as ALA ON AA.Abfertigungsart=ALA.Abfertigungsart 
+            INNER JOIN tblAbfertigungsartenFiliale ON tblAbfertigungsartenFiliale.Abfertigungsart=AA.Abfertigungsart    
+            WHERE ALA.[AbfertigungsLand]='" & cboAbfertigungsLand._value & "' 
+            AND  Filialennr='" & cboFiliale._value & "'
+            GROUP BY AA.Abfertigungsart,AA.[Abfertigungsbezeichnung]", True, "FMZOLL", True)
+        If abfTmp <> "" Then
+            cboAbfertigungsart.changeItem(abfTmp)
+        End If
+    End Sub
+
+    Sub checkinitOLDAbfertigungsart(Optional AbfNr As Object = Nothing)
+
+        If cboAbfertigungsart.Items.Count <= 1 Then
+            If AbfNr IsNot Nothing AndAlso AbfNr.ToString <> "" Then
+
+                cboAbfertigungsart.fillWithSQL("
+            SELECT AA.Abfertigungsart,AA.[Abfertigungsbezeichnung] FROM [Abfertigungsarten]as  AA 
+            INNER JOIN tblAbfertigungsartenFiliale ON tblAbfertigungsartenFiliale.Abfertigungsart=AA.Abfertigungsart    
+            WHERE Filialennr='" & cboFiliale._value & "'
+            GROUP BY AA.Abfertigungsart,AA.[Abfertigungsbezeichnung]", True, "FMZOLL", True)
+
+                cboAbfertigungsart.changeItem(AbfNr)
+            End If
+        End If
+    End Sub
+
+
+
+    Private Sub cboAbfertigungsLand_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboAbfertigungsLand.SelectedIndexChanged
+        initAbfertigungsart()
+    End Sub
+
+    Private Sub btnLKWUmmelden_Click(sender As Object, e As EventArgs) Handles btnLKWUmmelden.Click
+        ContextMenuStrip3.Show(Cursor.Position)
+    End Sub
+
 End Class

Aviso/usrcntlAktDetails.vb

@@ -1231,6 +1231,27 @@ Public Class usrcntlAktDetails
                     VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
                     init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen()
 
+                Case "103"
+                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
+                    myVermerk.VermerkCodeId = 104
+                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
+                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
+                    init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen()
+
+                Case "105"
+                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
+                    myVermerk.VermerkCodeId = 106
+                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
+                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
+                    init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen()
+
+                Case "107"
+                    myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
+                    myVermerk.VermerkCodeId = 108
+                    Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
+                    VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
+                    init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen()
+
             End Select
             loaded = False
             '  Dim tmpIndex = -1
@@ -1436,7 +1457,21 @@ Public Class usrcntlAktDetails
                                 optionCell.Value = "Erledigt"
                                 optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Sonstiger Grund erledigt' einzutragen."
                             End If
-
+                        Case 103
+                            If Not existCodeInGridVermerke(104, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
+                                optionCell.Value = "Gewicht/Packstücke erhalten"
+                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Gewicht/Packstücke erhalten' einzutragen."
+                            End If
+                        Case 105
+                            If Not existCodeInGridVermerke(106, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
+                                optionCell.Value = "Zolltarifnummer erhalten"
+                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Zolltarifnummer erhalten' einzutragen."
+                            End If
+                        Case 107
+                            If Not existCodeInGridVermerke(108, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
+                                optionCell.Value = "Kostenbestätigung erhalten"
+                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Kostenbestätigung erhalten' einzutragen."
+                            End If
                     End Select
                 End If