Anhang ATILLA

2024-08-02 16:37:13 +02:00
parent 5b9b992d13
commit d855e6730e
5 changed files with 84 additions and 60 deletions
--- a/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb
+++ b/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb
@@ -71,10 +71,12 @@ Partial Class frmSendungAnhangImport
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.Button17 = New System.Windows.Forms.Button()
        Me.lblRgPreis = New System.Windows.Forms.Label()
+        Me.pnlSendung = New System.Windows.Forms.Panel()
        Me.flpnlAviso.SuspendLayout()
        Me.pnlAnfuegen.SuspendLayout()
        Me.cntxt.SuspendLayout()
        Me.pnl.SuspendLayout()
+        Me.pnlSendung.SuspendLayout()
        Me.SuspendLayout()
        '
        'lbl
@@ -139,7 +141,7 @@ Partial Class frmSendungAnhangImport
        Me.flpnlSendungen.AutoScroll = True
        Me.flpnlSendungen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
        Me.flpnlSendungen.FlowDirection = System.Windows.Forms.FlowDirection.TopDown
-        Me.flpnlSendungen.Location = New System.Drawing.Point(1073, 150)
+        Me.flpnlSendungen.Location = New System.Drawing.Point(6, 149)
        Me.flpnlSendungen.Name = "flpnlSendungen"
        Me.flpnlSendungen.Size = New System.Drawing.Size(230, 643)
        Me.flpnlSendungen.TabIndex = 10
@@ -148,7 +150,7 @@ Partial Class frmSendungAnhangImport
        '
        Me.lblSendungen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.lblSendungen.AutoSize = True
-        Me.lblSendungen.Location = New System.Drawing.Point(1070, 14)
+        Me.lblSendungen.Location = New System.Drawing.Point(3, 12)
        Me.lblSendungen.Name = "lblSendungen"
        Me.lblSendungen.Size = New System.Drawing.Size(65, 13)
        Me.lblSendungen.TabIndex = 6
@@ -516,7 +518,7 @@ Partial Class frmSendungAnhangImport
        Me.Button3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Button3.BackColor = System.Drawing.Color.Wheat
        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button3.Location = New System.Drawing.Point(1073, 799)
+        Me.Button3.Location = New System.Drawing.Point(6, 798)
        Me.Button3.Name = "Button3"
        Me.Button3.Size = New System.Drawing.Size(230, 56)
        Me.Button3.TabIndex = 12
@@ -528,7 +530,7 @@ Partial Class frmSendungAnhangImport
        Me.btnSndDel.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.btnSndDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnSndDel.Image = Global.AVISO.My.Resources.Resources.del1
-        Me.btnSndDel.Location = New System.Drawing.Point(1271, 2)
+        Me.btnSndDel.Location = New System.Drawing.Point(204, 0)
        Me.btnSndDel.Name = "btnSndDel"
        Me.btnSndDel.Size = New System.Drawing.Size(32, 25)
        Me.btnSndDel.TabIndex = 2
@@ -539,7 +541,7 @@ Partial Class frmSendungAnhangImport
        Me.btnAddSnd.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.btnAddSnd.ContextMenuStrip = Me.cntxt
        Me.btnAddSnd.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnAddSnd.Location = New System.Drawing.Point(1141, 2)
+        Me.btnAddSnd.Location = New System.Drawing.Point(74, 0)
        Me.btnAddSnd.Name = "btnAddSnd"
        Me.btnAddSnd.Size = New System.Drawing.Size(58, 25)
        Me.btnAddSnd.TabIndex = 1
@@ -555,7 +557,7 @@ Partial Class frmSendungAnhangImport
        Me.cboSendungen.DropDownWidth = 450
        Me.cboSendungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboSendungen.FormattingEnabled = True
-        Me.cboSendungen.Location = New System.Drawing.Point(1073, 30)
+        Me.cboSendungen.Location = New System.Drawing.Point(6, 28)
        Me.cboSendungen.Name = "cboSendungen"
        Me.cboSendungen.Size = New System.Drawing.Size(230, 28)
        Me.cboSendungen.TabIndex = 9
@@ -564,7 +566,7 @@ Partial Class frmSendungAnhangImport
        '
        Me.lblSendungsdetails.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.lblSendungsdetails.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblSendungsdetails.Location = New System.Drawing.Point(1077, 98)
+        Me.lblSendungsdetails.Location = New System.Drawing.Point(10, 96)
        Me.lblSendungsdetails.Name = "lblSendungsdetails"
        Me.lblSendungsdetails.Size = New System.Drawing.Size(157, 21)
        Me.lblSendungsdetails.TabIndex = 13
@@ -573,7 +575,7 @@ Partial Class frmSendungAnhangImport
        'lblWarenbeichnung
        '
        Me.lblWarenbeichnung.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.lblWarenbeichnung.Location = New System.Drawing.Point(1077, 116)
+        Me.lblWarenbeichnung.Location = New System.Drawing.Point(10, 114)
        Me.lblWarenbeichnung.Name = "lblWarenbeichnung"
        Me.lblWarenbeichnung.Size = New System.Drawing.Size(223, 31)
        Me.lblWarenbeichnung.TabIndex = 14
@@ -585,7 +587,7 @@ Partial Class frmSendungAnhangImport
        Me.btnSndEdit.ContextMenuStrip = Me.cntxt
        Me.btnSndEdit.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnSndEdit.Image = Global.AVISO.My.Resources.Resources.stift1
-        Me.btnSndEdit.Location = New System.Drawing.Point(1205, 3)
+        Me.btnSndEdit.Location = New System.Drawing.Point(138, 1)
        Me.btnSndEdit.Name = "btnSndEdit"
        Me.btnSndEdit.Size = New System.Drawing.Size(29, 25)
        Me.btnSndEdit.TabIndex = 15
@@ -595,7 +597,7 @@ Partial Class frmSendungAnhangImport
        '
        Me.lblAbsender.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.lblAbsender.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblAbsender.Location = New System.Drawing.Point(1077, 67)
+        Me.lblAbsender.Location = New System.Drawing.Point(10, 65)
        Me.lblAbsender.Name = "lblAbsender"
        Me.lblAbsender.Size = New System.Drawing.Size(223, 15)
        Me.lblAbsender.TabIndex = 16
@@ -605,7 +607,7 @@ Partial Class frmSendungAnhangImport
        '
        Me.lblEmpfaenger.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.lblEmpfaenger.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblEmpfaenger.Location = New System.Drawing.Point(1077, 82)
+        Me.lblEmpfaenger.Location = New System.Drawing.Point(10, 80)
        Me.lblEmpfaenger.Name = "lblEmpfaenger"
        Me.lblEmpfaenger.Size = New System.Drawing.Size(223, 17)
        Me.lblEmpfaenger.TabIndex = 17
@@ -615,7 +617,7 @@ Partial Class frmSendungAnhangImport
        '
        Me.Panel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.Panel1.Location = New System.Drawing.Point(1073, 98)
+        Me.Panel1.Location = New System.Drawing.Point(6, 96)
        Me.Panel1.Name = "Panel1"
        Me.Panel1.Size = New System.Drawing.Size(230, 1)
        Me.Panel1.TabIndex = 18
@@ -628,7 +630,7 @@ Partial Class frmSendungAnhangImport
        Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
        Me.Button17.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button17.Location = New System.Drawing.Point(1240, 2)
+        Me.Button17.Location = New System.Drawing.Point(173, 0)
        Me.Button17.Name = "Button17"
        Me.Button17.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0)
        Me.Button17.Size = New System.Drawing.Size(25, 26)
@@ -640,13 +642,35 @@ Partial Class frmSendungAnhangImport
        '
        Me.lblRgPreis.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.lblRgPreis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblRgPreis.Location = New System.Drawing.Point(1196, 98)
+        Me.lblRgPreis.Location = New System.Drawing.Point(129, 96)
        Me.lblRgPreis.Name = "lblRgPreis"
        Me.lblRgPreis.Size = New System.Drawing.Size(107, 21)
        Me.lblRgPreis.TabIndex = 19
        Me.lblRgPreis.Text = "-"
        Me.lblRgPreis.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
+        'pnlSendung
+        '
+        Me.pnlSendung.Controls.Add(Me.flpnlSendungen)
+        Me.pnlSendung.Controls.Add(Me.lblSendungen)
+        Me.pnlSendung.Controls.Add(Me.Button3)
+        Me.pnlSendung.Controls.Add(Me.Button17)
+        Me.pnlSendung.Controls.Add(Me.lblRgPreis)
+        Me.pnlSendung.Controls.Add(Me.Panel1)
+        Me.pnlSendung.Controls.Add(Me.lblEmpfaenger)
+        Me.pnlSendung.Controls.Add(Me.lblAbsender)
+        Me.pnlSendung.Controls.Add(Me.cboSendungen)
+        Me.pnlSendung.Controls.Add(Me.btnSndEdit)
+        Me.pnlSendung.Controls.Add(Me.btnSndDel)
+        Me.pnlSendung.Controls.Add(Me.lblWarenbeichnung)
+        Me.pnlSendung.Controls.Add(Me.btnAddSnd)
+        Me.pnlSendung.Controls.Add(Me.lblSendungsdetails)
+        Me.pnlSendung.Dock = System.Windows.Forms.DockStyle.Right
+        Me.pnlSendung.Location = New System.Drawing.Point(1066, 0)
+        Me.pnlSendung.Name = "pnlSendung"
+        Me.pnlSendung.Size = New System.Drawing.Size(243, 860)
+        Me.pnlSendung.TabIndex = 0
+        '
        'frmSendungAnhangImport
        '
        Me.AllowDrop = True
@@ -654,27 +678,14 @@ Partial Class frmSendungAnhangImport
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.White
        Me.ClientSize = New System.Drawing.Size(1309, 860)
-        Me.Controls.Add(Me.Button17)
-        Me.Controls.Add(Me.flpnlSendungen)
-        Me.Controls.Add(Me.Panel1)
-        Me.Controls.Add(Me.lblAbsender)
-        Me.Controls.Add(Me.btnSndEdit)
-        Me.Controls.Add(Me.lblWarenbeichnung)
-        Me.Controls.Add(Me.lblSendungsdetails)
-        Me.Controls.Add(Me.btnAddSnd)
-        Me.Controls.Add(Me.btnSndDel)
-        Me.Controls.Add(Me.Button3)
-        Me.Controls.Add(Me.cboSendungen)
        Me.Controls.Add(Me.btnDel)
        Me.Controls.Add(Me.btnAdd)
        Me.Controls.Add(Me.pnlAnfuegen)
        Me.Controls.Add(Me.lblImport)
-        Me.Controls.Add(Me.lblSendungen)
        Me.Controls.Add(Me.flpnlAviso)
        Me.Controls.Add(Me.lbl)
        Me.Controls.Add(Me.pnl)
-        Me.Controls.Add(Me.lblEmpfaenger)
-        Me.Controls.Add(Me.lblRgPreis)
+        Me.Controls.Add(Me.pnlSendung)
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
        Me.KeyPreview = True
        Me.Name = "frmSendungAnhangImport"
@@ -685,6 +696,8 @@ Partial Class frmSendungAnhangImport
        Me.pnlAnfuegen.PerformLayout()
        Me.cntxt.ResumeLayout(False)
        Me.pnl.ResumeLayout(False)
+        Me.pnlSendung.ResumeLayout(False)
+        Me.pnlSendung.PerformLayout()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -737,4 +750,5 @@ Partial Class frmSendungAnhangImport
    Friend WithEvents Button17 As Button
    Friend WithEvents cbxAlternativePDFAnsicht As CheckBox
    Friend WithEvents lblRgPreis As Label
+    Friend WithEvents pnlSendung As Panel
 End Class
--- a/Aviso/Anhänge/frmSendungAnhangImport.vb
+++ b/Aviso/Anhänge/frmSendungAnhangImport.vb
@@ -14,6 +14,7 @@ Public Class frmSendungAnhangImport

    Public AvisoId As Integer
    Public SendungsId As Integer
+    Public LKWOnly As Boolean = False
    Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen)
    Dim CURRENT_INDEX As Integer

@@ -30,12 +31,13 @@ Public Class frmSendungAnhangImport

        'Dim f As New GroupDocs.Viewer
    End Sub
-    Sub New(AvisoId, SendungsId)
+    Sub New(AvisoId, SendungsId, Optional LKWOnly = False)

        ' Dieser Aufruf ist für den Designer erforderlich.
        InitializeComponent()
        Me.AvisoId = AvisoId
        Me.SendungsId = SendungsId
+        Me.LKWOnly = LKWOnly
        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.

        'Dim f As New GroupDocs.Viewer
@@ -207,7 +209,7 @@ Public Class frmSendungAnhangImport
                '------------- 
                '------------- PDFs extrahieren und auf den Datenserver laden + Eintrag in tblAvisoAnhaenger
                '------------- 
-                Dim SendngsId As Integer = cboSendungen._value
+                Dim SendngsId As Integer = If(LKWOnly, -1, cboSendungen._value)
                Dim TMP_Path_Old = u.FILE_PATH
                Dim TMP_Path_New = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(u.FILE_NAME, fi.Extension,, True, "SendungsAnhaenge")
                'If Not extractPagesFromPdf_Spire(u.FILE_PATH, TMP_Path_New, getPagesFromText()) Then Exit Sub
@@ -248,7 +250,12 @@ Public Class frmSendungAnhangImport
        Next
        '   initSendungen()

+        If LKWOnly Then
+            initFlpANH_LIST()
+        Else
            initFlpANH_LIST(flpnlSendungen, False)
+        End If
+

        If flpnlAviso.Controls.Count > 0 Then
            If Not setAvtiveById(flpnlAviso, CurrentPageNumber, pages, cntlID) Then
@@ -316,7 +323,7 @@ Public Class frmSendungAnhangImport
                '------------- PDFs extrahieren und auf den Datenserver laden + Eintrag in tblAvisoAnhaenger
                '------------- 
                Dim TMP_Path_New = u.FILE_PATH
-                Dim SendngsId As Integer = cboSendungen._value
+                Dim SendngsId As Integer = If(LKWOnly, -1, cboSendungen._value)
                'Hochladen in den Datenserver und anfügen in die Tbl Anhänge mit der SendungsId
                ' saveToDS(u.FILE_NAME, TMP_Path_New, cboArt._value, u.FILE_TYPE,,, SendngsId)

@@ -1111,6 +1118,10 @@ Public Class frmSendungAnhangImport

        'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges"))

+        If LKWOnly Then
+            pnlSendung.Enabled = False
+        End If
+
        cboArt._TRANSLATE()

        initSendungen()
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("4.0.1.8")>
-<Assembly: AssemblyFileVersion("4.0.1.8")>
+<Assembly: AssemblyVersion("4.0.2.0")>
+<Assembly: AssemblyFileVersion("4.0.2.0")>
--- a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb
+++ b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb
@@ -68,6 +68,7 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.tbAnhaenge = New System.Windows.Forms.TabPage()
        Me.dgvanhaenge = New System.Windows.Forms.DataGridView()
        Me.Panel5 = New System.Windows.Forms.Panel()
+        Me.Button13 = New System.Windows.Forms.Button()
        Me.btnImportAssi = New System.Windows.Forms.Button()
        Me.btnQuckScan = New System.Windows.Forms.Button()
        Me.Button11 = New System.Windows.Forms.Button()
@@ -157,7 +158,6 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.UmbenennenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AusZwischenablageEinfügenPasteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.Button13 = New System.Windows.Forms.Button()
        Me.UsrCntlVermerkeATilla1 = New AVISO.usrCntlVermerkeATilla()
        Me.pnlDetailsRechts.SuspendLayout()
        Me.Panel3.SuspendLayout()
@@ -563,6 +563,20 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.Panel5.Size = New System.Drawing.Size(561, 38)
        Me.Panel5.TabIndex = 112
        '
+        'Button13
+        '
+        Me.Button13.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button13.Image = CType(resources.GetObject("Button13.Image"), System.Drawing.Image)
+        Me.Button13.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button13.Location = New System.Drawing.Point(379, 1)
+        Me.Button13.Name = "Button13"
+        Me.Button13.Size = New System.Drawing.Size(80, 37)
+        Me.Button13.TabIndex = 113
+        Me.Button13.Text = "Scan.."
+        Me.Button13.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button13.UseVisualStyleBackColor = True
+        '
        'btnImportAssi
        '
        Me.btnImportAssi.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
@@ -572,12 +586,11 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.btnImportAssi.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnImportAssi.Location = New System.Drawing.Point(1, 1)
        Me.btnImportAssi.Name = "btnImportAssi"
-        Me.btnImportAssi.Size = New System.Drawing.Size(61, 37)
+        Me.btnImportAssi.Size = New System.Drawing.Size(98, 37)
        Me.btnImportAssi.TabIndex = 112
        Me.btnImportAssi.Text = "Import-Assistent"
        Me.btnImportAssi.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.btnImportAssi.UseVisualStyleBackColor = True
-        Me.btnImportAssi.Visible = False
        '
        'btnQuckScan
        '
@@ -599,9 +612,9 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button11.Image = CType(resources.GetObject("Button11.Image"), System.Drawing.Image)
        Me.Button11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button11.Location = New System.Drawing.Point(46, 1)
+        Me.Button11.Location = New System.Drawing.Point(98, 1)
        Me.Button11.Name = "Button11"
-        Me.Button11.Size = New System.Drawing.Size(66, 37)
+        Me.Button11.Size = New System.Drawing.Size(72, 37)
        Me.Button11.TabIndex = 111
        Me.Button11.Text = "CMR"
        Me.Button11.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -613,11 +626,11 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button4.Image = CType(resources.GetObject("Button4.Image"), System.Drawing.Image)
        Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button4.Location = New System.Drawing.Point(111, 1)
+        Me.Button4.Location = New System.Drawing.Point(169, 1)
        Me.Button4.Name = "Button4"
-        Me.Button4.Size = New System.Drawing.Size(124, 37)
+        Me.Button4.Size = New System.Drawing.Size(100, 37)
        Me.Button4.TabIndex = 109
-        Me.Button4.Text = "PDF hochladen"
+        Me.Button4.Text = "PDF " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "hochladen"
        Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.Button4.UseVisualStyleBackColor = True
        '
@@ -627,11 +640,11 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button10.Image = CType(resources.GetObject("Button10.Image"), System.Drawing.Image)
        Me.Button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button10.Location = New System.Drawing.Point(234, 1)
+        Me.Button10.Location = New System.Drawing.Point(268, 1)
        Me.Button10.Name = "Button10"
-        Me.Button10.Size = New System.Drawing.Size(148, 37)
+        Me.Button10.Size = New System.Drawing.Size(113, 37)
        Me.Button10.TabIndex = 110
-        Me.Button10.Text = "Aus Zwischenablage" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "einfügen (Paste)"
+        Me.Button10.Text = "Aus Zw.ablage" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "einfügen (Paste)"
        Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.Button10.UseVisualStyleBackColor = True
        '
@@ -1745,20 +1758,6 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Size = New System.Drawing.Size(279, 30)
        Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Text = "Aus Zwischenablage einfügen (Paste)"
        '
-        'Button13
-        '
-        Me.Button13.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button13.Image = CType(resources.GetObject("Button13.Image"), System.Drawing.Image)
-        Me.Button13.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button13.Location = New System.Drawing.Point(379, 1)
-        Me.Button13.Name = "Button13"
-        Me.Button13.Size = New System.Drawing.Size(80, 37)
-        Me.Button13.TabIndex = 113
-        Me.Button13.Text = "Scan.."
-        Me.Button13.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button13.UseVisualStyleBackColor = True
-        '
        'UsrCntlVermerkeATilla1
        '
        Me.UsrCntlVermerkeATilla1.AutoScroll = True
--- a/Aviso/usrcntlAktDetailsATILLANeu.vb
+++ b/Aviso/usrcntlAktDetailsATILLANeu.vb
@@ -1723,7 +1723,7 @@ Public Class usrcntlAktDetailsATILLANeu
        'loadDataInLIST()
        'SAVE_ME()

-        Dim f As New frmSendungAnhangImport(AvisoID, SENDUNG_LIST(0).tblSnd_SendungID)
+        Dim f As New frmSendungAnhangImport(AvisoID, SENDUNG_LIST(0).tblSnd_SendungID, True)
        f.ShowDialog(Me)
        'VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, 0, AvisoID) 'LÄDT alle SENDUNGSDATEN
        reload(AvisoID)