Mailversand, Abrechnung, Kundenblatt, MDMEinarbeitung, etc.

2025-10-08 09:28:13 +02:00
parent 8d1829625e
commit 3a02ac894a
14 changed files with 242 additions and 108 deletions
--- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb
@@ -27,6 +27,7 @@ Partial Class frmMDM_USTVAntrag
        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.pnlBottom = New System.Windows.Forms.Panel()
+        Me.pbMail = New System.Windows.Forms.PictureBox()
        Me.pb_Beleg = New System.Windows.Forms.PictureBox()
        Me.Button5 = New System.Windows.Forms.Button()
        Me.txtSumme = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -113,6 +114,7 @@ Partial Class frmMDM_USTVAntrag
        Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.pnlAntragsPosDetails = New System.Windows.Forms.Panel()
        Me.Panel2 = New System.Windows.Forms.Panel()
+        Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
        Me.Panel4 = New System.Windows.Forms.Panel()
        Me.cbxKIUploaddelete = New System.Windows.Forms.CheckBox()
        Me.scanUSTVA = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
@@ -123,6 +125,7 @@ Partial Class frmMDM_USTVAntrag
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.pnlErstattungsdetails = New System.Windows.Forms.Panel()
+        Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.Button2 = New System.Windows.Forms.Button()
        Me.Button3 = New System.Windows.Forms.Button()
@@ -139,10 +142,8 @@ Partial Class frmMDM_USTVAntrag
        Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
        Me.FakturiertToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
-        Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
-        Me.pbMail = New System.Windows.Forms.PictureBox()
        Me.pnlBottom.SuspendLayout()
+        CType(Me.pbMail, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.pb_Beleg, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.picExcel, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -166,7 +167,6 @@ Partial Class frmMDM_USTVAntrag
        Me.Panel1.SuspendLayout()
        Me.cns_vorauszahlen.SuspendLayout()
        Me.ncs_Belege.SuspendLayout()
-        CType(Me.pbMail, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'pnlBottom
@@ -189,9 +189,19 @@ Partial Class frmMDM_USTVAntrag
        Me.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom
        Me.pnlBottom.Location = New System.Drawing.Point(0, 649)
        Me.pnlBottom.Name = "pnlBottom"
-        Me.pnlBottom.Size = New System.Drawing.Size(1454, 100)
+        Me.pnlBottom.Size = New System.Drawing.Size(1444, 100)
        Me.pnlBottom.TabIndex = 3
        '
+        'pbMail
+        '
+        Me.pbMail.Image = CType(resources.GetObject("pbMail.Image"), System.Drawing.Image)
+        Me.pbMail.Location = New System.Drawing.Point(1110, 17)
+        Me.pbMail.Name = "pbMail"
+        Me.pbMail.Size = New System.Drawing.Size(35, 35)
+        Me.pbMail.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.pbMail.TabIndex = 52
+        Me.pbMail.TabStop = False
+        '
        'pb_Beleg
        '
        Me.pb_Beleg.Image = CType(resources.GetObject("pb_Beleg.Image"), System.Drawing.Image)
@@ -327,7 +337,7 @@ Partial Class frmMDM_USTVAntrag
        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
        Me.Button1.ForeColor = System.Drawing.Color.Black
-        Me.Button1.Location = New System.Drawing.Point(1252, 13)
+        Me.Button1.Location = New System.Drawing.Point(1242, 13)
        Me.Button1.Name = "Button1"
        Me.Button1.Size = New System.Drawing.Size(189, 70)
        Me.Button1.TabIndex = 2
@@ -370,7 +380,7 @@ Partial Class frmMDM_USTVAntrag
        Me.pnlHeader.Dock = System.Windows.Forms.DockStyle.Top
        Me.pnlHeader.Location = New System.Drawing.Point(0, 0)
        Me.pnlHeader.Name = "pnlHeader"
-        Me.pnlHeader.Size = New System.Drawing.Size(1454, 201)
+        Me.pnlHeader.Size = New System.Drawing.Size(1444, 201)
        Me.pnlHeader.TabIndex = 0
        '
        'cbxRGretour
@@ -392,7 +402,7 @@ Partial Class frmMDM_USTVAntrag
        Me.lblGesamtUSteuer.Cursor = System.Windows.Forms.Cursors.Default
        Me.lblGesamtUSteuer.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
        Me.lblGesamtUSteuer.ForeColor = System.Drawing.Color.White
-        Me.lblGesamtUSteuer.Location = New System.Drawing.Point(856, 16)
+        Me.lblGesamtUSteuer.Location = New System.Drawing.Point(846, 16)
        Me.lblGesamtUSteuer.Name = "lblGesamtUSteuer"
        Me.lblGesamtUSteuer.Size = New System.Drawing.Size(117, 20)
        Me.lblGesamtUSteuer.TabIndex = 26
@@ -406,7 +416,7 @@ Partial Class frmMDM_USTVAntrag
        Me.lblDiffernezbetrag.Cursor = System.Windows.Forms.Cursors.Default
        Me.lblDiffernezbetrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
        Me.lblDiffernezbetrag.ForeColor = System.Drawing.Color.White
-        Me.lblDiffernezbetrag.Location = New System.Drawing.Point(859, 59)
+        Me.lblDiffernezbetrag.Location = New System.Drawing.Point(849, 59)
        Me.lblDiffernezbetrag.Name = "lblDiffernezbetrag"
        Me.lblDiffernezbetrag.Size = New System.Drawing.Size(114, 15)
        Me.lblDiffernezbetrag.TabIndex = 25
@@ -420,7 +430,7 @@ Partial Class frmMDM_USTVAntrag
        Me.lblGesamtErstattung.Cursor = System.Windows.Forms.Cursors.Default
        Me.lblGesamtErstattung.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
        Me.lblGesamtErstattung.ForeColor = System.Drawing.Color.White
-        Me.lblGesamtErstattung.Location = New System.Drawing.Point(859, 36)
+        Me.lblGesamtErstattung.Location = New System.Drawing.Point(849, 36)
        Me.lblGesamtErstattung.Name = "lblGesamtErstattung"
        Me.lblGesamtErstattung.Size = New System.Drawing.Size(114, 17)
        Me.lblGesamtErstattung.TabIndex = 24
@@ -479,7 +489,7 @@ Partial Class frmMDM_USTVAntrag
        Me.lblKdNr.ForeColor = System.Drawing.Color.White
        Me.lblKdNr.Location = New System.Drawing.Point(79, 65)
        Me.lblKdNr.Name = "lblKdNr"
-        Me.lblKdNr.Size = New System.Drawing.Size(432, 18)
+        Me.lblKdNr.Size = New System.Drawing.Size(422, 18)
        Me.lblKdNr.TabIndex = 21
        Me.lblKdNr.Text = "0000000"
        '
@@ -560,7 +570,7 @@ Partial Class frmMDM_USTVAntrag
        Me.Panel8.Dock = System.Windows.Forms.DockStyle.Bottom
        Me.Panel8.Location = New System.Drawing.Point(0, 86)
        Me.Panel8.Name = "Panel8"
-        Me.Panel8.Size = New System.Drawing.Size(973, 115)
+        Me.Panel8.Size = New System.Drawing.Size(963, 115)
        Me.Panel8.TabIndex = 19
        '
        'cbxSicherheit
@@ -1112,7 +1122,7 @@ Partial Class frmMDM_USTVAntrag
        Me.Panel6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Panel6.BackColor = System.Drawing.Color.White
        Me.Panel6.ForeColor = System.Drawing.Color.White
-        Me.Panel6.Location = New System.Drawing.Point(571, 56)
+        Me.Panel6.Location = New System.Drawing.Point(561, 56)
        Me.Panel6.Name = "Panel6"
        Me.Panel6.Size = New System.Drawing.Size(390, 1)
        Me.Panel6.TabIndex = 18
@@ -1124,7 +1134,7 @@ Partial Class frmMDM_USTVAntrag
        Me.lblGesamtUSteuerFW.Cursor = System.Windows.Forms.Cursors.Default
        Me.lblGesamtUSteuerFW.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
        Me.lblGesamtUSteuerFW.ForeColor = System.Drawing.Color.White
-        Me.lblGesamtUSteuerFW.Location = New System.Drawing.Point(733, 14)
+        Me.lblGesamtUSteuerFW.Location = New System.Drawing.Point(723, 14)
        Me.lblGesamtUSteuerFW.Name = "lblGesamtUSteuerFW"
        Me.lblGesamtUSteuerFW.Size = New System.Drawing.Size(117, 14)
        Me.lblGesamtUSteuerFW.TabIndex = 17
@@ -1139,7 +1149,7 @@ Partial Class frmMDM_USTVAntrag
        Me.Label12.Cursor = System.Windows.Forms.Cursors.Default
        Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.Label12.ForeColor = System.Drawing.Color.White
-        Me.Label12.Location = New System.Drawing.Point(579, 16)
+        Me.Label12.Location = New System.Drawing.Point(569, 16)
        Me.Label12.Name = "Label12"
        Me.Label12.Size = New System.Drawing.Size(136, 15)
        Me.Label12.TabIndex = 16
@@ -1152,7 +1162,7 @@ Partial Class frmMDM_USTVAntrag
        Me.lblDiffernezbetragFW.Cursor = System.Windows.Forms.Cursors.Default
        Me.lblDiffernezbetragFW.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
        Me.lblDiffernezbetragFW.ForeColor = System.Drawing.Color.White
-        Me.lblDiffernezbetragFW.Location = New System.Drawing.Point(733, 59)
+        Me.lblDiffernezbetragFW.Location = New System.Drawing.Point(723, 59)
        Me.lblDiffernezbetragFW.Name = "lblDiffernezbetragFW"
        Me.lblDiffernezbetragFW.Size = New System.Drawing.Size(117, 15)
        Me.lblDiffernezbetragFW.TabIndex = 15
@@ -1167,7 +1177,7 @@ Partial Class frmMDM_USTVAntrag
        Me.Label10.Cursor = System.Windows.Forms.Cursors.Default
        Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.Label10.ForeColor = System.Drawing.Color.White
-        Me.Label10.Location = New System.Drawing.Point(579, 59)
+        Me.Label10.Location = New System.Drawing.Point(569, 59)
        Me.Label10.Name = "Label10"
        Me.Label10.Size = New System.Drawing.Size(94, 15)
        Me.Label10.TabIndex = 14
@@ -1180,7 +1190,7 @@ Partial Class frmMDM_USTVAntrag
        Me.lblGesamtErstattungFW.Cursor = System.Windows.Forms.Cursors.Default
        Me.lblGesamtErstattungFW.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
        Me.lblGesamtErstattungFW.ForeColor = System.Drawing.Color.White
-        Me.lblGesamtErstattungFW.Location = New System.Drawing.Point(736, 36)
+        Me.lblGesamtErstattungFW.Location = New System.Drawing.Point(726, 36)
        Me.lblGesamtErstattungFW.Name = "lblGesamtErstattungFW"
        Me.lblGesamtErstattungFW.Size = New System.Drawing.Size(114, 15)
        Me.lblGesamtErstattungFW.TabIndex = 13
@@ -1195,7 +1205,7 @@ Partial Class frmMDM_USTVAntrag
        Me.Label7.Cursor = System.Windows.Forms.Cursors.Default
        Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
        Me.Label7.ForeColor = System.Drawing.Color.White
-        Me.Label7.Location = New System.Drawing.Point(579, 36)
+        Me.Label7.Location = New System.Drawing.Point(569, 36)
        Me.Label7.Name = "Label7"
        Me.Label7.Size = New System.Drawing.Size(146, 15)
        Me.Label7.TabIndex = 12
@@ -1209,7 +1219,7 @@ Partial Class frmMDM_USTVAntrag
        Me.Panel5.Controls.Add(Me.Label5)
        Me.Panel5.Controls.Add(Me.cboStatus)
        Me.Panel5.Dock = System.Windows.Forms.DockStyle.Right
-        Me.Panel5.Location = New System.Drawing.Point(973, 0)
+        Me.Panel5.Location = New System.Drawing.Point(963, 0)
        Me.Panel5.Margin = New System.Windows.Forms.Padding(0)
        Me.Panel5.Name = "Panel5"
        Me.Panel5.Size = New System.Drawing.Size(481, 201)
@@ -1425,7 +1435,7 @@ Partial Class frmMDM_USTVAntrag
        Me.lblFirma.ForeColor = System.Drawing.Color.White
        Me.lblFirma.Location = New System.Drawing.Point(79, 42)
        Me.lblFirma.Name = "lblFirma"
-        Me.lblFirma.Size = New System.Drawing.Size(432, 18)
+        Me.lblFirma.Size = New System.Drawing.Size(422, 18)
        Me.lblFirma.TabIndex = 3
        Me.lblFirma.Text = "VERAG Spedition AG"
        '
@@ -1439,7 +1449,7 @@ Partial Class frmMDM_USTVAntrag
        Me.lblWarnung.ForeColor = System.Drawing.Color.Red
        Me.lblWarnung.Location = New System.Drawing.Point(475, 10)
        Me.lblWarnung.Name = "lblWarnung"
-        Me.lblWarnung.Size = New System.Drawing.Size(183, 18)
+        Me.lblWarnung.Size = New System.Drawing.Size(173, 18)
        Me.lblWarnung.TabIndex = 23
        '
        'pnlBody
@@ -1452,7 +1462,7 @@ Partial Class frmMDM_USTVAntrag
        Me.pnlBody.Controls.Add(Me.TabControl1)
        Me.pnlBody.Location = New System.Drawing.Point(0, 206)
        Me.pnlBody.Name = "pnlBody"
-        Me.pnlBody.Size = New System.Drawing.Size(1454, 443)
+        Me.pnlBody.Size = New System.Drawing.Size(1444, 443)
        Me.pnlBody.TabIndex = 1
        '
        'TabControl1
@@ -1463,7 +1473,7 @@ Partial Class frmMDM_USTVAntrag
        Me.TabControl1.Location = New System.Drawing.Point(0, 0)
        Me.TabControl1.Name = "TabControl1"
        Me.TabControl1.SelectedIndex = 0
-        Me.TabControl1.Size = New System.Drawing.Size(1452, 441)
+        Me.TabControl1.Size = New System.Drawing.Size(1442, 441)
        Me.TabControl1.TabIndex = 1
        '
        'TabPage1
@@ -1473,7 +1483,7 @@ Partial Class frmMDM_USTVAntrag
        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
        Me.TabPage1.Name = "TabPage1"
        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(1444, 415)
+        Me.TabPage1.Size = New System.Drawing.Size(1434, 415)
        Me.TabPage1.TabIndex = 0
        Me.TabPage1.Text = "Antragspositionen"
        Me.TabPage1.UseVisualStyleBackColor = True
@@ -1496,7 +1506,7 @@ Partial Class frmMDM_USTVAntrag
        Me.dgvUSTVPositionen.RowHeadersVisible = False
        Me.dgvUSTVPositionen.RowHeadersWidth = 62
        Me.dgvUSTVPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1438, 140)
+        Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1428, 140)
        Me.dgvUSTVPositionen.TabIndex = 0
        '
        'pnlAntragsPosDetails
@@ -1505,7 +1515,7 @@ Partial Class frmMDM_USTVAntrag
        Me.pnlAntragsPosDetails.Dock = System.Windows.Forms.DockStyle.Bottom
        Me.pnlAntragsPosDetails.Location = New System.Drawing.Point(3, 149)
        Me.pnlAntragsPosDetails.Name = "pnlAntragsPosDetails"
-        Me.pnlAntragsPosDetails.Size = New System.Drawing.Size(1438, 263)
+        Me.pnlAntragsPosDetails.Size = New System.Drawing.Size(1428, 263)
        Me.pnlAntragsPosDetails.TabIndex = 2
        '
        'Panel2
@@ -1517,9 +1527,17 @@ Partial Class frmMDM_USTVAntrag
        Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill
        Me.Panel2.Location = New System.Drawing.Point(0, 0)
        Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(1438, 263)
+        Me.Panel2.Size = New System.Drawing.Size(1428, 263)
        Me.Panel2.TabIndex = 1
        '
+        'UstCntlUSTV_AntragPosition1
+        '
+        Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0)
+        Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
+        Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1272, 261)
+        Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
+        '
        'Panel4
        '
        Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke
@@ -1665,6 +1683,14 @@ Partial Class frmMDM_USTVAntrag
        Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1436, 261)
        Me.pnlErstattungsdetails.TabIndex = 0
        '
+        'UstCntlUSTV_AntragErstattungen1
+        '
+        Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0)
+        Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1"
+        Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259)
+        Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
+        '
        'Panel1
        '
        Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke
@@ -1783,37 +1809,11 @@ Partial Class frmMDM_USTVAntrag
        Me.FakturiertToolStripMenuItem.Text = "Fakturiert zurücksetzen"
        Me.FakturiertToolStripMenuItem.Visible = False
        '
-        'UstCntlUSTV_AntragPosition1
-        '
-        Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0)
-        Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
-        Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261)
-        Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
-        '
-        'UstCntlUSTV_AntragErstattungen1
-        '
-        Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0)
-        Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1"
-        Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259)
-        Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
-        '
-        'pbMail
-        '
-        Me.pbMail.Image = Global.SDL.My.Resources.Resources.email_big1
-        Me.pbMail.Location = New System.Drawing.Point(1110, 17)
-        Me.pbMail.Name = "pbMail"
-        Me.pbMail.Size = New System.Drawing.Size(35, 35)
-        Me.pbMail.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.pbMail.TabIndex = 52
-        Me.pbMail.TabStop = False
-        '
        'frmMDM_USTVAntrag
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1454, 749)
+        Me.ClientSize = New System.Drawing.Size(1444, 749)
        Me.Controls.Add(Me.pnlHeader)
        Me.Controls.Add(Me.pnlBody)
        Me.Controls.Add(Me.pnlBottom)
@@ -1824,6 +1824,7 @@ Partial Class frmMDM_USTVAntrag
        Me.Text = "USTV Antrag"
        Me.pnlBottom.ResumeLayout(False)
        Me.pnlBottom.PerformLayout()
+        CType(Me.pbMail, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.pb_Beleg, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.picExcel, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.picPDF, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1853,7 +1854,6 @@ Partial Class frmMDM_USTVAntrag
        Me.Panel1.ResumeLayout(False)
        Me.cns_vorauszahlen.ResumeLayout(False)
        Me.ncs_Belege.ResumeLayout(False)
-        CType(Me.pbMail, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)

    End Sub
--- a/SDL/USTV/frmMDM_USTVAntrag.resx
+++ b/SDL/USTV/frmMDM_USTVAntrag.resx
@@ -118,6 +118,57 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="pbMail.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
  <data name="pb_Beleg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
--- a/SDL/USTV/frmMDM_USTVAntrag.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.vb
@@ -1,6 +1,7 @@
 Imports System.IO
 Imports System.Reflection
 Imports System.Windows.Documents
+Imports com.sun.crypto.provider
 Imports GrapeCity.SpreadBuilder
 Imports itextsharp.text.pdf
 Imports Microsoft.Office.Interop
@@ -1055,9 +1056,33 @@ Public Class frmMDM_USTVAntrag
                        USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
                        USTV_POS.UStVPo_Zeitstempel = Now()

+                        If Not IsDBNull(r.Item("rmc_daId_InvAtt")) AndAlso IsNumeric(r.Item("rmc_daId_InvAtt")) AndAlso r.Item("rmc_daId_InvAtt") > 0 Then
+                            Dim DS_ATT_ID As Integer = r.Item("rmc_daId_InvAtt")
+
+                            If IsNumeric(USTV_POS.UStVPo_daId) AndAlso USTV_POS.UStVPo_daId > 0 Then
+                                'merge current daId and invatt-daid
+
+                                Dim DS_NEW As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC_MERGED", Now.Year, Now.ToString("yyyyMMdd"), USTV_POS.UStVPo_ReNr & "_INVOICE_RMC_ATT.pdf", kdNr, True)
+                                Dim DS_ATT = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DS_ATT_ID)
+                                Dim DS_ORG = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(USTV_POS.UStVPo_daId)
+
+                                Dim DS_ATT_PATH = DS_ATT.GET_TOP1_PATH
+                                Dim DS_ORG_PATH = DS_ORG.GET_TOP1_PATH
+
+
+                                If DS_ATT_PATH <> "" AndAlso DS_ORG_PATH <> "" Then
+                                    If DS_NEW.uploadDataToDATENSERVER(DS_ORG_PATH) AndAlso DS_NEW.uploadDataToDATENSERVER(DS_ATT_PATH) Then
+                                        USTV_POS.UStVPo_daId = DS_NEW.da_id
+                                        USTV_POS.UStVPo_daId_loeschbar = True 'nach merge wird nicht mehr orig.ID verwendet und daher ist löschbar!!!
+                                    End If
+                                End If
+
+                            End If
+                        End If
+
+
                        ' Berechnungen
                        'von RMC bekommen wir Fremdwährung und EUR, d.b. wir können und den Umrechnungskurs selbst berechnen!
-
                        'EasyTrip können wir nicht auslesen, deshalb geben wir immer 0,1 als Betrag mit!

                        Dim umrechKurs As Double = 1
@@ -1126,8 +1151,8 @@ Public Class frmMDM_USTVAntrag
                        USTV_POS.UStVPo_Leistungsbezeichnung = r.Item("specification_page_name")

                        Dim leistender As New cUStVLeistender("MS Europe BV" & " " & Antrag_LandKz, Antrag_LandKz)
-                        If leistender.UStV_LeistenderId < 1 Then
-                            leistender = New cUStVLeistender("MS Europe BV")
+                        If leistender.UStV_LeistenderId <1 Then
+                            leistender= New cUStVLeistender("MS Europe BV")
                        End If

                        USTV_POS.UStVPo_Leistender = leistender.UStV_Leistender.ToString
@@ -1986,6 +2011,7 @@ Public Class frmMDM_USTVAntrag

                    End If

+
                End If

                Dim Leistungsbezeichnung = ""