VerwahrungTmstmp

Aviso/Anhänge/frmSendungAnhangImport.vb

@@ -1991,6 +1991,8 @@ Public Class frmSendungAnhangImport
             If FilePath <> "" Then
                 addData_SendungAnhang(FilePath)
             End If
+            ' ElseIf e.Data.GetDataPresent(DataFormats.drag) Then
+
         End If
 
 

Aviso/Classes/cSendungsoptions.vb

@@ -245,6 +245,10 @@ Public Class SendungOptions
             VALUES.Tarifposanzahl = SENDUNG.tblSnd_anzahlHandling
         End If
 
+        If SENDUNG.tblSnd_Abfertigungsart_ID = 67 Or SENDUNG.tblSnd_Abfertigungsart_ID = 68 Then
+            VALUES.Tarifposanzahl = SENDUNG.tblSnd_anzahlHandling
+        End If
+
         VALUES.NCTS_VZAdr = If(SENDUNG.tblSnd_NCTSVerzollungsadresse, "")
         VALUES.NCTS_VZAdr &= vbNewLine & If(SENDUNG.NCTS_Verzollungsadresse_Strasse, "")
         VALUES.NCTS_VZAdr &= vbNewLine & If(SENDUNG.NCTS_Verzollungsadresse_Land, "") & " " & If(SENDUNG.NCTS_Verzollungsadresse_PLZ, "") & " " & If(SENDUNG.NCTS_Verzollungsadresse_Ort, "")

Aviso/My Project/AssemblyInfo.vb

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

Aviso/frmHauptfenster.Designer.vb

@@ -1748,7 +1748,7 @@ Partial Class frmHauptfenster
         Me.pnlDetailsRechts.Location = New System.Drawing.Point(0, 0)
         Me.pnlDetailsRechts.MinimumSize = New System.Drawing.Size(200, 0)
         Me.pnlDetailsRechts.Name = "pnlDetailsRechts"
-        Me.pnlDetailsRechts.Size = New System.Drawing.Size(350, 390)
+        Me.pnlDetailsRechts.Size = New System.Drawing.Size(547, 609)
         Me.pnlDetailsRechts.TabIndex = 0
         '
         'lblMitarbeiter
@@ -1758,7 +1758,7 @@ Partial Class frmHauptfenster
         Me.lblMitarbeiter.BackColor = System.Drawing.SystemColors.Control
         Me.lblMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
         Me.lblMitarbeiter.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.lblMitarbeiter.Location = New System.Drawing.Point(366, -271)
+        Me.lblMitarbeiter.Location = New System.Drawing.Point(366, -52)
         Me.lblMitarbeiter.Name = "lblMitarbeiter"
         Me.lblMitarbeiter.Size = New System.Drawing.Size(126, 13)
         Me.lblMitarbeiter.TabIndex = 1
@@ -2310,7 +2310,7 @@ Partial Class frmHauptfenster
         'SplitContainer2.Panel2
         '
         Me.SplitContainer2.Panel2.Controls.Add(Me.SplitContainer3)
-        Me.SplitContainer2.Size = New System.Drawing.Size(396, 300)
+        Me.SplitContainer2.Size = New System.Drawing.Size(496, 300)
         Me.SplitContainer2.SplitterDistance = 164
         Me.SplitContainer2.SplitterWidth = 1
         Me.SplitContainer2.TabIndex = 0
@@ -2533,8 +2533,8 @@ Partial Class frmHauptfenster
         'SplitContainer3.Panel2
         '
         Me.SplitContainer3.Panel2.Controls.Add(Me.pnl)
-        Me.SplitContainer3.Size = New System.Drawing.Size(231, 300)
+        Me.SplitContainer3.Size = New System.Drawing.Size(331, 300)
-        Me.SplitContainer3.SplitterDistance = 54
+        Me.SplitContainer3.SplitterDistance = 77
         Me.SplitContainer3.TabIndex = 3
         '
         'UsrCntlBenachrichtigungen1
@@ -2543,7 +2543,7 @@ Partial Class frmHauptfenster
         Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
         Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
-        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(54, 300)
+        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(77, 300)
         Me.UsrCntlBenachrichtigungen1.TabIndex = 0
         '
         'pnl
@@ -2554,7 +2554,7 @@ Partial Class frmHauptfenster
         Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnl.Location = New System.Drawing.Point(0, 0)
         Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(173, 300)
+        Me.pnl.Size = New System.Drawing.Size(250, 300)
         Me.pnl.TabIndex = 0
         '
         'Button10
@@ -2612,7 +2612,7 @@ Partial Class frmHauptfenster
         Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4
         Me.gridMyAviso.RowHeadersVisible = False
         Me.gridMyAviso.RowHeadersWidth = 62
-        Me.gridMyAviso.Size = New System.Drawing.Size(173, 279)
+        Me.gridMyAviso.Size = New System.Drawing.Size(250, 279)
         Me.gridMyAviso.TabIndex = 0
         '
         'Panel6
@@ -2632,7 +2632,7 @@ Partial Class frmHauptfenster
         Me.Panel6.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel6.Location = New System.Drawing.Point(0, 0)
         Me.Panel6.Name = "Panel6"
-        Me.Panel6.Size = New System.Drawing.Size(173, 21)
+        Me.Panel6.Size = New System.Drawing.Size(250, 21)
         Me.Panel6.TabIndex = 1
         '
         'cbx_My_Brexit
@@ -2640,7 +2640,7 @@ Partial Class frmHauptfenster
         Me.cbx_My_Brexit.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.cbx_My_Brexit.AutoSize = True
         Me.cbx_My_Brexit.ForeColor = System.Drawing.Color.White
-        Me.cbx_My_Brexit.Location = New System.Drawing.Point(-406, 3)
+        Me.cbx_My_Brexit.Location = New System.Drawing.Point(-329, 3)
         Me.cbx_My_Brexit.Name = "cbx_My_Brexit"
         Me.cbx_My_Brexit.Size = New System.Drawing.Size(65, 17)
         Me.cbx_My_Brexit.TabIndex = 28
@@ -2652,7 +2652,7 @@ Partial Class frmHauptfenster
         '
         Me.btnColor.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnColor.BackColor = System.Drawing.Color.White
-        Me.btnColor.Location = New System.Drawing.Point(82, -1)
+        Me.btnColor.Location = New System.Drawing.Point(159, -1)
         Me.btnColor.Name = "btnColor"
         Me.btnColor.Size = New System.Drawing.Size(36, 23)
         Me.btnColor.TabIndex = 27
@@ -2682,7 +2682,7 @@ Partial Class frmHauptfenster
         Me.cboMy_Grenzstelle.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.cboMy_Grenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
         Me.cboMy_Grenzstelle.FormattingEnabled = True
-        Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(-202, 1)
+        Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(-125, 1)
         Me.cboMy_Grenzstelle.Name = "cboMy_Grenzstelle"
         Me.cboMy_Grenzstelle.Size = New System.Drawing.Size(64, 21)
         Me.cboMy_Grenzstelle.TabIndex = 26
@@ -2692,7 +2692,7 @@ Partial Class frmHauptfenster
         Me.lblMySnd_Grenzstelle.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblMySnd_Grenzstelle.AutoSize = True
         Me.lblMySnd_Grenzstelle.ForeColor = System.Drawing.Color.White
-        Me.lblMySnd_Grenzstelle.Location = New System.Drawing.Point(-270, 4)
+        Me.lblMySnd_Grenzstelle.Location = New System.Drawing.Point(-193, 4)
         Me.lblMySnd_Grenzstelle.Name = "lblMySnd_Grenzstelle"
         Me.lblMySnd_Grenzstelle.Size = New System.Drawing.Size(62, 13)
         Me.lblMySnd_Grenzstelle.TabIndex = 25
@@ -2703,7 +2703,7 @@ Partial Class frmHauptfenster
         Me.cbx_My_LKW.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.cbx_My_LKW.AutoSize = True
         Me.cbx_My_LKW.ForeColor = System.Drawing.Color.White
-        Me.cbx_My_LKW.Location = New System.Drawing.Point(-326, 3)
+        Me.cbx_My_LKW.Location = New System.Drawing.Point(-249, 3)
         Me.cbx_My_LKW.Name = "cbx_My_LKW"
         Me.cbx_My_LKW.Size = New System.Drawing.Size(50, 17)
         Me.cbx_My_LKW.TabIndex = 24
@@ -2717,7 +2717,7 @@ Partial Class frmHauptfenster
         Me.cboMy_QS.Checked = True
         Me.cboMy_QS.CheckState = System.Windows.Forms.CheckState.Indeterminate
         Me.cboMy_QS.ForeColor = System.Drawing.Color.White
-        Me.cboMy_QS.Location = New System.Drawing.Point(130, 3)
+        Me.cboMy_QS.Location = New System.Drawing.Point(207, 3)
         Me.cboMy_QS.Name = "cboMy_QS"
         Me.cboMy_QS.Size = New System.Drawing.Size(15, 14)
         Me.cboMy_QS.TabIndex = 23
@@ -2731,7 +2731,7 @@ Partial Class frmHauptfenster
         Me.cboMy_VB.Checked = True
         Me.cboMy_VB.CheckState = System.Windows.Forms.CheckState.Indeterminate
         Me.cboMy_VB.ForeColor = System.Drawing.Color.White
-        Me.cboMy_VB.Location = New System.Drawing.Point(149, 3)
+        Me.cboMy_VB.Location = New System.Drawing.Point(226, 3)
         Me.cboMy_VB.Name = "cboMy_VB"
         Me.cboMy_VB.Size = New System.Drawing.Size(15, 14)
         Me.cboMy_VB.TabIndex = 22
@@ -2749,7 +2749,7 @@ Partial Class frmHauptfenster
         Me.cboMyAvisoAnzeige.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.cboMyAvisoAnzeige.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
         Me.cboMyAvisoAnzeige.FormattingEnabled = True
-        Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(-83, 1)
+        Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(-6, 1)
         Me.cboMyAvisoAnzeige.Name = "cboMyAvisoAnzeige"
         Me.cboMyAvisoAnzeige.Size = New System.Drawing.Size(127, 21)
         Me.cboMyAvisoAnzeige.TabIndex = 21
@@ -2759,7 +2759,7 @@ Partial Class frmHauptfenster
         Me.lblMySND_Anzeige.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblMySND_Anzeige.AutoSize = True
         Me.lblMySND_Anzeige.ForeColor = System.Drawing.Color.White
-        Me.lblMySND_Anzeige.Location = New System.Drawing.Point(-132, 3)
+        Me.lblMySND_Anzeige.Location = New System.Drawing.Point(-55, 3)
         Me.lblMySND_Anzeige.Name = "lblMySND_Anzeige"
         Me.lblMySND_Anzeige.Size = New System.Drawing.Size(48, 13)
         Me.lblMySND_Anzeige.TabIndex = 20
@@ -2769,7 +2769,7 @@ Partial Class frmHauptfenster
         '
         Me.lblAkte.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblAkte.ForeColor = System.Drawing.Color.White
-        Me.lblAkte.Location = New System.Drawing.Point(446, 6)
+        Me.lblAkte.Location = New System.Drawing.Point(523, 6)
         Me.lblAkte.Name = "lblAkte"
         Me.lblAkte.Size = New System.Drawing.Size(207, 19)
         Me.lblAkte.TabIndex = 1
@@ -2857,7 +2857,7 @@ Partial Class frmHauptfenster
         Me.pnlAktOption.Dock = System.Windows.Forms.DockStyle.Top
         Me.pnlAktOption.Location = New System.Drawing.Point(0, 0)
         Me.pnlAktOption.Name = "pnlAktOption"
-        Me.pnlAktOption.Size = New System.Drawing.Size(396, 5)
+        Me.pnlAktOption.Size = New System.Drawing.Size(496, 5)
         Me.pnlAktOption.TabIndex = 1
         '
         'Button8
@@ -2867,7 +2867,7 @@ Partial Class frmHauptfenster
         Me.Button8.ForeColor = System.Drawing.Color.Black
         Me.Button8.Image = CType(resources.GetObject("Button8.Image"), System.Drawing.Image)
         Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button8.Location = New System.Drawing.Point(-38, 214)
+        Me.Button8.Location = New System.Drawing.Point(62, 214)
         Me.Button8.Name = "Button8"
         Me.Button8.Size = New System.Drawing.Size(89, 34)
         Me.Button8.TabIndex = 3
@@ -2884,7 +2884,7 @@ Partial Class frmHauptfenster
         Me.btnFertig.ForeColor = System.Drawing.Color.Black
         Me.btnFertig.Image = CType(resources.GetObject("btnFertig.Image"), System.Drawing.Image)
         Me.btnFertig.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnFertig.Location = New System.Drawing.Point(66, 214)
+        Me.btnFertig.Location = New System.Drawing.Point(166, 214)
         Me.btnFertig.Name = "btnFertig"
         Me.btnFertig.Size = New System.Drawing.Size(102, 34)
         Me.btnFertig.TabIndex = 0
@@ -2988,7 +2988,7 @@ Partial Class frmHauptfenster
         Me.pnlDetailsLinks.Location = New System.Drawing.Point(0, 0)
         Me.pnlDetailsLinks.MinimumSize = New System.Drawing.Size(324, 564)
         Me.pnlDetailsLinks.Name = "pnlDetailsLinks"
-        Me.pnlDetailsLinks.Size = New System.Drawing.Size(398, 564)
+        Me.pnlDetailsLinks.Size = New System.Drawing.Size(498, 609)
         Me.pnlDetailsLinks.TabIndex = 0
         '
         'splitMain
@@ -3012,8 +3012,8 @@ Partial Class frmHauptfenster
         '
         Me.splitMain.Panel2.Controls.Add(Me.SplitContainer2)
         Me.splitMain.Panel2.Controls.Add(Me.pnlAktOption)
-        Me.splitMain.Size = New System.Drawing.Size(396, 562)
+        Me.splitMain.Size = New System.Drawing.Size(496, 607)
-        Me.splitMain.SplitterDistance = 253
+        Me.splitMain.SplitterDistance = 298
         Me.splitMain.TabIndex = 0
         '
         'gridAviso
@@ -3066,7 +3066,7 @@ Partial Class frmHauptfenster
         Me.gridAviso.RowTemplate.ReadOnly = True
         Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
         Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.gridAviso.Size = New System.Drawing.Size(396, 5)
+        Me.gridAviso.Size = New System.Drawing.Size(496, 50)
         Me.gridAviso.TabIndex = 1
         Me.gridAviso.TabStop = False
         '
@@ -3102,7 +3102,7 @@ Partial Class frmHauptfenster
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel1.Location = New System.Drawing.Point(0, 0)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(396, 248)
+        Me.Panel1.Size = New System.Drawing.Size(496, 248)
         Me.Panel1.TabIndex = 2
         '
         'CheckBox1
@@ -3112,7 +3112,7 @@ Partial Class frmHauptfenster
         Me.CheckBox1.Checked = True
         Me.CheckBox1.CheckState = System.Windows.Forms.CheckState.Checked
         Me.CheckBox1.ForeColor = System.Drawing.Color.White
-        Me.CheckBox1.Location = New System.Drawing.Point(-310, 55)
+        Me.CheckBox1.Location = New System.Drawing.Point(-210, 55)
         Me.CheckBox1.Name = "CheckBox1"
         Me.CheckBox1.Size = New System.Drawing.Size(50, 17)
         Me.CheckBox1.TabIndex = 28
@@ -3297,7 +3297,7 @@ Partial Class frmHauptfenster
         Me.lblEintraege.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblEintraege.BackColor = System.Drawing.Color.Transparent
         Me.lblEintraege.ForeColor = System.Drawing.Color.White
-        Me.lblEintraege.Location = New System.Drawing.Point(166, 56)
+        Me.lblEintraege.Location = New System.Drawing.Point(266, 56)
         Me.lblEintraege.Name = "lblEintraege"
         Me.lblEintraege.Size = New System.Drawing.Size(169, 15)
         Me.lblEintraege.TabIndex = 14
@@ -3345,7 +3345,7 @@ Partial Class frmHauptfenster
         Me.pnlTime.Controls.Add(Me.Label5)
         Me.pnlTime.Location = New System.Drawing.Point(446, 0)
         Me.pnlTime.Name = "pnlTime"
-        Me.pnlTime.Size = New System.Drawing.Size(74, 57)
+        Me.pnlTime.Size = New System.Drawing.Size(174, 57)
         Me.pnlTime.TabIndex = 12
         '
         'MyComboBox1