Zollstopp, Anhänge Atilla, div.

2025-01-09 10:49:50 +01:00
parent dc06b1c3d9
commit 9dc0c1fca3
11 changed files with 186 additions and 83 deletions
--- 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.6.8")>
-<Assembly: AssemblyFileVersion("4.0.6.8")>
+<Assembly: AssemblyVersion("4.0.7.3")>
+<Assembly: AssemblyFileVersion("4.0.7.3")>
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -59,6 +59,7 @@ Partial Class frmHauptfenster
        Me.StandorteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AvisoTVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.InfoTextÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.TVEditorNewToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.SecretAvisoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AdministrationToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.KdNrZuordnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -410,7 +411,6 @@ Partial Class frmHauptfenster
        Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
        Me.Panel5 = New System.Windows.Forms.Panel()
        Me.Panel7 = New System.Windows.Forms.Panel()
-        Me.TVEditorNewToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.conMenuAviso.SuspendLayout()
        Me.MenuStrip1.SuspendLayout()
        Me.pnlDetailsRechts.SuspendLayout()
@@ -621,9 +621,15 @@ Partial Class frmHauptfenster
        'InfoTextÄndernToolStripMenuItem
        '
        Me.InfoTextÄndernToolStripMenuItem.Name = "InfoTextÄndernToolStripMenuItem"
-        Me.InfoTextÄndernToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.InfoTextÄndernToolStripMenuItem.Size = New System.Drawing.Size(156, 22)
        Me.InfoTextÄndernToolStripMenuItem.Text = "InfoText ändern"
        '
+        'TVEditorNewToolStripMenuItem
+        '
+        Me.TVEditorNewToolStripMenuItem.Name = "TVEditorNewToolStripMenuItem"
+        Me.TVEditorNewToolStripMenuItem.Size = New System.Drawing.Size(156, 22)
+        Me.TVEditorNewToolStripMenuItem.Text = "TVEditorNew"
+        '
        'SecretAvisoToolStripMenuItem
        '
        Me.SecretAvisoToolStripMenuItem.Name = "SecretAvisoToolStripMenuItem"
@@ -906,26 +912,26 @@ Partial Class frmHauptfenster
        'GenerelleGestellungenDurchsuchenToolStripMenuItem
        '
        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Name = "GenerelleGestellungenDurchsuchenToolStripMenuItem"
-        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Text = "Generelle Gestellungen durchsuchen"
        Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Visible = False
        '
        'KundenVonFremdenSpeditionenToolStripMenuItem
        '
        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Name = "KundenVonFremdenSpeditionenToolStripMenuItem"
-        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.KundenVonFremdenSpeditionenToolStripMenuItem.Text = "Kunden von fremden Speditionen"
        '
        'KundenverwaltungToolStripMenuItem
        '
        Me.KundenverwaltungToolStripMenuItem.Name = "KundenverwaltungToolStripMenuItem"
-        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.KundenverwaltungToolStripMenuItem.Text = "Kundenverwaltung"
        '
        'MDMParkplatzkartenToolStripMenuItem
        '
        Me.MDMParkplatzkartenToolStripMenuItem.Name = "MDMParkplatzkartenToolStripMenuItem"
-        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.MDMParkplatzkartenToolStripMenuItem.Text = "MDM - Parkplatzkarten"
        '
        'SMSSendenToolStripMenuItem
@@ -933,7 +939,7 @@ Partial Class frmHauptfenster
        Me.SMSSendenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueSMSSendenToolStripMenuItem, Me.GesendeteSMSToolStripMenuItem})
        Me.SMSSendenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.handy2
        Me.SMSSendenToolStripMenuItem.Name = "SMSSendenToolStripMenuItem"
-        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.SMSSendenToolStripMenuItem.Text = "SMS"
        '
        'NeueSMSSendenToolStripMenuItem
@@ -951,51 +957,51 @@ Partial Class frmHauptfenster
        'ZollprogrammeNachEORIDurchsuchenToolStripMenuItem
        '
        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Name = "ZollprogrammeNachEORIDurchsuchenToolStripMenuItem"
-        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Text = "Zollprogramme nach EORI durchsuchen"
        '
        'MRNBarcodedruckToolStripMenuItem
        '
        Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem"
-        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck"
        '
        'ToolStripSeparator12
        '
        Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
-        Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator12.Size = New System.Drawing.Size(388, 6)
        '
        'tool_BRGXLS
        '
        Me.tool_BRGXLS.Name = "tool_BRGXLS"
-        Me.tool_BRGXLS.Size = New System.Drawing.Size(383, 22)
+        Me.tool_BRGXLS.Size = New System.Drawing.Size(391, 30)
        Me.tool_BRGXLS.Text = "Bürgschaften Excel"
        '
        'ToolStripMenuItem4
        '
        Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4"
-        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(391, 30)
        Me.ToolStripMenuItem4.Text = "DE | Gesamtsicherheit VERAG GmbH - Excel"
        Me.ToolStripMenuItem4.Visible = False
        '
        'ToolStripMenuItem5
        '
        Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
-        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(391, 30)
        Me.ToolStripMenuItem5.Text = "AT | Gesamtsicherheit VERAG AG - Excel"
        Me.ToolStripMenuItem5.Visible = False
        '
        'BürgschaftenExcelToolStripMenuItem
        '
        Me.BürgschaftenExcelToolStripMenuItem.Name = "BürgschaftenExcelToolStripMenuItem"
-        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.BürgschaftenExcelToolStripMenuItem.Text = "AT | Gesamtsicherheit VERAG Customs Service - Excel"
        Me.BürgschaftenExcelToolStripMenuItem.Visible = False
        '
        'ToolStripMenuItem6
        '
        Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6"
-        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem6.Size = New System.Drawing.Size(391, 30)
        Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel"
        Me.ToolStripMenuItem6.Visible = False
        '
@@ -1003,7 +1009,7 @@ Partial Class frmHauptfenster
        '
        Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem, Me.DEAmbarToolStripMenuItem})
        Me.GesamtsicherheitenToolStripMenuItem.Name = "GesamtsicherheitenToolStripMenuItem"
-        Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.GesamtsicherheitenToolStripMenuItem.Text = "Gesamtsicherheiten"
        Me.GesamtsicherheitenToolStripMenuItem.Visible = False
        '
@@ -1047,25 +1053,25 @@ Partial Class frmHauptfenster
        'ToolStripMenuItem10
        '
        Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
-        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem10.Size = New System.Drawing.Size(391, 30)
        Me.ToolStripMenuItem10.Text = "TICKET Parkplatz"
        '
        'TICKETWaidhausToolStripMenuItem
        '
        Me.TICKETWaidhausToolStripMenuItem.Name = "TICKETWaidhausToolStripMenuItem"
-        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.TICKETWaidhausToolStripMenuItem.Text = "Infoschreiben Parkplatz"
        '
        'ToolStripSeparator10
        '
        Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
-        Me.ToolStripSeparator10.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator10.Size = New System.Drawing.Size(388, 6)
        '
        'DAKOSYToolStripMenuItem
        '
        Me.DAKOSYToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StammreferenzenVerwaltenToolStripMenuItem})
        Me.DAKOSYToolStripMenuItem.Name = "DAKOSYToolStripMenuItem"
-        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.DAKOSYToolStripMenuItem.Text = "DAKOSY"
        '
        'StammreferenzenVerwaltenToolStripMenuItem
@@ -1077,69 +1083,69 @@ Partial Class frmHauptfenster
        'ToolStripSeparator23
        '
        Me.ToolStripSeparator23.Name = "ToolStripSeparator23"
-        Me.ToolStripSeparator23.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator23.Size = New System.Drawing.Size(388, 6)
        '
        'toolOriginalATR
        '
        Me.toolOriginalATR.Image = Global.AVISO.My.Resources.Resources.atr
        Me.toolOriginalATR.Name = "toolOriginalATR"
-        Me.toolOriginalATR.Size = New System.Drawing.Size(383, 22)
+        Me.toolOriginalATR.Size = New System.Drawing.Size(391, 30)
        Me.toolOriginalATR.Text = "Original-ATR"
        '
        'SDLAbholaufträgeToolStripMenuItem
        '
        Me.SDLAbholaufträgeToolStripMenuItem.Name = "SDLAbholaufträgeToolStripMenuItem"
-        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.SDLAbholaufträgeToolStripMenuItem.Text = "SDL Abholaufträge"
        '
        'ToolStripMenuItem13
        '
        Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13"
-        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(383, 22)
+        Me.ToolStripMenuItem13.Size = New System.Drawing.Size(391, 30)
        Me.ToolStripMenuItem13.Text = "Postversand (Einschreiben)"
        '
        'VorauskassenToolStripMenuItem
        '
        Me.VorauskassenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.vorauszahlung
        Me.VorauskassenToolStripMenuItem.Name = "VorauskassenToolStripMenuItem"
-        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.VorauskassenToolStripMenuItem.Text = "Vorauskassen"
        '
        'ToolStripSeparator11
        '
        Me.ToolStripSeparator11.Name = "ToolStripSeparator11"
-        Me.ToolStripSeparator11.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator11.Size = New System.Drawing.Size(388, 6)
        '
        'EssensbestellungenToolStripMenuItem
        '
        Me.EssensbestellungenToolStripMenuItem.Name = "EssensbestellungenToolStripMenuItem"
-        Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.EssensbestellungenToolStripMenuItem.Text = "Essensbestellungen"
        Me.EssensbestellungenToolStripMenuItem.Visible = False
        '
        'AdministrationEssensbestellungenToolStripMenuItem
        '
        Me.AdministrationEssensbestellungenToolStripMenuItem.Name = "AdministrationEssensbestellungenToolStripMenuItem"
-        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.AdministrationEssensbestellungenToolStripMenuItem.Text = "Administration Essensbestellungen"
        Me.AdministrationEssensbestellungenToolStripMenuItem.Visible = False
        '
        'ToolStripSeparator24
        '
        Me.ToolStripSeparator24.Name = "ToolStripSeparator24"
-        Me.ToolStripSeparator24.Size = New System.Drawing.Size(380, 6)
+        Me.ToolStripSeparator24.Size = New System.Drawing.Size(388, 6)
        '
        'WarenorteToolStripMenuItem
        '
        Me.WarenorteToolStripMenuItem.Name = "WarenorteToolStripMenuItem"
-        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.WarenorteToolStripMenuItem.Text = "Warenorte"
        '
        'DatevBuchungsexportToolStripMenuItem
        '
        Me.DatevBuchungsexportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EMAILToolStripMenuItem, Me.FTPToolStripMenuItem})
        Me.DatevBuchungsexportToolStripMenuItem.Name = "DatevBuchungsexportToolStripMenuItem"
-        Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.DatevBuchungsexportToolStripMenuItem.Text = "Datev  Buchungsexport"
        Me.DatevBuchungsexportToolStripMenuItem.Visible = False
        '
@@ -1158,14 +1164,15 @@ Partial Class frmHauptfenster
        'APIToolStripMenuItem
        '
        Me.APIToolStripMenuItem.Name = "APIToolStripMenuItem"
-        Me.APIToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.APIToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.APIToolStripMenuItem.Text = "API"
        '
        'FIBUSachkontenToolStripMenuItem
        '
        Me.FIBUSachkontenToolStripMenuItem.Name = "FIBUSachkontenToolStripMenuItem"
-        Me.FIBUSachkontenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.FIBUSachkontenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
        Me.FIBUSachkontenToolStripMenuItem.Text = "FIBU Sachkonten"
+        Me.FIBUSachkontenToolStripMenuItem.Visible = False
        '
        'StatistikToolStripMenuItem
        '
@@ -2544,7 +2551,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(158, 300)
+        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(77, 300)
        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
        '
        'pnl
@@ -3916,7 +3923,6 @@ Partial Class frmHauptfenster
        Me.pnlLeft.Visible = False
        '
        'UsrCntlBenachrichtigungen2
-        'TVEditorNewToolStripMenuItem
        '
        Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill
        Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51)
@@ -3941,9 +3947,6 @@ Partial Class frmHauptfenster
        Me.Panel7.Name = "Panel7"
        Me.Panel7.Size = New System.Drawing.Size(252, 51)
        Me.Panel7.TabIndex = 4
-        Me.TVEditorNewToolStripMenuItem.Name = "TVEditorNewToolStripMenuItem"
-        Me.TVEditorNewToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
-        Me.TVEditorNewToolStripMenuItem.Text = "TVEditorNew"
        '
        'frmHauptfenster
        '
--- a/Aviso/frmHauptfenster.resx
+++ b/Aviso/frmHauptfenster.resx
@@ -292,7 +292,7 @@
    <value>17, 17</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>47</value>
+    <value>25</value>
  </metadata>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -392,6 +392,11 @@ Public Class frmHauptfenster
            MailvorlagenToolStripMenuItem.Visible = True
        End If

+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Leistungen_FIBU", "SDL") Then
+            FIBUSachkontenToolStripMenuItem.Visible = True
+        End If
+
+
        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MITARBEITER_VERZEICHNIS", "SDL") Then
            btnMAVerzeichnis.Visible = True
        End If
@@ -4916,8 +4921,10 @@ Public Class frmHauptfenster
    End Sub

    Private Sub FIBUSachkontenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FIBUSachkontenToolStripMenuItem.Click
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Leistungen_FIBU", "SDL") Then
            Dim f As New SDL.frmLeistundenFIBUKonten(VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Leistungen_FIBU", "SDL"))
            f.ShowDialog(Me)
+        End If
    End Sub

    Private Sub SpireLizenzPrüfenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SpireLizenzPrüfenToolStripMenuItem.Click
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -1505,6 +1505,7 @@ Public Class frmSendungsdetailsNEU
                    usrcntl_NCTS.txtT1VerzollungsadresseEORI_NL.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_EORI_NL, "")
                    usrcntl_NCTS.txtT1VerzollungsadresseAnspr.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Ansprechpartner, "")
                    usrcntl_NCTS.txtT1VerzollungsadresseBestimmungszollstelle.SET_VALUE(loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Bestimmungszollstelle, ""))
+                    usrcntl_NCTS.txtT1VerzollungsadresseATANr.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATANr, "")
                    usrcntl_NCTS.cbxNCTSAufDispo.Checked = SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSaufDISPO

                    pnlT1.Controls.Add(usrcntl_NCTS)
@@ -1911,6 +1912,7 @@ Public Class frmSendungsdetailsNEU
                    SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_EORI_NL = usrcntl_NCTS.txtT1VerzollungsadresseEORI_NL.Text
                    SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Ansprechpartner = usrcntl_NCTS.txtT1VerzollungsadresseAnspr.Text
                    SENDUNG_LIST(CURRENT_INDEX).NCTS_Bestimmungszollstelle = usrcntl_NCTS.txtT1VerzollungsadresseBestimmungszollstelle._value
+                    SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATANr = usrcntl_NCTS.txtT1VerzollungsadresseATANr.Text
                    SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId = If(usrcntl_NCTS.NCTS_GA IsNot Nothing, usrcntl_NCTS.NCTS_GA.nga_id, Nothing)
                    SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSaufDISPO = usrcntl_NCTS.cbxNCTSAufDispo.Checked
                End If
@@ -5985,11 +5987,12 @@ Public Class frmSendungsdetailsNEU
        Dim f = New frmFrachtkostenBerechnen()
        f.UsrcntlFrachtkostenberechnung1.init(AvisoId, txtAbsenderKdNr._value, txtEmpfaengerKdNr._value, txtGewicht.Text, txtFrachtkostenGesamt.Text, rtbWarenbezeichnung.Text, txtWarenwert._value)
        If f.ShowDialog = DialogResult.OK Then
-
+            txtFrachtkostenEU._value = f.UsrcntlFrachtkostenberechnung1.EUAnteil.ToString("N2")
+            txtFrachtkostenNichtEU._value = f.UsrcntlFrachtkostenberechnung1.nichtEUAnteil.ToString("N2")
+            txtFrachtkostenGesamt._value = (f.UsrcntlFrachtkostenberechnung1.EUAnteil + f.UsrcntlFrachtkostenberechnung1.nichtEUAnteil).ToString("N2")
        End If


-
    End Sub

    Private Sub btn_FrachtkostenBerechnen_Click(sender As Object, e As EventArgs) Handles btn_FrachtkostenBerechnen.Click
--- a/Aviso/frmZollstopp.Designer.vb
+++ b/Aviso/frmZollstopp.Designer.vb
@@ -34,6 +34,7 @@ Partial Class frmZollstopp
        Me.rtbAbsender = New VERAG_PROG_ALLGEMEIN.MyRichTextBox()
        Me.lklEmpfangerUbernehmen = New System.Windows.Forms.LinkLabel()
        Me.rtbATANr = New VERAG_PROG_ALLGEMEIN.MyRichTextBox()
+        Me.Button1 = New System.Windows.Forms.Button()
        Me.SuspendLayout()
        '
        'rtbZollstop
@@ -111,7 +112,7 @@ Partial Class frmZollstopp
        Me.btnOffnen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
        Me.btnOffnen.Image = Global.AVISO.My.Resources.Resources.pdf1
        Me.btnOffnen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnOffnen.Location = New System.Drawing.Point(379, 557)
+        Me.btnOffnen.Location = New System.Drawing.Point(378, 556)
        Me.btnOffnen.Name = "btnOffnen"
        Me.btnOffnen.Size = New System.Drawing.Size(160, 59)
        Me.btnOffnen.TabIndex = 8
@@ -164,12 +165,26 @@ Partial Class frmZollstopp
        Me.rtbATANr.TabIndex = 10
        Me.rtbATANr.Text = ""
        '
+        'Button1
+        '
+        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
+        Me.Button1.Image = Global.AVISO.My.Resources.Resources.printer
+        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button1.Location = New System.Drawing.Point(212, 555)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(160, 59)
+        Me.Button1.TabIndex = 11
+        Me.Button1.Text = "         Drucken"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
        'frmZollstopp
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.White
        Me.ClientSize = New System.Drawing.Size(551, 626)
+        Me.Controls.Add(Me.Button1)
        Me.Controls.Add(Me.rtbATANr)
        Me.Controls.Add(Me.lklEmpfangerUbernehmen)
        Me.Controls.Add(Me.Label3)
@@ -201,4 +216,5 @@ Partial Class frmZollstopp
    Friend WithEvents rtbAbsender As VERAG_PROG_ALLGEMEIN.MyRichTextBox
    Friend WithEvents lklEmpfangerUbernehmen As LinkLabel
    Friend WithEvents rtbATANr As VERAG_PROG_ALLGEMEIN.MyRichTextBox
+    Friend WithEvents Button1 As Button
 End Class
--- a/Aviso/frmZollstopp.vb
+++ b/Aviso/frmZollstopp.vb
@@ -19,13 +19,14 @@
        rtbZollstop.Text = SND.getNCTSAdress()
    End Sub

-    Private Sub btnOffnen_Click(sender As Object, e As EventArgs) Handles btnOffnen.Click
+    Private Sub btnOffnen_Click(sender As Object, e As EventArgs) Handles btnOffnen.Click, Button1.Click
        Me.Cursor = Cursors.WaitCursor

        Try
            Dim path = SDL.FormularManagerNEU.Zollstopp(rtbZollstop.Text, rtbEntladestelle.Text, rtbKommentare.Text, rtbAbsender.Text, rtbATANr.Text)
            If path <> "" Then
-                    Process.Start(path)
+                If sender Is btnOffnen Then Process.Start(path)
+                If sender Is Button1 Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({path})
            End If

        Catch ex As Exception
--- a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb
+++ b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb
@@ -54,6 +54,7 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.SplitContainer = New System.Windows.Forms.SplitContainer()
        Me.tbcntr = New System.Windows.Forms.TabControl()
        Me.tbVermerke = New System.Windows.Forms.TabPage()
+        Me.UsrCntlVermerkeATilla1 = New AVISO.usrCntlVermerkeATilla()
        Me.tbZollanmeldungen = New System.Windows.Forms.TabPage()
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.dgvZollAnmeldungen = New System.Windows.Forms.DataGridView()
@@ -158,7 +159,7 @@ 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.UsrCntlVermerkeATilla1 = New AVISO.usrCntlVermerkeATilla()
+        Me.Button14 = New System.Windows.Forms.Button()
        Me.pnlDetailsRechts.SuspendLayout()
        Me.Panel3.SuspendLayout()
        CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -278,6 +279,17 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.tbVermerke.Text = "Vermerk eintragen"
        Me.tbVermerke.UseVisualStyleBackColor = True
        '
+        'UsrCntlVermerkeATilla1
+        '
+        Me.UsrCntlVermerkeATilla1.AutoScroll = True
+        Me.UsrCntlVermerkeATilla1.BackColor = System.Drawing.SystemColors.Control
+        Me.UsrCntlVermerkeATilla1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlVermerkeATilla1.Location = New System.Drawing.Point(3, 3)
+        Me.UsrCntlVermerkeATilla1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.UsrCntlVermerkeATilla1.Name = "UsrCntlVermerkeATilla1"
+        Me.UsrCntlVermerkeATilla1.Size = New System.Drawing.Size(561, 151)
+        Me.UsrCntlVermerkeATilla1.TabIndex = 0
+        '
        'tbZollanmeldungen
        '
        Me.tbZollanmeldungen.Controls.Add(Me.Panel1)
@@ -545,12 +557,13 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.dgvanhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
        Me.dgvanhaenge.ShowCellErrors = False
        Me.dgvanhaenge.ShowRowErrors = False
-        Me.dgvanhaenge.Size = New System.Drawing.Size(561, 113)
+        Me.dgvanhaenge.Size = New System.Drawing.Size(561, 81)
        Me.dgvanhaenge.TabIndex = 102
        Me.dgvanhaenge.TabStop = False
        '
        'Panel5
        '
+        Me.Panel5.Controls.Add(Me.Button14)
        Me.Panel5.Controls.Add(Me.Button13)
        Me.Panel5.Controls.Add(Me.btnImportAssi)
        Me.Panel5.Controls.Add(Me.btnQuckScan)
@@ -558,20 +571,20 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.Panel5.Controls.Add(Me.Button4)
        Me.Panel5.Controls.Add(Me.Button10)
        Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.Panel5.Location = New System.Drawing.Point(3, 116)
+        Me.Panel5.Location = New System.Drawing.Point(3, 84)
        Me.Panel5.Name = "Panel5"
-        Me.Panel5.Size = New System.Drawing.Size(561, 38)
+        Me.Panel5.Size = New System.Drawing.Size(561, 70)
        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.Anchor = CType((System.Windows.Forms.AnchorStyles.Top 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.Location = New System.Drawing.Point(381, 0)
        Me.Button13.Name = "Button13"
-        Me.Button13.Size = New System.Drawing.Size(80, 37)
+        Me.Button13.Size = New System.Drawing.Size(80, 36)
        Me.Button13.TabIndex = 113
        Me.Button13.Text = "Scan.."
        Me.Button13.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -579,14 +592,12 @@ Partial Class usrcntlAktDetailsATILLANeu
        '
        'btnImportAssi
        '
-        Me.btnImportAssi.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.btnImportAssi.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnImportAssi.Image = CType(resources.GetObject("btnImportAssi.Image"), System.Drawing.Image)
        Me.btnImportAssi.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnImportAssi.Location = New System.Drawing.Point(1, 1)
+        Me.btnImportAssi.Location = New System.Drawing.Point(1, 34)
        Me.btnImportAssi.Name = "btnImportAssi"
-        Me.btnImportAssi.Size = New System.Drawing.Size(98, 37)
+        Me.btnImportAssi.Size = New System.Drawing.Size(133, 36)
        Me.btnImportAssi.TabIndex = 112
        Me.btnImportAssi.Text = "Import-Assistent"
        Me.btnImportAssi.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -594,13 +605,13 @@ Partial Class usrcntlAktDetailsATILLANeu
        '
        'btnQuckScan
        '
-        Me.btnQuckScan.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnQuckScan.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.btnQuckScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnQuckScan.Image = CType(resources.GetObject("btnQuckScan.Image"), System.Drawing.Image)
        Me.btnQuckScan.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnQuckScan.Location = New System.Drawing.Point(458, 1)
+        Me.btnQuckScan.Location = New System.Drawing.Point(460, 0)
        Me.btnQuckScan.Name = "btnQuckScan"
-        Me.btnQuckScan.Size = New System.Drawing.Size(103, 37)
+        Me.btnQuckScan.Size = New System.Drawing.Size(103, 36)
        Me.btnQuckScan.TabIndex = 108
        Me.btnQuckScan.Text = "Quick-Scan"
        Me.btnQuckScan.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -608,13 +619,13 @@ Partial Class usrcntlAktDetailsATILLANeu
        '
        'Button11
        '
-        Me.Button11.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button11.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        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(98, 1)
+        Me.Button11.Location = New System.Drawing.Point(491, 34)
        Me.Button11.Name = "Button11"
-        Me.Button11.Size = New System.Drawing.Size(72, 37)
+        Me.Button11.Size = New System.Drawing.Size(72, 36)
        Me.Button11.TabIndex = 111
        Me.Button11.Text = "CMR"
        Me.Button11.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -622,13 +633,13 @@ Partial Class usrcntlAktDetailsATILLANeu
        '
        'Button4
        '
-        Me.Button4.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        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(169, 1)
+        Me.Button4.Location = New System.Drawing.Point(171, 0)
        Me.Button4.Name = "Button4"
-        Me.Button4.Size = New System.Drawing.Size(100, 37)
+        Me.Button4.Size = New System.Drawing.Size(100, 36)
        Me.Button4.TabIndex = 109
        Me.Button4.Text = "PDF " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "hochladen"
        Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -636,13 +647,13 @@ Partial Class usrcntlAktDetailsATILLANeu
        '
        'Button10
        '
-        Me.Button10.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button10.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        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(268, 1)
+        Me.Button10.Location = New System.Drawing.Point(270, 0)
        Me.Button10.Name = "Button10"
-        Me.Button10.Size = New System.Drawing.Size(113, 37)
+        Me.Button10.Size = New System.Drawing.Size(113, 36)
        Me.Button10.TabIndex = 110
        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
@@ -1758,16 +1769,18 @@ Partial Class usrcntlAktDetailsATILLANeu
        Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Size = New System.Drawing.Size(279, 30)
        Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Text = "Aus Zwischenablage einfügen (Paste)"
        '
-        'UsrCntlVermerkeATilla1
+        'Button14
        '
-        Me.UsrCntlVermerkeATilla1.AutoScroll = True
-        Me.UsrCntlVermerkeATilla1.BackColor = System.Drawing.SystemColors.Control
-        Me.UsrCntlVermerkeATilla1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlVermerkeATilla1.Location = New System.Drawing.Point(3, 3)
-        Me.UsrCntlVermerkeATilla1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.UsrCntlVermerkeATilla1.Name = "UsrCntlVermerkeATilla1"
-        Me.UsrCntlVermerkeATilla1.Size = New System.Drawing.Size(561, 151)
-        Me.UsrCntlVermerkeATilla1.TabIndex = 0
+        Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button14.Image = CType(resources.GetObject("Button14.Image"), System.Drawing.Image)
+        Me.Button14.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button14.Location = New System.Drawing.Point(1, 0)
+        Me.Button14.Name = "Button14"
+        Me.Button14.Size = New System.Drawing.Size(133, 36)
+        Me.Button14.TabIndex = 114
+        Me.Button14.Text = "PDF " & Global.Microsoft.VisualBasic.ChrW(13) & "zusammenführen"
+        Me.Button14.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button14.UseVisualStyleBackColor = True
        '
        'usrcntlAktDetailsATILLANeu
        '
@@ -1949,4 +1962,5 @@ Partial Class usrcntlAktDetailsATILLANeu
    Friend WithEvents Button12 As Button
    Friend WithEvents btnImportAssi As Button
    Friend WithEvents Button13 As Button
+    Friend WithEvents Button14 As Button
 End Class
--- a/Aviso/usrcntlAktDetailsATILLANeu.resx
+++ b/Aviso/usrcntlAktDetailsATILLANeu.resx
@@ -132,6 +132,40 @@
        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
        fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
        mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="Button14.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        AElFTkSuQmCC
 </value>
  </data>
  <data name="Button13.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
--- a/Aviso/usrcntlAktDetailsATILLANeu.vb
+++ b/Aviso/usrcntlAktDetailsATILLANeu.vb
@@ -1785,4 +1785,29 @@ Public Class usrcntlAktDetailsATILLANeu
        End Try
        Me.Cursor = Cursors.Default
    End Sub
+
+    Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click
+        ' ContextMenuStrip2.Show(Cursor.Position)
+        If dgvanhaenge.SelectedRows.Count >= 1 Then
+            Try
+                Dim files As New List(Of String) ' String() = New String() {"Sample1.pdf", "Sample2.pdf", "Sample3.pdf"}
+                Dim outputFile As String = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Merge.pdf", ".pdf", True,, "Merge") ' "result.pdf"
+
+                'Dim outl As New Outlook.Application
+                'Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+                'Mail = outl.CreateItem(0)
+
+                For Each r As DataGridViewRow In dgvanhaenge.SelectedRows
+                    files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value))
+                Next
+                VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile)
+                'Dim doc As Spire.Pdf.PdfDocumentBase = Spire.Pdf.PdfDocument.MergeFiles(files.ToArray)
+                'doc.Save(outputFile, Spire.Pdf.FileFormat.PDF)
+                Process.Start(outputFile)
+                ' VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.OPEN_PATH()
+            Catch ex As Exception
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            End Try
+        End If
+    End Sub
 End Class
--- a/Aviso/usrcntlFrachtkostenberechnung.vb
+++ b/Aviso/usrcntlFrachtkostenberechnung.vb
@@ -72,7 +72,7 @@ Public Class usrcntlFrachtkostenberechnung
            tbEUAnteil._value = 0
            tbNichtEUAnteil._value = 0
            txbGewicht._value = gewicht.ToString
-            txbFactor._value = 0.15
+        txbFactor._value = 0.3

        txtWare._value = ware
            txtGesamtgewicht._value = gewichtInput