diverse Baustellen

2025-01-02 15:52:10 +01:00
parent 644f8ce128
commit e2d88b47e1
13 changed files with 176 additions and 127 deletions
--- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb
@@ -229,6 +229,13 @@ Partial Class usrCntlKundenuebersicht
        Me.lblEORI = New System.Windows.Forms.TextBox()
        Me.lblEORINr = New System.Windows.Forms.Label()
        Me.dgvAufschub = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.KtoId = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.Art = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.HZA = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.KontoNr = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.EORI = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.NL = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.BIN = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.KopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -256,13 +263,6 @@ Partial Class usrCntlKundenuebersicht
        Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten()
        Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte()
        Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung()
-        Me.KtoId = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.Art = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.HZA = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.KontoNr = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.EORI = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.NL = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.BIN = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.cntxtAddVM.SuspendLayout()
        Me.tbWeitereKundenDetails.SuspendLayout()
        Me.tbOfferten.SuspendLayout()
@@ -890,10 +890,10 @@ Partial Class usrCntlKundenuebersicht
        '
        Me.Panel9.BackColor = System.Drawing.Color.WhiteSmoke
        Me.Panel9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel9.Controls.Add(Me.txtVerzolltBei)
        Me.Panel9.Controls.Add(Me.Label3)
        Me.Panel9.Controls.Add(Me.Label15)
        Me.Panel9.Controls.Add(Me.txtVerzolltBeiExport)
-        Me.Panel9.Controls.Add(Me.txtVerzolltBei)
        Me.Panel9.Location = New System.Drawing.Point(7, 225)
        Me.Panel9.Name = "Panel9"
        Me.Panel9.Size = New System.Drawing.Size(356, 24)
@@ -902,7 +902,7 @@ Partial Class usrCntlKundenuebersicht
        'Label3
        '
        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(197, 4)
+        Me.Label3.Location = New System.Drawing.Point(216, 4)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(40, 13)
        Me.Label3.TabIndex = 45
@@ -923,11 +923,12 @@ Partial Class usrCntlKundenuebersicht
        Me.txtVerzolltBeiExport.BorderStyle = System.Windows.Forms.BorderStyle.None
        Me.txtVerzolltBeiExport.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtVerzolltBeiExport.ForeColor = System.Drawing.Color.Black
-        Me.txtVerzolltBeiExport.Location = New System.Drawing.Point(243, 4)
+        Me.txtVerzolltBeiExport.Location = New System.Drawing.Point(250, 4)
        Me.txtVerzolltBeiExport.Name = "txtVerzolltBeiExport"
        Me.txtVerzolltBeiExport.ReadOnly = True
-        Me.txtVerzolltBeiExport.Size = New System.Drawing.Size(106, 13)
+        Me.txtVerzolltBeiExport.Size = New System.Drawing.Size(102, 13)
        Me.txtVerzolltBeiExport.TabIndex = 44
+        Me.txtVerzolltBeiExport.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
        '
        'txtVerzolltBei
        '
@@ -935,11 +936,12 @@ Partial Class usrCntlKundenuebersicht
        Me.txtVerzolltBei.BorderStyle = System.Windows.Forms.BorderStyle.None
        Me.txtVerzolltBei.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtVerzolltBei.ForeColor = System.Drawing.Color.Black
-        Me.txtVerzolltBei.Location = New System.Drawing.Point(70, 4)
+        Me.txtVerzolltBei.Location = New System.Drawing.Point(62, 4)
        Me.txtVerzolltBei.Name = "txtVerzolltBei"
        Me.txtVerzolltBei.ReadOnly = True
-        Me.txtVerzolltBei.Size = New System.Drawing.Size(128, 13)
+        Me.txtVerzolltBei.Size = New System.Drawing.Size(155, 13)
        Me.txtVerzolltBei.TabIndex = 16
+        Me.txtVerzolltBei.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
        '
        'rtbInfo
        '
@@ -3171,6 +3173,58 @@ Partial Class usrCntlKundenuebersicht
        Me.dgvAufschub.TabIndex = 11
        Me.dgvAufschub.TabStop = False
        '
+        'KtoId
+        '
+        Me.KtoId.HeaderText = "Id"
+        Me.KtoId.Name = "KtoId"
+        Me.KtoId.ReadOnly = True
+        Me.KtoId.Visible = False
+        '
+        'Art
+        '
+        Me.Art.HeaderText = "Aufschub"
+        Me.Art.Name = "Art"
+        Me.Art.ReadOnly = True
+        Me.Art.Width = 120
+        '
+        'HZA
+        '
+        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        Me.HZA.DefaultCellStyle = DataGridViewCellStyle11
+        Me.HZA.HeaderText = "HZA"
+        Me.HZA.Name = "HZA"
+        Me.HZA.ReadOnly = True
+        Me.HZA.Width = 35
+        '
+        'KontoNr
+        '
+        Me.KontoNr.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None
+        Me.KontoNr.HeaderText = "Konto Nr."
+        Me.KontoNr.Name = "KontoNr"
+        Me.KontoNr.ReadOnly = True
+        Me.KontoNr.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
+        '
+        'EORI
+        '
+        Me.EORI.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.EORI.HeaderText = "EORI"
+        Me.EORI.Name = "EORI"
+        Me.EORI.ReadOnly = True
+        '
+        'NL
+        '
+        Me.NL.HeaderText = "NL"
+        Me.NL.Name = "NL"
+        Me.NL.ReadOnly = True
+        Me.NL.Width = 60
+        '
+        'BIN
+        '
+        Me.BIN.HeaderText = "BIN"
+        Me.BIN.Name = "BIN"
+        Me.BIN.ReadOnly = True
+        Me.BIN.Visible = False
+        '
        'ContextMenuStrip1
        '
        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KopierenToolStripMenuItem})
@@ -3383,58 +3437,6 @@ Partial Class usrCntlKundenuebersicht
        Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(473, 158)
        Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 0
        '
-        'KtoId
-        '
-        Me.KtoId.HeaderText = "Id"
-        Me.KtoId.Name = "KtoId"
-        Me.KtoId.ReadOnly = True
-        Me.KtoId.Visible = False
-        '
-        'Art
-        '
-        Me.Art.HeaderText = "Aufschub"
-        Me.Art.Name = "Art"
-        Me.Art.ReadOnly = True
-        Me.Art.Width = 120
-        '
-        'HZA
-        '
-        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        Me.HZA.DefaultCellStyle = DataGridViewCellStyle11
-        Me.HZA.HeaderText = "HZA"
-        Me.HZA.Name = "HZA"
-        Me.HZA.ReadOnly = True
-        Me.HZA.Width = 35
-        '
-        'KontoNr
-        '
-        Me.KontoNr.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None
-        Me.KontoNr.HeaderText = "Konto Nr."
-        Me.KontoNr.Name = "KontoNr"
-        Me.KontoNr.ReadOnly = True
-        Me.KontoNr.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
-        '
-        'EORI
-        '
-        Me.EORI.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.EORI.HeaderText = "EORI"
-        Me.EORI.Name = "EORI"
-        Me.EORI.ReadOnly = True
-        '
-        'NL
-        '
-        Me.NL.HeaderText = "NL"
-        Me.NL.Name = "NL"
-        Me.NL.ReadOnly = True
-        Me.NL.Width = 60
-        '
-        'BIN
-        '
-        Me.BIN.HeaderText = "BIN"
-        Me.BIN.Name = "BIN"
-        Me.BIN.ReadOnly = True
-        Me.BIN.Visible = False
-        '
        'usrCntlKundenuebersicht
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
--- a/SDL/kunden/usrCntlKundenuebersicht.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.vb
@@ -2,6 +2,7 @@
 Imports System.Globalization
 Imports System.IO
 Imports System.ServiceModel.Configuration
+Imports GrapeCity.DataVisualization.TypeScript
 Imports SDL.EORI
 Imports VERAG_PROG_ALLGEMEIN

@@ -559,7 +560,7 @@ Public Class usrCntlKundenuebersicht
            lblNeutralisierung.BackColor = txtNeutralisierung.BackColor

            If KUNDE_ERW.kde_KundeFremdspedition Then
-                txtVerzolltBei.Text = If(KUNDE_ERW.kde_verzolltBei, "FREMD")
+                txtVerzolltBei.Text = If(KUNDE_ERW.kde_verzolltBei, "FREMD").ToString.ToUpper
                txtVerzolltBei.BackColor = Color.Yellow
            Else
                txtVerzolltBei.Text = ""
@@ -567,7 +568,7 @@ Public Class usrCntlKundenuebersicht
            End If

            If KUNDE_ERW.kde_KundeFremdspeditionExport Then
-                txtVerzolltBeiExport.Text = If(KUNDE_ERW.kde_verzolltBeiExport, "FREMD")
+                txtVerzolltBeiExport.Text = If(KUNDE_ERW.kde_verzolltBeiExport, "FREMD").ToString.ToUpper.Replace("EIGENE ZOLLABTEILUNG", "EIG.ZA")
                txtVerzolltBeiExport.BackColor = Color.Yellow
            Else
                txtVerzolltBeiExport.Text = ""
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
@@ -1046,6 +1046,41 @@ Public Class usrcntlKundeBearbeitenFull
            btnDatevExport.Visible = False
        End If

+
+        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            Case "AMBAR"
+                cboFremdspedition.Items.Clear()
+                cboFremdspedition.Items.Add("")
+                cboFremdspedition.Items.Add("AMBAR")
+                cboFremdspedition.Items.Add("VERAG")
+                cboFremdspedition.Items.Add("IMEX")
+                cboFremdspedition.Items.Add("EIGENE ZOLLABTEILUNG")
+                cboFremdspedition.Items.Add("T1 DIREKT")
+
+            Case Else
+                cboFremdspedition.Items.Clear()
+                cboFremdspedition.Items.Add("")
+                cboFremdspedition.Items.Add("SEBERT")
+                cboFremdspedition.Items.Add("SCHENKER")
+                cboFremdspedition.Items.Add("AS-SPED")
+                cboFremdspedition.Items.Add("NIETEN")
+                cboFremdspedition.Items.Add("BUCHAUER")
+                cboFremdspedition.Items.Add("ZLS")
+        End Select
+        cboFremdspeditionExport.Items.AddRange(cboFremdspedition.Items.Cast(Of Object).ToArray())
+
+        '        SEBERT
+        '        SCHENKER
+        'AS-SPED
+        'NIETEN
+        '        BUCHAUER
+
+
+        '        AMBAR
+        '        VERAG
+        '        IMEX
+        '        EIGENE ZOLLABTEILUNG
+        '    t1 DIREKT
    End Sub