diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj
index 01146a9..554c1bd 100644
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -1231,6 +1231,7 @@
frmAuswertung.vb
+ Designer
frmBarcodeGenerator.vb
diff --git a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb
index 80eacaa..decd201 100644
--- a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb
+++ b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb
@@ -215,7 +215,7 @@ Public Class frmAvisoWeiterleiten
Sub addBtn(flpFirma As FlowLayoutPanel, WLart As String, id As String, bezeichnung As String, Optional enabled As Boolean = True, Optional bezeichnungFirma As String = "")
Dim btn As New Button
btn.FlatStyle = FlatStyle.Flat
- btn.Size = New Size(180, 40)
+ btn.Size = New Size(180, 45)
btn.Font = New Font(Me.Font.FontFamily, 10, FontStyle.Regular)
btn.Text = bezeichnung
btn.Tag = id
@@ -269,6 +269,7 @@ Public Class frmAvisoWeiterleiten
addBtn(flpFirma, "N", "NKD", "VERAG Nickelsdorf")
addBtn(flpFirma, "N", "NEU", "VERAG Neuhaus")
addBtn(flpFirma, "N", "DTB", "VERAG Dettelbach")
+ addBtn(flpFirma, "N", "DTB", "VERAG Neunkirchen (Saar)")
addBtn(flpFirma, "A", "FISK", "VERAG Fiskal")
diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb
index 43b0cd6..8ba4092 100644
--- a/Aviso/frmSendungsdetailsNEU.Designer.vb
+++ b/Aviso/frmSendungsdetailsNEU.Designer.vb
@@ -24,16 +24,16 @@ Partial Class frmSendungsdetailsNEU
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSendungsdetailsNEU))
- 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 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 DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.pnl = New System.Windows.Forms.Panel()
Me.Panel4 = New System.Windows.Forms.Panel()
Me.TabControl1 = New System.Windows.Forms.TabControl()
@@ -434,6 +434,8 @@ Partial Class frmSendungsdetailsNEU
Me.StatusAbrufenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.XXXToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.EmpfängerToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+ Me.AuftraggeberToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.pnl.SuspendLayout()
Me.Panel4.SuspendLayout()
Me.TabControl1.SuspendLayout()
@@ -1506,18 +1508,18 @@ Partial Class frmSendungsdetailsNEU
Me.gridVermerke.AllowUserToAddRows = False
Me.gridVermerke.AllowUserToDeleteRows = False
Me.gridVermerke.AllowUserToResizeRows = False
- DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
- DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+ DataGridViewCellStyle11.BackColor = System.Drawing.Color.Azure
+ DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
Me.gridVermerke.BackgroundColor = System.Drawing.Color.White
- DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue
- DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
- DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2
+ DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle12.BackColor = System.Drawing.Color.LightBlue
+ DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
+ DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12
Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill
Me.gridVermerke.Location = New System.Drawing.Point(0, 0)
@@ -1526,8 +1528,8 @@ Partial Class frmSendungsdetailsNEU
Me.gridVermerke.ReadOnly = True
Me.gridVermerke.RowHeadersVisible = False
Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
- DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle3
+ DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle13
Me.gridVermerke.RowTemplate.Height = 20
Me.gridVermerke.RowTemplate.ReadOnly = True
Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
@@ -1555,18 +1557,18 @@ Partial Class frmSendungsdetailsNEU
Me.dgvATEZNCTS.AllowUserToAddRows = False
Me.dgvATEZNCTS.AllowUserToDeleteRows = False
Me.dgvATEZNCTS.AllowUserToResizeRows = False
- DataGridViewCellStyle4.BackColor = System.Drawing.Color.Azure
- DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.dgvATEZNCTS.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
+ DataGridViewCellStyle14.BackColor = System.Drawing.Color.Azure
+ DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvATEZNCTS.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14
Me.dgvATEZNCTS.BackgroundColor = System.Drawing.Color.White
- DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle5.BackColor = System.Drawing.Color.LightBlue
- DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
- DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.dgvATEZNCTS.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5
+ DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle15.BackColor = System.Drawing.Color.LightBlue
+ DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+ DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvATEZNCTS.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15
Me.dgvATEZNCTS.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
Me.dgvATEZNCTS.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvATEZNCTS.Location = New System.Drawing.Point(3, 48)
@@ -1575,8 +1577,8 @@ Partial Class frmSendungsdetailsNEU
Me.dgvATEZNCTS.ReadOnly = True
Me.dgvATEZNCTS.RowHeadersVisible = False
Me.dgvATEZNCTS.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
- DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.dgvATEZNCTS.RowsDefaultCellStyle = DataGridViewCellStyle6
+ DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvATEZNCTS.RowsDefaultCellStyle = DataGridViewCellStyle16
Me.dgvATEZNCTS.RowTemplate.Height = 20
Me.dgvATEZNCTS.RowTemplate.ReadOnly = True
Me.dgvATEZNCTS.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
@@ -1627,18 +1629,18 @@ Partial Class frmSendungsdetailsNEU
Me.dgvDigicust.AllowUserToAddRows = False
Me.dgvDigicust.AllowUserToDeleteRows = False
Me.dgvDigicust.AllowUserToResizeRows = False
- DataGridViewCellStyle7.BackColor = System.Drawing.Color.Azure
- DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.dgvDigicust.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+ DataGridViewCellStyle17.BackColor = System.Drawing.Color.Azure
+ DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvDigicust.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
Me.dgvDigicust.BackgroundColor = System.Drawing.Color.White
- DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle8.BackColor = System.Drawing.Color.LightBlue
- DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
- DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.dgvDigicust.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle8
+ DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle18.BackColor = System.Drawing.Color.LightBlue
+ DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+ DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvDigicust.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18
Me.dgvDigicust.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
Me.dgvDigicust.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvDigicust.Location = New System.Drawing.Point(0, 45)
@@ -1647,8 +1649,8 @@ Partial Class frmSendungsdetailsNEU
Me.dgvDigicust.ReadOnly = True
Me.dgvDigicust.RowHeadersVisible = False
Me.dgvDigicust.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
- DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.dgvDigicust.RowsDefaultCellStyle = DataGridViewCellStyle9
+ DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvDigicust.RowsDefaultCellStyle = DataGridViewCellStyle19
Me.dgvDigicust.RowTemplate.Height = 20
Me.dgvDigicust.RowTemplate.ReadOnly = True
Me.dgvDigicust.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
@@ -2417,8 +2419,8 @@ Partial Class frmSendungsdetailsNEU
'clmnPreis
'
Me.clmnPreis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
- DataGridViewCellStyle10.Format = "C2"
- Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle10
+ DataGridViewCellStyle20.Format = "C2"
+ Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle20
Me.clmnPreis.HeaderText = "Preis"
Me.clmnPreis.MaxInputLength = 15
Me.clmnPreis.Name = "clmnPreis"
@@ -5332,6 +5334,7 @@ Partial Class frmSendungsdetailsNEU
'
'AntragQualitätskontrolleToolStripMenuItem
'
+ Me.AntragQualitätskontrolleToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EmpfängerToolStripMenuItem1, Me.AuftraggeberToolStripMenuItem1})
Me.AntragQualitätskontrolleToolStripMenuItem.Name = "AntragQualitätskontrolleToolStripMenuItem"
Me.AntragQualitätskontrolleToolStripMenuItem.Size = New System.Drawing.Size(262, 22)
Me.AntragQualitätskontrolleToolStripMenuItem.Text = "Antrag Qualitätskontrolle"
@@ -5565,6 +5568,18 @@ Partial Class frmSendungsdetailsNEU
Me.XXXToolStripMenuItem.Size = New System.Drawing.Size(95, 22)
Me.XXXToolStripMenuItem.Text = "XXX"
'
+ 'EmpfängerToolStripMenuItem1
+ '
+ Me.EmpfängerToolStripMenuItem1.Name = "EmpfängerToolStripMenuItem1"
+ Me.EmpfängerToolStripMenuItem1.Size = New System.Drawing.Size(180, 22)
+ Me.EmpfängerToolStripMenuItem1.Text = "Empfänger"
+ '
+ 'AuftraggeberToolStripMenuItem1
+ '
+ Me.AuftraggeberToolStripMenuItem1.Name = "AuftraggeberToolStripMenuItem1"
+ Me.AuftraggeberToolStripMenuItem1.Size = New System.Drawing.Size(180, 22)
+ Me.AuftraggeberToolStripMenuItem1.Text = "Auftraggeber"
+ '
'frmSendungsdetailsNEU
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
@@ -6071,4 +6086,6 @@ Partial Class frmSendungsdetailsNEU
Friend WithEvents XXXToolStripMenuItem As ToolStripMenuItem
Friend WithEvents txteori_Pruef As TextBox
Friend WithEvents txtUIDPruef As TextBox
+ Friend WithEvents EmpfängerToolStripMenuItem1 As ToolStripMenuItem
+ Friend WithEvents AuftraggeberToolStripMenuItem1 As ToolStripMenuItem
End Class
diff --git a/Aviso/frmSendungsdetailsNEU.resx b/Aviso/frmSendungsdetailsNEU.resx
index 0e9e574..ded6036 100644
--- a/Aviso/frmSendungsdetailsNEU.resx
+++ b/Aviso/frmSendungsdetailsNEU.resx
@@ -1531,6 +1531,9 @@
mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
+
+ 296, 17
+
iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
@@ -1651,6 +1654,18 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAHtJREFUSEvt
@@ -2059,6 +2074,9 @@
174, 17
+
+ 404, 17
+
596, 17
diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb
index 6b44959..aa95c5f 100644
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -3697,7 +3697,7 @@ Public Class frmSendungsdetailsNEU
Select Case FormularArt
Case SDL.FormularManagerArten.Importaviso_VK : SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Importaviso_VK, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG_LIST(CURRENT_INDEX), AVISO, ROLLE})
Case SDL.FormularManagerArten.Zollbeschau_Protokoll : SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Zollbeschau_Protokoll, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG_LIST(CURRENT_INDEX), AVISO, ROLLE})
- Case SDL.FormularManagerArten.Qualitaetskontrolle : SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Qualitaetskontrolle, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG_LIST(CURRENT_INDEX), AVISO})
+ ' Case SDL.FormularManagerArten.Qualitaetskontrolle : SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Qualitaetskontrolle, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG_LIST(CURRENT_INDEX), AVISO})
Case SDL.FormularManagerArten.Importaviso
Dim f As SDL.frmFormulare = Nothing
SDL.FormularManagerNEU.OPEN_FORM_Byref(SDL.FormularManagerArten.Importaviso, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG_LIST(CURRENT_INDEX), AVISO, ROLLE},, f)
@@ -4075,7 +4075,7 @@ Public Class frmSendungsdetailsNEU
'ATA FREMD!!!
If sender Is ToolStripMenuItem15 Then
- Mail.Subject = "Kennzeichen: " & AVISO.LKW_Nr & " | Grenze: " & lblGrenze.Text
+ Mail.Subject = "Kennzeichen: " & AVISO.LKW_Nr & " | Grenze: " & lblGrenze.Text.Replace(vbNewLine, " ")
If If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender, "") <> "" Then Mail.Subject &= " | Absender: " & SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender
If If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht, "") <> "" Then Mail.Subject &= " | Gewicht: " & SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht
@@ -4101,7 +4101,7 @@ Public Class frmSendungsdetailsNEU
Dim TextHTML = ""
TextHTML &= "Sehr geehrte Damen und Herren,
"
TextHTML &= "
"
- TextHTML &= "der LKW meldet sich mit der Ware lt. Anhang bei uns am Warenort Zollamt " & lblGrenze.Text & ", bitte um Vorbereitung der Verzollung.
"
+ TextHTML &= "der LKW meldet sich mit der Ware lt. Anhang bei uns am Warenort Zollamt " & lblGrenze.Text.Replace(vbNewLine, " ") & ", bitte um Vorbereitung der Verzollung.
"
TextHTML &= "
"
TextHTML &= "Wir melden uns bei LKW-Ankunft mit der ATB Nummer.
"
TextHTML &= "
"
@@ -4388,7 +4388,7 @@ Public Class frmSendungsdetailsNEU
'ATA FREMD!!!
If sender Is ToolStripMenuItem15 Then
- Mail.Subject = "Kennzeichen: " & AVISO.LKW_Nr & " | Grenze: " & lblGrenze.Text
+ Mail.Subject = "Kennzeichen: " & AVISO.LKW_Nr & " | Grenze: " & lblGrenze.Text.Replace(vbNewLine, " ")
Dim TextHTML = ""
TextHTML &= "Sehr geehrte Damen und Herren,
"
@@ -6597,14 +6597,22 @@ Public Class frmSendungsdetailsNEU
ContextMenuStrip3.Show(Cursor.Position)
End Sub
- Private Sub AntragQualitätskontrolleToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AntragQualitätskontrolleToolStripMenuItem.Click
- Try
- FormularArt = SDL.FormularManagerArten.Qualitaetskontrolle
- cntxtVorauskasse.Show(Cursor.Position)
+ 'Private Sub AntragQualitätskontrolleToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AntragQualitätskontrolleToolStripMenuItem.Click
+ ' Try
+ ' FormularArt = SDL.FormularManagerArten.Qualitaetskontrolle
+ ' cntxtVorauskasse.Show(Cursor.Position)
- Catch ex As Exception
- VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
- End Try
+ ' Catch ex As Exception
+ ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ ' End Try
+ 'End Sub
+
+ Private Sub EmpfängerToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles EmpfängerToolStripMenuItem1.Click
+ SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Qualitaetskontrolle, SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr, {SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr, SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger, SENDUNG_LIST(CURRENT_INDEX), AVISO})
+ End Sub
+
+ Private Sub AuftraggeberToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles AuftraggeberToolStripMenuItem1.Click
+ SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Qualitaetskontrolle, SENDUNG_LIST(CURRENT_INDEX).tblSnd_AuftraggeberKdNr, {SENDUNG_LIST(CURRENT_INDEX).tblSnd_AuftraggeberKdNr, SENDUNG_LIST(CURRENT_INDEX).tblSnd_Auftraggeber, SENDUNG_LIST(CURRENT_INDEX), AVISO})
End Sub
End Class