merge

2024-12-13 10:13:01 +01:00
parent 47335be674 9945a62385
commit af3c0ab285
16 changed files with 44377 additions and 142 deletions
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -382,7 +382,7 @@
  <data name="passpic" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\passpic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="house" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="house" type="System.Resources.ResXFileRef, System.Windows.Forms"> 
    <value>..\Resources\house.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="therefore" type="System.Resources.ResXFileRef, System.Windows.Forms">
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -3379,7 +3379,6 @@
    <EmbeddedResource Include="mdm\usrCntlMDMDatenverarbeitungAuswertungen_divers.resx">
      <DependentUpon>usrCntlMDMDatenverarbeitungAuswertungen_divers.vb</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="My Project\licenses.licx" />
    <EmbeddedResource Include="OriginalArchiv_ATR\frmATR.resx">
      <DependentUpon>frmATR.vb</DependentUpon>
    </EmbeddedResource>
--- a/SDL/Speditionsbuch/Nacherfassung/rptSpeditionsbericht_Gelangensbestaetigung.Designer.vb
+++ b/SDL/Speditionsbuch/Nacherfassung/rptSpeditionsbericht_Gelangensbestaetigung.Designer.vb
@@ -25,6 +25,11 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        Me.Label5 = New GrapeCity.ActiveReports.SectionReportModel.Label()
        Me.Line12 = New GrapeCity.ActiveReports.SectionReportModel.Line()
        Me.Detail = New GrapeCity.ActiveReports.SectionReportModel.Detail()
+        Me.lblAbsKdNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblEmpfKdNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblEndEmpfKdNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblFrachtfKdNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblAuftrKdNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
        Me.lblLKWNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
        Me.lblAbs = New GrapeCity.ActiveReports.SectionReportModel.Label()
        Me.lblBezugsNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
@@ -42,10 +47,6 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        Me.txtPackst<EFBFBD>cke = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
        Me.txtVermerk = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
        Me.lblAnzahl = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblAbsKdNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblEmpfKdNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblAuftrKdNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblFrachtfKdNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
        Me.txtKdOpt = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
        Me.Line3 = New GrapeCity.ActiveReports.SectionReportModel.Line()
        Me.Line11 = New GrapeCity.ActiveReports.SectionReportModel.Line()
@@ -58,7 +59,6 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        Me.Shape2 = New GrapeCity.ActiveReports.SectionReportModel.Shape()
        Me.Label7 = New GrapeCity.ActiveReports.SectionReportModel.Label()
        Me.lblEndEmpf = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblEndEmpfKdNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
        Me.PageFooter = New GrapeCity.ActiveReports.SectionReportModel.PageFooter()
        Me.Label28 = New GrapeCity.ActiveReports.SectionReportModel.Label()
        Me.Line2 = New GrapeCity.ActiveReports.SectionReportModel.Line()
@@ -88,6 +88,11 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        CType(Me.Label8, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.Label4, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.Label5, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblAbsKdNr, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblEmpfKdNr, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblEndEmpfKdNr, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblFrachtfKdNr, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblAuftrKdNr, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.lblLKWNr, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.lblAbs, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.lblBezugsNr, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -105,10 +110,6 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        CType(Me.txtPackst<EFBFBD>cke, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.txtVermerk, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.lblAnzahl, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblAbsKdNr, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblEmpfKdNr, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblAuftrKdNr, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblFrachtfKdNr, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.txtKdOpt, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.Label11, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.Label12, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -116,7 +117,6 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        CType(Me.Label20, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.Label7, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.lblEndEmpf, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblEndEmpfKdNr, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.Label28, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.ReportInfo2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.lblDat, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -162,7 +162,7 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        Me.Label6.Name = "Label6"
        Me.Label6.Style = "background-color: #003680; color: White; font-size: 8pt; font-weight: bold; text-" &
    "align: left; vertical-align: middle; ddo-char-set: 1"
-        Me.Label6.Text = "Best<EFBFBD>tigung/Check"
+        Me.Label6.Text = "Check/Best<EFBFBD>tigung"
        Me.Label6.Top = 0.03622048!
        Me.Label6.Width = 1.115747!
        '
@@ -174,7 +174,7 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        Me.Label8.Name = "Label8"
        Me.Label8.Style = "background-color: #003680; color: White; font-size: 8pt; font-weight: bold; text-" &
    "align: left; text-justify: auto; vertical-align: middle; ddo-char-set: 1"
-        Me.Label8.Text = "Firmen/Companies"
+        Me.Label8.Text = "Companies/Firmen"
        Me.Label8.Top = 0.03622048!
        Me.Label8.Width = 3.404331!
        '
@@ -186,7 +186,7 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        Me.Label4.Name = "Label4"
        Me.Label4.Style = "background-color: #003680; color: White; font-size: 8pt; font-weight: bold; text-" &
    "align: left; text-justify: auto; vertical-align: middle; ddo-char-set: 1"
-        Me.Label4.Text = "LKW/Truck, Ware/Goods"
+        Me.Label4.Text = "Truck/LKW, Goods/Ware"
        Me.Label4.Top = 0.03622063!
        Me.Label4.Width = 1.470473!
        '
@@ -198,7 +198,7 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        Me.Label5.Name = "Label5"
        Me.Label5.Style = "background-color: #003680; color: White; font-size: 8pt; font-weight: bold; text-" &
    "align: left; vertical-align: middle; ddo-char-set: 1"
-        Me.Label5.Text = "Abfertigung/Decalaration"
+        Me.Label5.Text = "Declaration/Abfertigung"
        Me.Label5.Top = 0.03622048!
        Me.Label5.Width = 1.479528!
        '
@@ -222,6 +222,71 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        Me.Detail.KeepTogether = True
        Me.Detail.Name = "Detail"
        '
+        'lblAbsKdNr
+        '
+        Me.lblAbsKdNr.Height = 0.1574803!
+        Me.lblAbsKdNr.HyperLink = Nothing
+        Me.lblAbsKdNr.Left = 3.785039!
+        Me.lblAbsKdNr.Name = "lblAbsKdNr"
+        Me.lblAbsKdNr.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0)
+        Me.lblAbsKdNr.Style = "font-size: 7pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" &
+    "ar-set: 1"
+        Me.lblAbsKdNr.Text = "100000 VERAG"
+        Me.lblAbsKdNr.Top = 0.03149589!
+        Me.lblAbsKdNr.Width = 0.4133854!
+        '
+        'lblEmpfKdNr
+        '
+        Me.lblEmpfKdNr.Height = 0.1574803!
+        Me.lblEmpfKdNr.HyperLink = Nothing
+        Me.lblEmpfKdNr.Left = 3.785039!
+        Me.lblEmpfKdNr.Name = "lblEmpfKdNr"
+        Me.lblEmpfKdNr.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0)
+        Me.lblEmpfKdNr.Style = "font-size: 7pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" &
+    "ar-set: 1"
+        Me.lblEmpfKdNr.Text = "100000 VERAG"
+        Me.lblEmpfKdNr.Top = 0.1889762!
+        Me.lblEmpfKdNr.Width = 0.4133847!
+        '
+        'lblEndEmpfKdNr
+        '
+        Me.lblEndEmpfKdNr.Height = 0.1574803!
+        Me.lblEndEmpfKdNr.HyperLink = Nothing
+        Me.lblEndEmpfKdNr.Left = 3.785039!
+        Me.lblEndEmpfKdNr.Name = "lblEndEmpfKdNr"
+        Me.lblEndEmpfKdNr.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0)
+        Me.lblEndEmpfKdNr.Style = "font-size: 7pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" &
+    "ar-set: 1"
+        Me.lblEndEmpfKdNr.Text = "100000 VERAG"
+        Me.lblEndEmpfKdNr.Top = 0.3464565!
+        Me.lblEndEmpfKdNr.Width = 0.4133847!
+        '
+        'lblFrachtfKdNr
+        '
+        Me.lblFrachtfKdNr.Height = 0.1574803!
+        Me.lblFrachtfKdNr.HyperLink = Nothing
+        Me.lblFrachtfKdNr.Left = 3.785039!
+        Me.lblFrachtfKdNr.Name = "lblFrachtfKdNr"
+        Me.lblFrachtfKdNr.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0)
+        Me.lblFrachtfKdNr.Style = "font-size: 7pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" &
+    "ar-set: 1"
+        Me.lblFrachtfKdNr.Text = "100000 VERAG"
+        Me.lblFrachtfKdNr.Top = 0.6614174!
+        Me.lblFrachtfKdNr.Width = 0.4133847!
+        '
+        'lblAuftrKdNr
+        '
+        Me.lblAuftrKdNr.Height = 0.1574803!
+        Me.lblAuftrKdNr.HyperLink = Nothing
+        Me.lblAuftrKdNr.Left = 3.785039!
+        Me.lblAuftrKdNr.Name = "lblAuftrKdNr"
+        Me.lblAuftrKdNr.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0)
+        Me.lblAuftrKdNr.Style = "font-size: 7pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" &
+    "ar-set: 1"
+        Me.lblAuftrKdNr.Text = "100000 VERAG"
+        Me.lblAuftrKdNr.Top = 0.5039369!
+        Me.lblAuftrKdNr.Width = 0.4133847!
+        '
        'lblLKWNr
        '
        Me.lblLKWNr.Height = 0.1574803!
@@ -426,58 +491,6 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        Me.lblAnzahl.Top = 0.1889764!
        Me.lblAnzahl.Width = 0.2082677!
        '
-        'lblAbsKdNr
-        '
-        Me.lblAbsKdNr.Height = 0.1574803!
-        Me.lblAbsKdNr.HyperLink = Nothing
-        Me.lblAbsKdNr.Left = 3.785039!
-        Me.lblAbsKdNr.Name = "lblAbsKdNr"
-        Me.lblAbsKdNr.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0)
-        Me.lblAbsKdNr.Style = "font-size: 7pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" &
-    "ar-set: 1"
-        Me.lblAbsKdNr.Text = "100000 VERAG"
-        Me.lblAbsKdNr.Top = 0.03149589!
-        Me.lblAbsKdNr.Width = 0.4133854!
-        '
-        'lblEmpfKdNr
-        '
-        Me.lblEmpfKdNr.Height = 0.1574803!
-        Me.lblEmpfKdNr.HyperLink = Nothing
-        Me.lblEmpfKdNr.Left = 3.785039!
-        Me.lblEmpfKdNr.Name = "lblEmpfKdNr"
-        Me.lblEmpfKdNr.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0)
-        Me.lblEmpfKdNr.Style = "font-size: 7pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" &
-    "ar-set: 1"
-        Me.lblEmpfKdNr.Text = "100000 VERAG"
-        Me.lblEmpfKdNr.Top = 0.1889762!
-        Me.lblEmpfKdNr.Width = 0.4133847!
-        '
-        'lblAuftrKdNr
-        '
-        Me.lblAuftrKdNr.Height = 0.1574803!
-        Me.lblAuftrKdNr.HyperLink = Nothing
-        Me.lblAuftrKdNr.Left = 3.785039!
-        Me.lblAuftrKdNr.Name = "lblAuftrKdNr"
-        Me.lblAuftrKdNr.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0)
-        Me.lblAuftrKdNr.Style = "font-size: 7pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" &
-    "ar-set: 1"
-        Me.lblAuftrKdNr.Text = "100000 VERAG"
-        Me.lblAuftrKdNr.Top = 0.5039369!
-        Me.lblAuftrKdNr.Width = 0.4133847!
-        '
-        'lblFrachtfKdNr
-        '
-        Me.lblFrachtfKdNr.Height = 0.1574803!
-        Me.lblFrachtfKdNr.HyperLink = Nothing
-        Me.lblFrachtfKdNr.Left = 3.785039!
-        Me.lblFrachtfKdNr.Name = "lblFrachtfKdNr"
-        Me.lblFrachtfKdNr.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0)
-        Me.lblFrachtfKdNr.Style = "font-size: 7pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" &
-    "ar-set: 1"
-        Me.lblFrachtfKdNr.Text = "100000 VERAG"
-        Me.lblFrachtfKdNr.Top = 0.6614174!
-        Me.lblFrachtfKdNr.Width = 0.4133847!
-        '
        'txtKdOpt
        '
        Me.txtKdOpt.CanGrow = False
@@ -544,9 +557,9 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        Me.Label12.HyperLink = Nothing
        Me.Label12.Left = 6.356693!
        Me.Label12.Name = "Label12"
-        Me.Label12.Style = "font-size: 8pt; font-weight: normal; text-align: left; text-decoration: underline" &
-    "; text-justify: auto; ddo-char-set: 1"
-        Me.Label12.Text = "Eingelangt bei:"
+        Me.Label12.Style = "font-size: 6.5pt; font-weight: normal; text-align: left; text-decoration: underli" &
+    "ne; text-justify: auto; ddo-char-set: 1"
+        Me.Label12.Text = "Received/Eingelangt bei:"
        Me.Label12.Top = 0.03307087!
        Me.Label12.Width = 1.113386!
        '
@@ -556,10 +569,10 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        Me.Label18.HyperLink = Nothing
        Me.Label18.Left = 6.474803!
        Me.Label18.Name = "Label18"
-        Me.Label18.Style = "font-size: 8pt; font-weight: normal; text-align: left; text-decoration: none; tex" &
-    "t-justify: auto; ddo-char-set: 3"
+        Me.Label18.Style = "font-size: 7pt; font-weight: normal; text-align: left; text-decoration: none; tex" &
+    "t-justify: auto; ddo-char-set: 1"
        Me.Label18.Text = "Trader/Abnehmer"
-        Me.Label18.Top = 0.1889764!
+        Me.Label18.Top = 0.1968504!
        Me.Label18.Width = 0.9677165!
        '
        'Label20
@@ -571,7 +584,7 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        Me.Label20.Style = "font-size: 7pt; font-weight: normal; text-align: left; text-decoration: none; tex" &
    "t-justify: auto; ddo-char-set: 1"
        Me.Label20.Text = "Consignee/Empf<70>nger"
-        Me.Label20.Top = 0.3464567!
+        Me.Label20.Top = 0.3543307!
        Me.Label20.Width = 1.003937!
        '
        'Shape1
@@ -618,19 +631,6 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        Me.lblEndEmpf.Top = 0.3464567!
        Me.lblEndEmpf.Width = 2.122047!
        '
-        'lblEndEmpfKdNr
-        '
-        Me.lblEndEmpfKdNr.Height = 0.1574803!
-        Me.lblEndEmpfKdNr.HyperLink = Nothing
-        Me.lblEndEmpfKdNr.Left = 3.785039!
-        Me.lblEndEmpfKdNr.Name = "lblEndEmpfKdNr"
-        Me.lblEndEmpfKdNr.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0)
-        Me.lblEndEmpfKdNr.Style = "font-size: 7pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" &
-    "ar-set: 1"
-        Me.lblEndEmpfKdNr.Text = "100000 VERAG"
-        Me.lblEndEmpfKdNr.Top = 0.3464565!
-        Me.lblEndEmpfKdNr.Width = 0.4133847!
-        '
        'PageFooter
        '
        Me.PageFooter.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label28, Me.Line2, Me.ReportInfo2, Me.lblDat})
@@ -662,7 +662,7 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        '
        'ReportInfo2
        '
-        Me.ReportInfo2.FormatString = "Seite {PageNumber} von {PageCount} Seiten "
+        Me.ReportInfo2.FormatString = "Page/Seite {PageNumber} / {PageCount} Seiten "
        Me.ReportInfo2.Height = 0.1330709!
        Me.ReportInfo2.Left = 5.032284!
        Me.ReportInfo2.Name = "ReportInfo2"
@@ -938,6 +938,11 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        CType(Me.Label8, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.Label4, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.Label5, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblAbsKdNr, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblEmpfKdNr, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblEndEmpfKdNr, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblFrachtfKdNr, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblAuftrKdNr, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.lblLKWNr, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.lblAbs, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.lblBezugsNr, System.ComponentModel.ISupportInitialize).EndInit()
@@ -955,10 +960,6 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        CType(Me.txtPackst<EFBFBD>cke, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.txtVermerk, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.lblAnzahl, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblAbsKdNr, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblEmpfKdNr, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblAuftrKdNr, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblFrachtfKdNr, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.txtKdOpt, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.Label11, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.Label12, System.ComponentModel.ISupportInitialize).EndInit()
@@ -966,7 +967,6 @@ Partial Public Class rptSpeditionsbericht_Gelangensbestaetigung
        CType(Me.Label20, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.Label7, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.lblEndEmpf, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblEndEmpfKdNr, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.Label28, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.ReportInfo2, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.lblDat, System.ComponentModel.ISupportInitialize).EndInit()
--- a/SDL/USTV/frmMDM_USTVAntrag.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.vb
@@ -417,17 +417,17 @@ Public Class frmMDM_USTVAntrag
                        End If

                        USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
-                            USTV_POS.UStVPo_Zeitstempel = Now()
-                            ' Berechnungen
-                            USTV_POS.UStVPo_USteuerbetragEUR = ANTRAG.plose_MWSTBetragWaehrungAbbuchung 'VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(ANTRAG.plose_MWSTBetragWaehrungAbbuchung, USTV_ANTRAG.UStVAn_Währungscode, "EUR")
-                            'USTV_POS.UStVPo_Umrechnungskurs = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuroKurs(ANTRAG.plose_WaehrungAbbuchung, ANTRAG.plose_RechnungsDatum)
-                            USTV_POS.UStVPo_Umrechnungskurs = ANTRAG.plose_MWSTBetrag / ANTRAG.plose_MWSTBetragWaehrungAbbuchung
-                            USTV_POS.UStVPo_USteuerbetrag = ANTRAG.plose_MWSTBetrag
-                            ' MsgBox(ANTRAG.plose_Lieferant & "  -  " & ANTRAG.plose_RechnungsDatum & "  -  " & ANTRAG.plose_RechnungsNr & " :::::::::: " & CDbl(ANTRAG.plose_MWSTBetrag).ToString("C2"))
+                        USTV_POS.UStVPo_Zeitstempel = Now()
+                        ' Berechnungen
+                        USTV_POS.UStVPo_USteuerbetragEUR = ANTRAG.plose_MWSTBetragWaehrungAbbuchung 'VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(ANTRAG.plose_MWSTBetragWaehrungAbbuchung, USTV_ANTRAG.UStVAn_Währungscode, "EUR")
+                        'USTV_POS.UStVPo_Umrechnungskurs = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuroKurs(ANTRAG.plose_WaehrungAbbuchung, ANTRAG.plose_RechnungsDatum)
+                        USTV_POS.UStVPo_Umrechnungskurs = ANTRAG.plose_MWSTBetrag / ANTRAG.plose_MWSTBetragWaehrungAbbuchung
+                        USTV_POS.UStVPo_USteuerbetrag = ANTRAG.plose_MWSTBetrag
+                        ' MsgBox(ANTRAG.plose_Lieferant & "  -  " & ANTRAG.plose_RechnungsDatum & "  -  " & ANTRAG.plose_RechnungsNr & " :::::::::: " & CDbl(ANTRAG.plose_MWSTBetrag).ToString("C2"))


-                            USTV_POS.INSERT()
-                        End If
+                        USTV_POS.INSERT()
+                    End If
                Next

                'Einträge als archivert setzen ' vormals wichtig
@@ -1201,7 +1201,7 @@ Public Class frmMDM_USTVAntrag
            TextHTML &= "We are always available to answer more questions.<br>"

            TextHTML &= "Mit freundlichen Grüßen<br>"
-                TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
+            TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
            TextHTML &= "<br>"
            Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & TextHTML & SDL.cFakturierung.getSignature("DE") & "</div>"