neu

2021-02-02 22:39:23 +01:00
parent 3e4a86ab76
commit 326c3fcb11
8 changed files with 288 additions and 67 deletions
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -1105,6 +1105,12 @@
      <CustomToolNamespace>My</CustomToolNamespace>
      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
    </None>
+    <None Include="Resources\ATANAK_Instructions_Export.xlsx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\ATANAK_Instructions_Export_T1.xlsx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
    <None Include="Resources\ATANAK_Instructions_Import.xlsx">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -239,6 +239,26 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Byte[].
+        '''</summary>
+        Friend ReadOnly Property ATANAK_Instructions_Export() As Byte()
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ATANAK_Instructions_Export", resourceCulture)
+                Return CType(obj,Byte())
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Byte[].
+        '''</summary>
+        Friend ReadOnly Property ATANAK_Instructions_Export_T1() As Byte()
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ATANAK_Instructions_Export_T1", resourceCulture)
+                Return CType(obj,Byte())
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Byte[].
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -598,4 +598,10 @@
  <data name="ATANAK_Instructions_Import" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ATANAK_Instructions_Import.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="ATANAK_Instructions_Export" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ATANAK_Instructions_Export.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="ATANAK_Instructions_Export_T1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ATANAK_Instructions_Export_T1.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
--- a/Aviso/Resources/ATANAK_Instructions_Export.xlsx
+++ b/Aviso/Resources/ATANAK_Instructions_Export.xlsx
--- a/Aviso/Resources/ATANAK_Instructions_Export_T1.xlsx
+++ b/Aviso/Resources/ATANAK_Instructions_Export_T1.xlsx
--- a/Aviso/frmSendungsdetailsNEU.Designer.vb
+++ b/Aviso/frmSendungsdetailsNEU.Designer.vb
@@ -23,14 +23,14 @@ Partial Class frmSendungsdetailsNEU
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSendungsdetailsNEU))
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle14 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()
@@ -354,6 +354,9 @@ Partial Class frmSendungsdetailsNEU
        Me.EmpfängerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.LaufzettelDruckenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ZollstoppAMBARToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ATANAKToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ImportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ToolStripMenuItem15 = New System.Windows.Forms.ToolStripMenuItem()
        Me.SpeditionSUBENToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -364,9 +367,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.ATANAKToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ImportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ExportT1ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.pnl.SuspendLayout()
        Me.Panel4.SuspendLayout()
        Me.TabControl1.SuspendLayout()
@@ -484,14 +485,14 @@ Partial Class frmSendungsdetailsNEU
        Me.dgvAnhang.AllowUserToResizeColumns = False
        Me.dgvAnhang.AllowUserToResizeRows = False
        Me.dgvAnhang.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvAnhang.DefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvAnhang.DefaultCellStyle = DataGridViewCellStyle8
        Me.dgvAnhang.Dock = System.Windows.Forms.DockStyle.Fill
        Me.dgvAnhang.Location = New System.Drawing.Point(0, 45)
        Me.dgvAnhang.Name = "dgvAnhang"
@@ -1331,44 +1332,44 @@ Partial Class frmSendungsdetailsNEU
        Me.gridVermerke.AllowUserToAddRows = False
        Me.gridVermerke.AllowUserToDeleteRows = False
        Me.gridVermerke.AllowUserToResizeRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle9.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
        Me.gridVermerke.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.LightBlue
-        DataGridViewCellStyle3.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle10.BackColor = System.Drawing.Color.LightBlue
+        DataGridViewCellStyle10.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10
        Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
-        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle4
+        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle11
        Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill
        Me.gridVermerke.Location = New System.Drawing.Point(0, 0)
        Me.gridVermerke.MultiSelect = False
        Me.gridVermerke.Name = "gridVermerke"
        Me.gridVermerke.ReadOnly = True
-        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
        Me.gridVermerke.RowHeadersVisible = False
        Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle13
        Me.gridVermerke.RowTemplate.Height = 20
        Me.gridVermerke.RowTemplate.ReadOnly = True
        Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
@@ -1984,8 +1985,8 @@ Partial Class frmSendungsdetailsNEU
        'clmnPreis
        '
        Me.clmnPreis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        DataGridViewCellStyle7.Format = "C2"
-        Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle14.Format = "C2"
+        Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle14
        Me.clmnPreis.HeaderText = "Preis"
        Me.clmnPreis.MaxInputLength = 15
        Me.clmnPreis.Name = "clmnPreis"
@@ -4640,6 +4641,25 @@ Partial Class frmSendungsdetailsNEU
        Me.ZollstoppAMBARToolStripMenuItem.Size = New System.Drawing.Size(262, 22)
        Me.ZollstoppAMBARToolStripMenuItem.Text = "Zollstopp (AMBAR)"
        '
+        'ATANAKToolStripMenuItem
+        '
+        Me.ATANAKToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ImportToolStripMenuItem, Me.ExportToolStripMenuItem, Me.ExportT1ToolStripMenuItem})
+        Me.ATANAKToolStripMenuItem.Name = "ATANAKToolStripMenuItem"
+        Me.ATANAKToolStripMenuItem.Size = New System.Drawing.Size(262, 22)
+        Me.ATANAKToolStripMenuItem.Text = "ATANAK"
+        '
+        'ImportToolStripMenuItem
+        '
+        Me.ImportToolStripMenuItem.Name = "ImportToolStripMenuItem"
+        Me.ImportToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ImportToolStripMenuItem.Text = "Import"
+        '
+        'ExportToolStripMenuItem
+        '
+        Me.ExportToolStripMenuItem.Name = "ExportToolStripMenuItem"
+        Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ExportToolStripMenuItem.Text = "Export"
+        '
        'ContextMenuStrip1
        '
        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem15, Me.SpeditionSUBENToolStripMenuItem, Me.ToolStripMenuItem16})
@@ -4706,24 +4726,11 @@ Partial Class frmSendungsdetailsNEU
        Me.NurÖffnenToolStripMenuItem.Size = New System.Drawing.Size(247, 22)
        Me.NurÖffnenToolStripMenuItem.Text = "nur öffnen"
        '
-        'ATANAKToolStripMenuItem
+        'ExportT1ToolStripMenuItem
        '
-        Me.ATANAKToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ImportToolStripMenuItem, Me.ExportToolStripMenuItem})
-        Me.ATANAKToolStripMenuItem.Name = "ATANAKToolStripMenuItem"
-        Me.ATANAKToolStripMenuItem.Size = New System.Drawing.Size(262, 22)
-        Me.ATANAKToolStripMenuItem.Text = "ATANAK"
-        '
-        'ImportToolStripMenuItem
-        '
-        Me.ImportToolStripMenuItem.Name = "ImportToolStripMenuItem"
-        Me.ImportToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
-        Me.ImportToolStripMenuItem.Text = "Import"
-        '
-        'ExportToolStripMenuItem
-        '
-        Me.ExportToolStripMenuItem.Name = "ExportToolStripMenuItem"
-        Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
-        Me.ExportToolStripMenuItem.Text = "Export"
+        Me.ExportT1ToolStripMenuItem.Name = "ExportT1ToolStripMenuItem"
+        Me.ExportT1ToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ExportT1ToolStripMenuItem.Text = "Export T1"
        '
        'frmSendungsdetailsNEU
        '
@@ -5156,4 +5163,5 @@ Partial Class frmSendungsdetailsNEU
    Friend WithEvents ATANAKToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents ImportToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents ExportToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ExportT1ToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/Aviso/frmSendungsdetailsNEU.resx
+++ b/Aviso/frmSendungsdetailsNEU.resx
@@ -1480,6 +1480,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
@@ -1600,6 +1603,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
@@ -1832,6 +1847,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>
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -4293,7 +4293,7 @@ Public Class frmSendungsdetailsNEU

                    Blatt.Range("F13").Value = "" 'DDA
                    Blatt.Range("C26").Value = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht
-                    Blatt.Range("G26").Value = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli
+                    Blatt.Range("G26").Value = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli.Replace(",", "").Replace(".", "")
                    Blatt.Range("D27").Value = "" 'Procedure
                    Blatt.Range("F29").Value = "" 'CPC
                    Blatt.Range("F30").Value = "" 'Supervising HMRC Adress
@@ -4307,6 +4307,169 @@ Public Class frmSendungsdetailsNEU
                    Blatt.Range("G42").Value = Now.ToShortDateString


+                    Datei.Save
+
+                    If False Then
+                        Blatt.PrintOutEx()
+                    Else
+                        'Process.Start(Path)
+                        .Visible = True
+
+                    End If
+                End With
+
+            End If
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub ExportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExportToolStripMenuItem.Click
+
+        Me.Cursor = Cursors.WaitCursor
+        Try
+            Dim Path = ""
+            If True Then
+
+
+                Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\ATANAK\"
+                If Not My.Computer.FileSystem.DirectoryExists(sPath) Then
+                    My.Computer.FileSystem.CreateDirectory(sPath)
+                End If
+
+
+                Dim exclApp As Object 'as Application
+                Dim Datei As Object 'as WorkBook
+                Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet
+                exclApp = CreateObject("Excel.Application")
+
+                With exclApp
+                    .Visible = False
+
+                    Try
+                        Path = sPath & "ATANAK_Export_" & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "-" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr & "" & " .xlsx"
+                        While System.IO.File.Exists(Path)
+                            Path = sPath & "ATANAK_Export_" & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "-" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr & "" & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx"
+                        End While
+                        My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.ATANAK_Instructions_Export, False)
+                    Catch ex As System.Exception
+                        '  MsgBox(ex.Message)
+                        MsgBox("ERROR 01: " & ex.Message & vbNewLine & ex.StackTrace)
+                        Me.Cursor = Cursors.Default
+
+                        Exit Sub
+                    End Try
+
+                    Datei = .Workbooks.Open(Path) 'Anpassen
+                    Blatt = Datei.Worksheets(1) 'Anpassen
+
+                    Blatt.Range("B8").Value = SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "/" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr
+                    Blatt.Range("D6").Value = AVISO.LKW_Nr
+
+                    Dim absender = ""
+                    If SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr > 0 Then
+                        Dim KD As New VERAG_PROG_ALLGEMEIN.cKunde(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr)
+                        If KD IsNot Nothing AndAlso If(KD.EORITIN, "") <> "" Then
+                            absender = KD.EORITIN
+                        End If
+                    End If
+                    absender = (absender & " " & SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender).Trim
+                    Blatt.Range("E10").Value = absender
+
+                    Blatt.Range("E11").Value = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger
+
+
+                    'Blatt.Range("C26").Value = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht
+                    Blatt.Range("I15").Value = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli.Replace(",", "").Replace(".", "")
+                    Blatt.Range("B17").Value = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenbezeichnung
+
+
+                    Blatt.Range("C33").Value = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.Fullname
+                    Blatt.Range("H33").Value = Now.ToShortDateString
+
+
+                    Datei.Save
+
+                    If False Then
+                        Blatt.PrintOutEx()
+                    Else
+                        'Process.Start(Path)
+                        .Visible = True
+
+                    End If
+                End With
+
+            End If
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub ExportT1ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExportT1ToolStripMenuItem.Click
+
+        Me.Cursor = Cursors.WaitCursor
+        Try
+            Dim Path = ""
+            If True Then
+
+
+                Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\ATANAK\"
+                If Not My.Computer.FileSystem.DirectoryExists(sPath) Then
+                    My.Computer.FileSystem.CreateDirectory(sPath)
+                End If
+
+
+                Dim exclApp As Object 'as Application
+                Dim Datei As Object 'as WorkBook
+                Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet
+                exclApp = CreateObject("Excel.Application")
+
+                With exclApp
+                    .Visible = False
+
+                    Try
+                        Path = sPath & "ATANAK_ExportT1_" & AVISO.AvisoID & "" & " .xlsx"
+                        While System.IO.File.Exists(Path)
+                            Path = sPath & "ATANAK_ExportT1_" & AVISO.AvisoID & "" & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx"
+                        End While
+                        My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.ATANAK_Instructions_Export_T1, False)
+                    Catch ex As System.Exception
+                        '  MsgBox(ex.Message)
+                        MsgBox("ERROR 01: " & ex.Message & vbNewLine & ex.StackTrace)
+                        Me.Cursor = Cursors.Default
+
+                        Exit Sub
+                    End Try
+
+                    Datei = .Workbooks.Open(Path) 'Anpassen
+                    Blatt = Datei.Worksheets(1) 'Anpassen
+
+                    Blatt.Range("F7").Value = AVISO.AvisoID
+                    Blatt.Range("F6").Value = AVISO.LKW_Nr
+
+                    Dim fraechter = ""
+                    If SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr > 0 Then
+                        Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr)
+                        If AD IsNot Nothing Then
+                            Blatt.Range("E13").Value = AD.Name_1
+                            Blatt.Range("E14").Value = (If(AD.LandKz, "") & " " & If(AD.PLZ, "") & " " & If(AD.Ort, "") & " " & If(AD.Straße, "")).trim
+                        End If
+                        Blatt.Range("E13").Value = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtfuehrer
+                    Else
+                        Blatt.Range("E13").Value = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtfuehrer
+                    End If
+
+
+
+                    'Blatt.Range("C26").Value = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht
+                    Blatt.Range("I17").Value = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli.Replace(",", "").Replace(".", "")
+
+                    Blatt.Range("C25").Value = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.Fullname
+                    Blatt.Range("H25").Value = Now.ToShortDateString
+
+
                    Datei.Save

                    If False Then