Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb

@@ -34,13 +34,18 @@ Partial Class usrcntlKundeBearbeitenFull
         Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.tbcntrDetails = New System.Windows.Forms.TabControl()
         Me.tbAbfertigung = New System.Windows.Forms.TabPage()
+        Me.cbxVerzolltBeiExport = New System.Windows.Forms.CheckBox()
+        Me.txtAbf_Planzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label42 = New System.Windows.Forms.Label()
+        Me.cboFremdspeditionExport = New System.Windows.Forms.ComboBox()
         Me.lblHinweisKdNr = New System.Windows.Forms.Label()
-        Me.cboFremdspedition = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboFremdspedition = New System.Windows.Forms.ComboBox()
         Me.cbxVerzolltBei = New System.Windows.Forms.CheckBox()
         Me.cbxBesonderheitenNEU = New System.Windows.Forms.CheckBox()
         Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten()
         Me.tbcntrAbf = New System.Windows.Forms.TabControl()
         Me.TabPage4 = New System.Windows.Forms.TabPage()
+        Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
         Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung()
         Me.rtbLKWFreigabeSenden = New System.Windows.Forms.RichTextBox()
         Me.Label18 = New System.Windows.Forms.Label()
@@ -62,8 +67,6 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.Label38 = New System.Windows.Forms.Label()
         Me.txtAbf_ZollVmVom = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.cbxAbf_Ausfuhr = New System.Windows.Forms.CheckBox()
-        Me.txtAbf_Planzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.Label42 = New System.Windows.Forms.Label()
         Me.txtAbf_Euroeinführung = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtAbf_ErsteAbfertigung = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.cbxAbf_Fiskal = New System.Windows.Forms.CheckBox()
@@ -80,6 +83,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.Label41 = New System.Windows.Forms.Label()
         Me.Label37 = New System.Windows.Forms.Label()
         Me.rtbAbf_Besonderheiten = New System.Windows.Forms.RichTextBox()
+        Me.Panel1 = New System.Windows.Forms.Panel()
         Me.tbFiskal = New System.Windows.Forms.TabPage()
         Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten()
         Me.tbVerrechnung = New System.Windows.Forms.TabPage()
@@ -317,10 +321,6 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.txtERROR = New System.Windows.Forms.TextBox()
         Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.cboFremdspeditionExport = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.cbxVerzolltBeiExport = New System.Windows.Forms.CheckBox()
-        Me.Panel1 = New System.Windows.Forms.Panel()
-        Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
         Me.tbcntrDetails.SuspendLayout()
         Me.tbAbfertigung.SuspendLayout()
         Me.tbcntrAbf.SuspendLayout()
@@ -403,6 +403,58 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.tbAbfertigung.Text = " Abfertigung"
         Me.tbAbfertigung.UseVisualStyleBackColor = True
         '
+        'cbxVerzolltBeiExport
+        '
+        Me.cbxVerzolltBeiExport.AutoSize = True
+        Me.cbxVerzolltBeiExport.Location = New System.Drawing.Point(465, 224)
+        Me.cbxVerzolltBeiExport.Name = "cbxVerzolltBeiExport"
+        Me.cbxVerzolltBeiExport.Size = New System.Drawing.Size(59, 17)
+        Me.cbxVerzolltBeiExport.TabIndex = 241
+        Me.cbxVerzolltBeiExport.Text = "Export:"
+        Me.cbxVerzolltBeiExport.UseVisualStyleBackColor = True
+        '
+        'txtAbf_Planzahl
+        '
+        Me.txtAbf_Planzahl._DateTimeOnly = False
+        Me.txtAbf_Planzahl._numbersOnly = False
+        Me.txtAbf_Planzahl._numbersOnlyKommastellen = ""
+        Me.txtAbf_Planzahl._numbersOnlyTrennzeichen = True
+        Me.txtAbf_Planzahl._Prozent = False
+        Me.txtAbf_Planzahl._ShortDateNew = False
+        Me.txtAbf_Planzahl._ShortDateOnly = False
+        Me.txtAbf_Planzahl._TimeOnly = False
+        Me.txtAbf_Planzahl._TimeOnly_Seconds = False
+        Me.txtAbf_Planzahl._value = Nothing
+        Me.txtAbf_Planzahl._Waehrung = False
+        Me.txtAbf_Planzahl._WaehrungZeichen = True
+        Me.txtAbf_Planzahl.ForeColor = System.Drawing.Color.Black
+        Me.txtAbf_Planzahl.Location = New System.Drawing.Point(526, 248)
+        Me.txtAbf_Planzahl.MaxLineLength = -1
+        Me.txtAbf_Planzahl.MaxLines_Warning = ""
+        Me.txtAbf_Planzahl.MaxLines_Warning_Label = Nothing
+        Me.txtAbf_Planzahl.Name = "txtAbf_Planzahl"
+        Me.txtAbf_Planzahl.Size = New System.Drawing.Size(60, 20)
+        Me.txtAbf_Planzahl.TabIndex = 15
+        '
+        'Label42
+        '
+        Me.Label42.AutoSize = True
+        Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label42.Location = New System.Drawing.Point(470, 251)
+        Me.Label42.Name = "Label42"
+        Me.Label42.Size = New System.Drawing.Size(50, 13)
+        Me.Label42.TabIndex = 14
+        Me.Label42.Text = "Planzahl:"
+        '
+        'cboFremdspeditionExport
+        '
+        Me.cboFremdspeditionExport.Enabled = False
+        Me.cboFremdspeditionExport.Items.AddRange(New Object() {"", "SEBERT", "SCHENKER", "AS-SPED", "NIETEN", "BUCHAUER"})
+        Me.cboFremdspeditionExport.Location = New System.Drawing.Point(526, 222)
+        Me.cboFremdspeditionExport.Name = "cboFremdspeditionExport"
+        Me.cboFremdspeditionExport.Size = New System.Drawing.Size(126, 21)
+        Me.cboFremdspeditionExport.TabIndex = 240
+        '
         'lblHinweisKdNr
         '
         Me.lblHinweisKdNr.AutoSize = True
@@ -416,17 +468,12 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         'cboFremdspedition
         '
-        Me.cboFremdspedition._allowedValuesFreiText = Nothing
-        Me.cboFremdspedition._allowFreiText = False
-        Me.cboFremdspedition._value = ""
         Me.cboFremdspedition.Enabled = False
-        Me.cboFremdspedition.FormattingEnabled = True
+        Me.cboFremdspedition.Items.AddRange(New Object() {"", "SEBERT", "SCHENKER", "AS-SPED", "NIETEN", "BUCHAUER"})
-        Me.cboFremdspedition.Items.AddRange(New Object() {"SEBERT", "SCHENKER", "AS-SPED", "NIETEN", "BUCHAUER"})
         Me.cboFremdspedition.Location = New System.Drawing.Point(333, 222)
         Me.cboFremdspedition.Name = "cboFremdspedition"
         Me.cboFremdspedition.Size = New System.Drawing.Size(126, 21)
         Me.cboFremdspedition.TabIndex = 238
-        Me.cboFremdspedition.Text = "SEBERT"
         '
         'cbxVerzolltBei
         '
@@ -485,6 +532,13 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.TabPage4.Text = " Aviso / E-Mail Benachrichtigung"
         Me.TabPage4.UseVisualStyleBackColor = True
         '
+        'FlowLayoutPanel1
+        '
+        Me.FlowLayoutPanel1.Location = New System.Drawing.Point(249, 94)
+        Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
+        Me.FlowLayoutPanel1.Size = New System.Drawing.Size(200, 100)
+        Me.FlowLayoutPanel1.TabIndex = 7
+        '
         'UsrCntlKundenAvisoMailBenachrichtigung1
         '
         Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White
@@ -749,39 +803,6 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.cbxAbf_Ausfuhr.Text = "Ausfuhr"
         Me.cbxAbf_Ausfuhr.UseVisualStyleBackColor = True
         '
-        'txtAbf_Planzahl
-        '
-        Me.txtAbf_Planzahl._DateTimeOnly = False
-        Me.txtAbf_Planzahl._numbersOnly = False
-        Me.txtAbf_Planzahl._numbersOnlyKommastellen = ""
-        Me.txtAbf_Planzahl._numbersOnlyTrennzeichen = True
-        Me.txtAbf_Planzahl._Prozent = False
-        Me.txtAbf_Planzahl._ShortDateNew = False
-        Me.txtAbf_Planzahl._ShortDateOnly = False
-        Me.txtAbf_Planzahl._TimeOnly = False
-        Me.txtAbf_Planzahl._TimeOnly_Seconds = False
-        Me.txtAbf_Planzahl._value = Nothing
-        Me.txtAbf_Planzahl._Waehrung = False
-        Me.txtAbf_Planzahl._WaehrungZeichen = True
-        Me.txtAbf_Planzahl.ForeColor = System.Drawing.Color.Black
-        Me.txtAbf_Planzahl.Location = New System.Drawing.Point(526, 248)
-        Me.txtAbf_Planzahl.MaxLineLength = -1
-        Me.txtAbf_Planzahl.MaxLines_Warning = ""
-        Me.txtAbf_Planzahl.MaxLines_Warning_Label = Nothing
-        Me.txtAbf_Planzahl.Name = "txtAbf_Planzahl"
-        Me.txtAbf_Planzahl.Size = New System.Drawing.Size(60, 20)
-        Me.txtAbf_Planzahl.TabIndex = 15
-        '
-        'Label42
-        '
-        Me.Label42.AutoSize = True
-        Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label42.Location = New System.Drawing.Point(470, 251)
-        Me.Label42.Name = "Label42"
-        Me.Label42.Size = New System.Drawing.Size(50, 13)
-        Me.Label42.TabIndex = 14
-        Me.Label42.Text = "Planzahl:"
-        '
         'txtAbf_Euroeinführung
         '
         Me.txtAbf_Euroeinführung._DateTimeOnly = False
@@ -989,6 +1010,14 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.rtbAbf_Besonderheiten.TabIndex = 2
         Me.rtbAbf_Besonderheiten.Text = ""
         '
+        'Panel1
+        '
+        Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke
+        Me.Panel1.Location = New System.Drawing.Point(167, 219)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(499, 26)
+        Me.Panel1.TabIndex = 242
+        '
         'tbFiskal
         '
         Me.tbFiskal.Controls.Add(Me.UsrCntlKundeFiskaldaten1)
@@ -4314,45 +4343,6 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail"
         Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
         '
-        'cboFremdspeditionExport
-        '
-        Me.cboFremdspeditionExport._allowedValuesFreiText = Nothing
-        Me.cboFremdspeditionExport._allowFreiText = False
-        Me.cboFremdspeditionExport._value = ""
-        Me.cboFremdspeditionExport.Enabled = False
-        Me.cboFremdspeditionExport.FormattingEnabled = True
-        Me.cboFremdspeditionExport.Items.AddRange(New Object() {"SEBERT", "SCHENKER", "AS-SPED", "NIETEN", "BUCHAUER"})
-        Me.cboFremdspeditionExport.Location = New System.Drawing.Point(526, 222)
-        Me.cboFremdspeditionExport.Name = "cboFremdspeditionExport"
-        Me.cboFremdspeditionExport.Size = New System.Drawing.Size(126, 21)
-        Me.cboFremdspeditionExport.TabIndex = 240
-        Me.cboFremdspeditionExport.Text = "SEBERT"
-        '
-        'cbxVerzolltBeiExport
-        '
-        Me.cbxVerzolltBeiExport.AutoSize = True
-        Me.cbxVerzolltBeiExport.Location = New System.Drawing.Point(465, 224)
-        Me.cbxVerzolltBeiExport.Name = "cbxVerzolltBeiExport"
-        Me.cbxVerzolltBeiExport.Size = New System.Drawing.Size(59, 17)
-        Me.cbxVerzolltBeiExport.TabIndex = 241
-        Me.cbxVerzolltBeiExport.Text = "Export:"
-        Me.cbxVerzolltBeiExport.UseVisualStyleBackColor = True
-        '
-        'Panel1
-        '
-        Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.Panel1.Location = New System.Drawing.Point(167, 219)
-        Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(499, 26)
-        Me.Panel1.TabIndex = 242
-        '
-        'FlowLayoutPanel1
-        '
-        Me.FlowLayoutPanel1.Location = New System.Drawing.Point(249, 94)
-        Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
-        Me.FlowLayoutPanel1.Size = New System.Drawing.Size(200, 100)
-        Me.FlowLayoutPanel1.TabIndex = 7
-        '
         'usrcntlKundeBearbeitenFull
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -4705,7 +4695,7 @@ Partial Class usrcntlKundeBearbeitenFull
     Friend WithEvents UsrCntlKundeFiskaldaten1 As usrCntlKundeFiskaldaten
     Friend WithEvents UsrCntlKundenBesonderheiten1 As usrCntlKundenBesonderheiten
     Friend WithEvents cbxBesonderheitenNEU As CheckBox
-    Friend WithEvents cboFremdspedition As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cboFremdspedition As System.Windows.Forms.ComboBox
     Friend WithEvents cbxVerzolltBei As CheckBox
     Friend WithEvents Label93 As Label
     Friend WithEvents txtDebKdNr As VERAG_PROG_ALLGEMEIN.MyTextBox
@@ -4725,7 +4715,7 @@ Partial Class usrcntlKundeBearbeitenFull
     Friend WithEvents btnUIDPruef As Button
     Friend WithEvents Button13 As Button
     Friend WithEvents cbxVerzolltBeiExport As CheckBox
-    Friend WithEvents cboFremdspeditionExport As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cboFremdspeditionExport As System.Windows.Forms.ComboBox
     Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
     Friend WithEvents Panel1 As Panel
 End Class

SDL/kunden/usrcntlKundeBearbeitenFull.vb

@@ -1,4 +1,5 @@
 Imports System.ComponentModel
+Imports GrapeCity.ActiveReports.ReportsCore.Tools
 
 Public Class usrcntlKundeBearbeitenFull
 
@@ -367,9 +368,11 @@ Public Class usrcntlKundeBearbeitenFull
 
         cbxVerzolltBei.Checked = KUNDE_ERW.kde_KundeFremdspedition
         cboFremdspedition.Text = If(KUNDE_ERW.kde_verzolltBei, "")
+        'cboFremdspedition.changeItem(If(KUNDE_ERW.kde_verzolltBei, ""))
         cbxVerzolltBeiExport.Checked = KUNDE_ERW.kde_KundeFremdspeditionExport
-        cboFremdspeditionExport.Text = If(KUNDE_ERW.kde_verzolltBeiExport, "")
+        'cboFremdspeditionExport.changeItem(If(KUNDE_ERW.kde_verzolltBeiExport, ""))
-
+        cboFremdspeditionExport.Text = (If(KUNDE_ERW.kde_verzolltBeiExport, ""))
+        '   MsgBox(If(KUNDE_ERW.kde_verzolltBeiExport, ""))
         initBesonderheitenNEU()
 
         initKdKontakSpeziell()

VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb

@@ -892,7 +892,7 @@ Public Class cMessenger
             Try
                 Me.CHAT_MESSAGES_STATUS_LIST.Clear()
                 Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN()
-                    Using cmd As New SqlCommand("SELECT * FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMg_id  ", conn)
+                    Using cmd As New SqlCommand("SELECT * FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMg_id and chatMgSt_art = 'STAT' ", conn)
                         cmd.Parameters.AddWithValue("@chatMg_id", Me.chatMg_id)
                         Dim dr = cmd.ExecuteReader()
                         While dr.Read

VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb

@@ -938,18 +938,18 @@ Partial Class frmMessenger
         Me.cntxt.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.cntxt.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ChatDeaktivierenToolStripMenuItem, Me.toolChatReminder})
         Me.cntxt.Name = "cntxt"
-        Me.cntxt.Size = New System.Drawing.Size(181, 70)
+        Me.cntxt.Size = New System.Drawing.Size(168, 48)
         '
         'ChatDeaktivierenToolStripMenuItem
         '
         Me.ChatDeaktivierenToolStripMenuItem.Name = "ChatDeaktivierenToolStripMenuItem"
-        Me.ChatDeaktivierenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ChatDeaktivierenToolStripMenuItem.Size = New System.Drawing.Size(167, 22)
         Me.ChatDeaktivierenToolStripMenuItem.Text = "Chat deaktivieren"
         '
         'toolChatReminder
         '
         Me.toolChatReminder.Name = "toolChatReminder"
-        Me.toolChatReminder.Size = New System.Drawing.Size(180, 22)
+        Me.toolChatReminder.Size = New System.Drawing.Size(167, 22)
         Me.toolChatReminder.Text = "Reminder ein/aus"
         '
         'DataGridViewTextBoxColumn1