new

2021-09-07 08:46:12 +02:00
parent f2f992547d
commit 619a8c26bf
126 changed files with 7156 additions and 2215 deletions
--- a/SDL/kunden/frmKundenKontakteDetails.Designer.vb
+++ b/SDL/kunden/frmKundenKontakteDetails.Designer.vb
@@ -38,17 +38,25 @@ Partial Class frmKundenKontakteDetails
        Me.cboKontaktArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.lblAnsprechpartnerVN = New System.Windows.Forms.TextBox()
        Me.cboMannFrau = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.lblEmailCC = New System.Windows.Forms.TextBox()
+        Me.PictureBox6 = New System.Windows.Forms.PictureBox()
+        Me.lblEmailBCC = New System.Windows.Forms.TextBox()
+        Me.PictureBox7 = New System.Windows.Forms.PictureBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'btn
        '
        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btn.Location = New System.Drawing.Point(185, 235)
+        Me.btn.Location = New System.Drawing.Point(185, 293)
        Me.btn.Name = "btn"
        Me.btn.Size = New System.Drawing.Size(136, 39)
        Me.btn.TabIndex = 9
@@ -58,7 +66,7 @@ Partial Class frmKundenKontakteDetails
        'PictureBox1
        '
        Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
-        Me.PictureBox1.Image = Global.SDL.My.Resources.telefon
+        Me.PictureBox1.Image = Global.SDL.My.Resources.Resources.telefon
        Me.PictureBox1.Location = New System.Drawing.Point(17, 75)
        Me.PictureBox1.Name = "PictureBox1"
        Me.PictureBox1.Size = New System.Drawing.Size(25, 18)
@@ -71,7 +79,7 @@ Partial Class frmKundenKontakteDetails
        Me.lblAnsprechpartnerNN.BackColor = System.Drawing.Color.White
        Me.lblAnsprechpartnerNN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
        Me.lblAnsprechpartnerNN.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblAnsprechpartnerNN.Location = New System.Drawing.Point(304, 181)
+        Me.lblAnsprechpartnerNN.Location = New System.Drawing.Point(304, 239)
        Me.lblAnsprechpartnerNN.Name = "lblAnsprechpartnerNN"
        Me.lblAnsprechpartnerNN.Size = New System.Drawing.Size(200, 26)
        Me.lblAnsprechpartnerNN.TabIndex = 8
@@ -105,7 +113,7 @@ Partial Class frmKundenKontakteDetails
        Me.lblEmail.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
        Me.lblEmail.Cursor = System.Windows.Forms.Cursors.Hand
        Me.lblEmail.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblEmail.Location = New System.Drawing.Point(52, 151)
+        Me.lblEmail.Location = New System.Drawing.Point(52, 154)
        Me.lblEmail.Name = "lblEmail"
        Me.lblEmail.Size = New System.Drawing.Size(452, 26)
        Me.lblEmail.TabIndex = 5
@@ -114,8 +122,8 @@ Partial Class frmKundenKontakteDetails
        'PictureBox4
        '
        Me.PictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
-        Me.PictureBox4.Image = Global.SDL.My.Resources.email
-        Me.PictureBox4.Location = New System.Drawing.Point(20, 153)
+        Me.PictureBox4.Image = Global.SDL.My.Resources.Resources.email
+        Me.PictureBox4.Location = New System.Drawing.Point(20, 156)
        Me.PictureBox4.Name = "PictureBox4"
        Me.PictureBox4.Size = New System.Drawing.Size(22, 18)
        Me.PictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -125,7 +133,7 @@ Partial Class frmKundenKontakteDetails
        'PictureBox2
        '
        Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
-        Me.PictureBox2.Image = Global.SDL.My.Resources.fax
+        Me.PictureBox2.Image = Global.SDL.My.Resources.Resources.fax
        Me.PictureBox2.Location = New System.Drawing.Point(17, 99)
        Me.PictureBox2.Name = "PictureBox2"
        Me.PictureBox2.Size = New System.Drawing.Size(25, 18)
@@ -147,7 +155,7 @@ Partial Class frmKundenKontakteDetails
        'PictureBox3
        '
        Me.PictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
-        Me.PictureBox3.Image = Global.SDL.My.Resources.handy
+        Me.PictureBox3.Image = Global.SDL.My.Resources.Resources.handy
        Me.PictureBox3.Location = New System.Drawing.Point(17, 123)
        Me.PictureBox3.Name = "PictureBox3"
        Me.PictureBox3.Size = New System.Drawing.Size(25, 18)
@@ -158,8 +166,8 @@ Partial Class frmKundenKontakteDetails
        'PictureBox5
        '
        Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
-        Me.PictureBox5.Image = Global.SDL.My.Resources.person
-        Me.PictureBox5.Location = New System.Drawing.Point(17, 184)
+        Me.PictureBox5.Image = Global.SDL.My.Resources.Resources.person
+        Me.PictureBox5.Location = New System.Drawing.Point(17, 242)
        Me.PictureBox5.Name = "PictureBox5"
        Me.PictureBox5.Size = New System.Drawing.Size(25, 18)
        Me.PictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -192,7 +200,7 @@ Partial Class frmKundenKontakteDetails
        Me.lblAnsprechpartnerVN.BackColor = System.Drawing.Color.White
        Me.lblAnsprechpartnerVN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
        Me.lblAnsprechpartnerVN.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblAnsprechpartnerVN.Location = New System.Drawing.Point(105, 181)
+        Me.lblAnsprechpartnerVN.Location = New System.Drawing.Point(105, 239)
        Me.lblAnsprechpartnerVN.Name = "lblAnsprechpartnerVN"
        Me.lblAnsprechpartnerVN.Size = New System.Drawing.Size(200, 26)
        Me.lblAnsprechpartnerVN.TabIndex = 7
@@ -205,17 +213,87 @@ Partial Class frmKundenKontakteDetails
        Me.cboMannFrau._value = ""
        Me.cboMannFrau.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!)
        Me.cboMannFrau.FormattingEnabled = True
-        Me.cboMannFrau.Location = New System.Drawing.Point(52, 181)
+        Me.cboMannFrau.Location = New System.Drawing.Point(52, 239)
        Me.cboMannFrau.Name = "cboMannFrau"
        Me.cboMannFrau.Size = New System.Drawing.Size(54, 26)
        Me.cboMannFrau.TabIndex = 6
        '
+        'lblEmailCC
+        '
+        Me.lblEmailCC.BackColor = System.Drawing.Color.White
+        Me.lblEmailCC.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.lblEmailCC.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.lblEmailCC.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblEmailCC.Location = New System.Drawing.Point(86, 179)
+        Me.lblEmailCC.Name = "lblEmailCC"
+        Me.lblEmailCC.Size = New System.Drawing.Size(418, 26)
+        Me.lblEmailCC.TabIndex = 192
+        Me.lblEmailCC.Text = "email"
+        '
+        'PictureBox6
+        '
+        Me.PictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
+        Me.PictureBox6.Image = Global.SDL.My.Resources.Resources.email
+        Me.PictureBox6.Location = New System.Drawing.Point(20, 181)
+        Me.PictureBox6.Name = "PictureBox6"
+        Me.PictureBox6.Size = New System.Drawing.Size(22, 18)
+        Me.PictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.PictureBox6.TabIndex = 193
+        Me.PictureBox6.TabStop = False
+        '
+        'lblEmailBCC
+        '
+        Me.lblEmailBCC.BackColor = System.Drawing.Color.White
+        Me.lblEmailBCC.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.lblEmailBCC.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.lblEmailBCC.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblEmailBCC.Location = New System.Drawing.Point(86, 204)
+        Me.lblEmailBCC.Name = "lblEmailBCC"
+        Me.lblEmailBCC.Size = New System.Drawing.Size(418, 26)
+        Me.lblEmailBCC.TabIndex = 194
+        Me.lblEmailBCC.Text = "email"
+        '
+        'PictureBox7
+        '
+        Me.PictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
+        Me.PictureBox7.Image = Global.SDL.My.Resources.Resources.email
+        Me.PictureBox7.Location = New System.Drawing.Point(20, 206)
+        Me.PictureBox7.Name = "PictureBox7"
+        Me.PictureBox7.Size = New System.Drawing.Size(22, 18)
+        Me.PictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.PictureBox7.TabIndex = 195
+        Me.PictureBox7.TabStop = False
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(49, 186)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(24, 13)
+        Me.Label1.TabIndex = 196
+        Me.Label1.Text = "CC:"
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(49, 211)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(31, 13)
+        Me.Label2.TabIndex = 197
+        Me.Label2.Text = "BCC:"
+        '
        'frmKundenKontakteDetails
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(521, 289)
+        Me.ClientSize = New System.Drawing.Size(521, 357)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.lblEmailBCC)
+        Me.Controls.Add(Me.PictureBox7)
+        Me.Controls.Add(Me.lblEmailCC)
+        Me.Controls.Add(Me.PictureBox6)
        Me.Controls.Add(Me.cboMannFrau)
        Me.Controls.Add(Me.lblAnsprechpartnerVN)
        Me.Controls.Add(Me.cboKontaktArt)
@@ -240,6 +318,8 @@ Partial Class frmKundenKontakteDetails
        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -260,4 +340,10 @@ Partial Class frmKundenKontakteDetails
    Friend WithEvents cboKontaktArt As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents lblAnsprechpartnerVN As TextBox
    Friend WithEvents cboMannFrau As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents lblEmailCC As TextBox
+    Friend WithEvents PictureBox6 As PictureBox
+    Friend WithEvents lblEmailBCC As TextBox
+    Friend WithEvents PictureBox7 As PictureBox
+    Friend WithEvents Label1 As Label
+    Friend WithEvents Label2 As Label
 End Class
--- a/SDL/kunden/frmKundenKontakteDetails.vb
+++ b/SDL/kunden/frmKundenKontakteDetails.vb
@@ -55,6 +55,8 @@
        lblTel.Text = If(KD_KONTAKT.kkd_Tel, "")
        lblFax.Text = If(KD_KONTAKT.kkd_Fax, "")
        lblEmail.Text = If(KD_KONTAKT.kkd_Email, "")
+        lblEmailCC.Text = If(KD_KONTAKT.kkd_EmailCC, "")
+        lblEmailBCC.Text = If(KD_KONTAKT.kkd_EmailBCC, "")
        lblMobil.Text = If(KD_KONTAKT.kkd_Mobil, "")
    End Sub

@@ -72,6 +74,8 @@
        KD_KONTAKT.kkd_Tel = lblTel.Text
        KD_KONTAKT.kkd_Fax = lblFax.Text
        KD_KONTAKT.kkd_Email = lblEmail.Text
+        KD_KONTAKT.kkd_EmailCC = lblEmailCC.Text
+        KD_KONTAKT.kkd_EmailBCC = lblEmailBCC.Text
        KD_KONTAKT.kkd_Mobil = lblMobil.Text

    End Sub
@@ -81,4 +85,8 @@
        KD_KONTAKT.SAVE()
        Me.Close()
    End Sub
+
+    Private Sub TextBox1_TextChanged(sender As Object, e As EventArgs) Handles lblEmailCC.TextChanged
+
+    End Sub
 End Class
--- a/SDL/kunden/frmKundenSuche.vb
+++ b/SDL/kunden/frmKundenSuche.vb
@@ -44,23 +44,29 @@
    Sub initSearch()
        With DataGridView1
            .Columns.Clear()
-            Dim SQLstr As String = " SELECT top 10 Ordnungsbegriff as Firma, AdressenNr as KdNr,[LandKz] + ' ' + [PLZ] + ' - ' + [Ort] + ' ' + [Straße] as Adresse, ([UstIdKz] + [UstIdNr]) as UID,EORITIN as EORI  FROM [Adressen] INNER JOIN Kunden ON KundenNr=AdressenNr WHERE 1=1 "
+            Dim SQLstr As String = " SELECT top 10 Ordnungsbegriff as Firma, AdressenNr as KdNr,Adressen.[LandKz] + ' ' + Adressen.[PLZ] + ' - ' + Adressen.[Ort] + ' ' + Adressen.[Straße] as Adresse, (Adressen.[UstIdKz] + Adressen.[UstIdNr]) as UID,EORITIN as EORI  "
+
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then SQLstr &= ",  Filialen.Firma as Firma_Intern  "
+
+            SQLstr &= "    From [Adressen] INNER JOIN Kunden ON KundenNr=AdressenNr inner join Filialen on Filialen.FilialenNr=Kunden.FilialenNr WHERE 1=1 "
            Dim suchparam As Boolean = False
            If txtKurzname.Text <> "" Then SQLstr &= " AND Ordnungsbegriff LIKE '" & txtKurzname.Text & "%'" : suchparam = True
            If txtKundenNr.Text <> "" Then SQLstr &= " AND AdressenNr LIKE '" & txtKundenNr.Text & "%'" : suchparam = True
-            If txtStrasse.Text <> "" Then SQLstr &= " AND Straße LIKE '" & txtStrasse.Text & "%'" : suchparam = True
-            If txtOrt.Text <> "" Then SQLstr &= " AND Ort LIKE '" & txtOrt.Text & "%'" : suchparam = True
-            If txtPlz.Text <> "" Then SQLstr &= " AND [PLZ] LIKE '" & txtPlz.Text & "%'" : suchparam = True
-            If txtUID.Text <> "" Then SQLstr &= " AND ([UstIdKz] + [UstIdNr]) LIKE '" & txtUID.Text.Replace("*", "%") & "'" : suchparam = True
+            If txtStrasse.Text <> "" Then SQLstr &= " AND Adressen.Straße LIKE '" & txtStrasse.Text & "%'" : suchparam = True
+            If txtOrt.Text <> "" Then SQLstr &= " AND Adressen.Ort LIKE '" & txtOrt.Text & "%'" : suchparam = True
+            If txtPlz.Text <> "" Then SQLstr &= " AND Adressen.[PLZ] LIKE '" & txtPlz.Text & "%'" : suchparam = True
+            If txtUID.Text <> "" Then SQLstr &= " AND (Adressen.[UstIdKz] + Adressen.[UstIdNr]) LIKE '" & txtUID.Text.Replace("*", "%") & "'" : suchparam = True
            If txtEORI.Text <> "" Then SQLstr &= " AND [EORITIN] LIKE '" & txtEORI.Text.Replace("*", "%") & "'" : suchparam = True
-            If cbxLandKz.Text <> "" Then SQLstr &= " AND LandKz = '" & DirectCast(cbxLandKz.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value & "'" : suchparam = True
+            If cbxLandKz.Text <> "" Then SQLstr &= " AND Adressen.LandKz = '" & DirectCast(cbxLandKz.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value & "'" : suchparam = True
            Select Case cbxAktiv.CheckState
                Case CheckState.Checked : SQLstr &= " AND Auswahl='A' " : suchparam = True
                Case CheckState.Unchecked : SQLstr &= " AND Auswahl='I' " : suchparam = True
            End Select
            Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-                Case "VERAG", "ATILLA" : SQLstr &= " AND isnull([FilialenNr],0) NOT IN ('5501','5601','5701','5801') " : suchparam = True
-                Case Else : SQLstr &= "  AND [FilialenNr]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "' " : suchparam = True
+                Case "FRONTOFFICE" : SQLstr &= "  AND '" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' IN (Filialen.Firma,Filialen.Cluster) " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice
+                Case "VERIMEX" : SQLstr &= "  AND '" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' IN (Filialen.Firma,Filialen.Cluster) " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice
+                Case "VERAG", "ATILLA" : SQLstr &= " AND isnull(Kunden.[FilialenNr],0) NOT IN ('5501','5601','5701','5801') " : suchparam = True
+                Case Else : SQLstr &= "  AND Filialen.Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' " : suchparam = True
            End Select


@@ -77,6 +83,7 @@
            If .RowCount = 0 Then Exit Sub
            .Columns("KdNr").Width = 60
            .Columns("Firma").Width = 250
+            If .Columns("Firma_intern") IsNot Nothing Then .Columns("Firma_intern").HeaderText = "Firma"
            .Columns("Adresse").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
            '  .Focus()
        End With
--- a/SDL/kunden/usrCntlKundenuebersicht.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.vb
@@ -465,8 +465,13 @@ Public Class usrCntlKundenuebersicht
            '  TMPText = TMPText.Replace("/ ", "" & vbNewLine)
            '   TMPText = TMPText.Replace("/", "" & vbNewLine)
            rtbAbf_Besonderheiten.Text = TMPText
-            lblKreditlimit.Text = checkNullNbr(KUNDE.Kreditlimit).ToString("N", CultureInfo.CurrentCulture)

+            lblKreditlimit.BackColor = Color.White
+            lblKreditlimit.Text = checkNullNbr(KUNDE.Kreditlimit).ToString("N", CultureInfo.CurrentCulture)
+            If KUNDE.Kreditlimit <> 0 And KUNDE.Kreditlimit <> 2600 Then
+                lblKreditlimit.BackColor = Color.Yellow
+            End If
+            If KUNDE.Kreditlimit = 0 Then lblKreditlimit.Text = ""

            'lblAviso.Font = f_norm
            'lblNeutralisierung.Font = f_norm