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

Aviso/frmSendungsdetailsNEU.Designer.vb

@@ -24,10 +24,10 @@ Partial Class frmSendungsdetailsNEU
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSendungsdetailsNEU))
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.Panel4 = New System.Windows.Forms.Panel()
         Me.TabControl1 = New System.Windows.Forms.TabControl()
@@ -392,6 +392,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem14 = New System.Windows.Forms.ToolStripMenuItem()
         Me.NurÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.Label12 = New System.Windows.Forms.Label()
         Me.pnl.SuspendLayout()
         Me.Panel4.SuspendLayout()
         Me.TabControl1.SuspendLayout()
@@ -1431,18 +1432,18 @@ Partial Class frmSendungsdetailsNEU
         Me.gridVermerke.AllowUserToAddRows = False
         Me.gridVermerke.AllowUserToDeleteRows = False
         Me.gridVermerke.AllowUserToResizeRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle13.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13
         Me.gridVermerke.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue
+        DataGridViewCellStyle14.BackColor = System.Drawing.Color.LightBlue
-        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
+        DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
-        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2
+        Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle14
         Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
         Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill
         Me.gridVermerke.Location = New System.Drawing.Point(0, 0)
@@ -1451,8 +1452,8 @@ Partial Class frmSendungsdetailsNEU
         Me.gridVermerke.ReadOnly = True
         Me.gridVermerke.RowHeadersVisible = False
         Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle3
+        Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle15
         Me.gridVermerke.RowTemplate.Height = 20
         Me.gridVermerke.RowTemplate.ReadOnly = True
         Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
@@ -1502,6 +1503,7 @@ Partial Class frmSendungsdetailsNEU
         '
         'TabPage4
         '
+        Me.TabPage4.Controls.Add(Me.Label12)
         Me.TabPage4.Controls.Add(Me.Label10)
         Me.TabPage4.Controls.Add(Me.btn_FrachtkostenBerechnen)
         Me.TabPage4.Controls.Add(Me.txtFrachtkostenGesamt)
@@ -2187,8 +2189,8 @@ Partial Class frmSendungsdetailsNEU
         'clmnPreis
         '
         Me.clmnPreis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        DataGridViewCellStyle4.Format = "C2"
+        DataGridViewCellStyle16.Format = "C2"
-        Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle4
+        Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle16
         Me.clmnPreis.HeaderText = "Preis"
         Me.clmnPreis.MaxInputLength = 15
         Me.clmnPreis.Name = "clmnPreis"
@@ -2380,7 +2382,7 @@ Partial Class frmSendungsdetailsNEU
         Me.Panel6.Location = New System.Drawing.Point(0, 69)
         Me.Panel6.MinimumSize = New System.Drawing.Size(2, 235)
         Me.Panel6.Name = "Panel6"
-        Me.Panel6.Size = New System.Drawing.Size(838, 325)
+        Me.Panel6.Size = New System.Drawing.Size(775, 325)
         Me.Panel6.TabIndex = 1
         '
         'txtFrachtfuehrer
@@ -4843,7 +4845,6 @@ Partial Class frmSendungsdetailsNEU
         '
         Me.BindingNavigatorPositionItem.AccessibleName = "Position"
         Me.BindingNavigatorPositionItem.AutoSize = False
-        Me.BindingNavigatorPositionItem.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.BindingNavigatorPositionItem.Name = "BindingNavigatorPositionItem"
         Me.BindingNavigatorPositionItem.Size = New System.Drawing.Size(50, 23)
         Me.BindingNavigatorPositionItem.Text = "0"
@@ -5112,6 +5113,15 @@ Partial Class frmSendungsdetailsNEU
         Me.NurÖffnenToolStripMenuItem.Size = New System.Drawing.Size(255, 30)
         Me.NurÖffnenToolStripMenuItem.Text = "nur öffnen"
         '
+        'Label12
+        '
+        Me.Label12.AutoSize = True
+        Me.Label12.Location = New System.Drawing.Point(266, 42)
+        Me.Label12.Name = "Label12"
+        Me.Label12.Size = New System.Drawing.Size(40, 13)
+        Me.Label12.TabIndex = 64
+        Me.Label12.Text = "Fracht:"
+        '
         'frmSendungsdetailsNEU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
@@ -5573,4 +5583,5 @@ Partial Class frmSendungsdetailsNEU
     Friend WithEvents btn_FrachtkostenBerechnen As Button
     Friend WithEvents txtFrachtkostenGesamt As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents Label10 As Label
+    Friend WithEvents Label12 As Label
 End Class

Aviso/frmSendungsdetailsNEU.resx

@@ -117,7 +117,45 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>404, 17</value>
+  </metadata>
+  <metadata name="cntxt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>765, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="FlatButton4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB
+        AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID
+        BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA
+        GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA
+        AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA
+        AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM
+        w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7
+        VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl
+        CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv
+        8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/
+        ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697
+        KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z
+</value>
+  </data>
+  <data name="FlatButton1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB
+        AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID
+        BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA
+        GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA
+        AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA
+        AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM
+        w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7
+        VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl
+        CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv
+        8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/
+        ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697
+        KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z
+</value>
+  </data>
   <data name="btnDirektAnfuegen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
@@ -1531,6 +1569,9 @@
         mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>296, 17</value>
+  </metadata>
   <data name="Button6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
@@ -1651,6 +1692,18 @@
   <metadata name="clmnPreis.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="clmnVK_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="clmnFirma.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="clmnLeistung.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="clmnPreis.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="Button9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAHtJREFUSEvt
@@ -1747,44 +1800,6 @@
         rGp33g/w9ql7NoGnXyWw0LUP726+A48ybH5BknCWWY7Lq2TVaSzNVMvnjcLjoYqrHD5NUxOdyqYOtXoR
         rY7H4jHYSnSdT2lHL8uwNOUI/FU+hyHGUMfjc2xVDEQxsJvDOOIVCrQdKLqYyNPBKNaFOo4UMPToVZT5
         eWpiMRXkm9o//9k=
-</value>
-  </data>
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>404, 17</value>
-  </metadata>
-  <metadata name="cntxt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>765, 17</value>
-  </metadata>
-  <data name="FlatButton4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB
-        AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID
-        BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA
-        GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA
-        AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA
-        AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM
-        w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7
-        VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl
-        CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv
-        8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/
-        ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697
-        KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z
-</value>
-  </data>
-  <data name="FlatButton1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB
-        AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID
-        BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA
-        GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA
-        AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA
-        AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM
-        w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7
-        VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl
-        CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv
-        8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/
-        ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697
-        KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z
 </value>
   </data>
   <data name="btnDelQS.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -1883,6 +1898,9 @@
   <metadata name="cntxtOptions.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>174, 17</value>
   </metadata>
+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>404, 17</value>
+  </metadata>
   <metadata name="ctxtWeitereFormulare.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>596, 17</value>
   </metadata>

Aviso/frmSendungsdetailsNEU.vb

@@ -5392,4 +5392,38 @@ Public Class frmSendungsdetailsNEU
         End If
 
     End Sub
+
+    Private Sub Button17_Click_2(sender As Object, e As EventArgs) Handles Button17.Click
+        Dim f As New SDL.frmCMR
+
+        f.btnCMRtoAkt.Visible = True
+        f.txtCMRName.Visible = True
+
+
+        If txtAbsender.KdData_ADRESSEN IsNot Nothing Then f.uCmr.txtAbsender.Text = txtAbsender.KdData_ADRESSEN.getAdressFromatted()
+        If txtFrachtfuehrer.KdData_ADRESSEN IsNot Nothing Then f.uCmr.txtFrachtführer.Text = txtFrachtfuehrer.KdData_ADRESSEN.getAdressFromatted()
+        If txtEmpfaenger.KdData_ADRESSEN IsNot Nothing Then f.uCmr.txtEmpfänger.Text = txtEmpfaenger.KdData_ADRESSEN.getAdressFromatted()
+
+        f.uCmr.dgvLadungenKurz.Rows.Add(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli, ""), "Pk", If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenbezeichnung, If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht, "")))
+
+        f.uCmr.txtKfz.Text = AVISO.LKW_Nr
+        f.uCmr.txtAnhänger.Text = AVISO.LKW_Nr
+
+        If f.ShowDialog(Me) Then
+
+            Dim da_id = -1
+            Dim anhId = -1
+            Dim destPath = ""
+
+            Dim Typ = ""
+
+            If f.PDF_Path <> "" Then
+                Dim CMRName = If(f.txtCMRName.Text <> "", f.txtCMRName.Text, "CMR")
+                frmSendungAnhangImport.saveToDS(AvisoId, CMRName, f.PDF_Path, "CMR", "PDF", da_id, anhId, destPath, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
+                initAnhang()
+
+            End If
+
+        End If
+    End Sub
 End Class