Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

SDL/Fakturierung/cAutomailversand.vb

@@ -282,19 +282,19 @@ Public Class cAutomailversand
                         For Each ANH In RG_ANH
 
                             Dim path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId)
-                            If Not (path.ToString.Contains("Sammelrechnung") OrElse path.ToString.Contains("Maut") OrElse path.ToString.Contains("POS")) Then
+                            If Not (path.ToString.ToLower.Contains("sammelrechnung") OrElse path.ToString.Contains("Maut") OrElse path.ToString.Contains("POS") OrElse path.ToString.ToLower.Contains("invoice") OrElse path.ToString.ToLower.Contains("rechnung")) Then
-                                myList.Add(path)
+                                If path <> "" Then myList.Add(path)
                             Else
                                 ATTACHMENTS.Add(New cFakt_MailATTach(path, ANH.Bezeichnung))
                             End If
 
                         Next
-
+                        If myList.Any() Then
                             If FormularManagerNEU.MergePdfFiles(myList, zielPfadZusammenfassung) Then
                                 Dim fileInfo As New FileInfo(zielPfadZusammenfassung)
                                 ATTACHMENTS.Add(New cFakt_MailATTach(zielPfadZusammenfassung, fileInfo.Name))
                             End If
-
+                        End If
                     Else
                         For Each ANH In RG_ANH
                             ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId), ANH.Bezeichnung))

SDL/Fakturierung/cFakturierung.vb

@@ -4028,7 +4028,7 @@ Public Class cFakturierung
         rpt.lblSachbearbeiter.Text = IIf(sachbearbeiterAufRechnung = "Herr Ordu", "Verrechnung", sachbearbeiterAufRechnung) 'könnten ja mehrerer SB die Rg-Anlagen geschreiben haben - NEU
 
 
-        ' rpt.lblSachbearbeiter.Text = getSBRgName(Firma.Firma_ID, VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) 'könnten ja mehrerer SB die Rg-Anlagen geschreiben haben
+        rpt.lblSachbearbeiter.Text = getSBRgName(Firma.Firma_ID, VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) 'könnten ja mehrerer SB die Rg-Anlagen geschreiben haben
         rpt.lblFirmenbuch.Text = If(Firma.Firma_Firmenbuch, "").ToString.Replace("Firmenbuch: ", "").Trim
         rpt.lblUID.Text = If(Firma.Firma_UID, "").ToString.Replace("UID: ", "").Trim
         rpt.lblEORI.Text = If(Firma.Firma_EORI, "")
@@ -5210,7 +5210,7 @@ Public Class cFakturierung
                             If onlyAsfinagMautanhang Then
                                 If RG_AH.Bezeichnung.ToUpper.Contains("MAUT_AT") Then
                                     Dim Path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(RG_AH.dsId)
-                                    listAnh.Add(Path)
+                                    If Path <> "" Then listAnh.Add(Path)
                                 End If
                                 Else
 
@@ -5218,10 +5218,10 @@ Public Class cFakturierung
                                 If RG.Firma_ID = 19 AndAlso RG.Sammelrechnung = 6 AndAlso RG.FilialenNr = 4817 Then 'in diesem Fall PDFs zusammenfassen!
 
                                     Dim Path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(RG_AH.dsId)
-                                    If Not Path.ToString.Contains("Sammelrechnung") Then
+                                    If Not (Path.ToString.ToLower.Contains("sammelrechnung") OrElse Path.ToString.Contains("Maut") OrElse Path.ToString.Contains("POS") OrElse Path.ToString.ToLower.Contains("invoice") OrElse Path.ToString.ToLower.Contains("rechnung")) Then
-                                        PDFList.Add(Path)
+                                        If Path <> "" Then PDFList.Add(Path)
                                     Else
-                                        listAnh.Add(Path)
+                                        If Path <> "" Then listAnh.Add(Path)
                                     End If
 
                                 Else
@@ -5231,7 +5231,7 @@ Public Class cFakturierung
                                         If Not listAnh.Contains(Path) Then
 
                                             If Not (listAnh.Any(Function(f) f.Contains("COPY_INVOICE")) And Path.ToUpper.Contains("COPY_INVOICE")) Then 'damit diesel IDS-Rechnung nicht doppelt hinzugefügt wird.
-                                                listAnh.Add(Path)
+                                                If Path <> "" Then listAnh.Add(Path)
 
                                             End If
                                         End If
@@ -5247,7 +5247,7 @@ Public Class cFakturierung
                                 Dim Path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(RG_AH.dsId)
                                 If Not listAnh.Contains(Path) Then
 
-                                    listAnh.Add(Path)
+                                    If Path <> "" Then listAnh.Add(Path)
 
                                 End If
                             End If
@@ -5258,7 +5258,9 @@ Public Class cFakturierung
 
                 Next
 
-                If mergedPDFList.Count > 0 Then
+                If PDFList.Count = 1 Then
+                    listAnh.Add(PDFList.First())
+                ElseIf PDFList.Count > 1 Then
                     If FormularManagerNEU.MergePdfFiles(PDFList, mergedPDFList) Then
                         listAnh.Add(mergedPDFList)
                     End If

SDL/Fakturierung/frmAbrechnungsMaske.vb

@@ -247,8 +247,16 @@ Public Class frmAbrechnungsMaske
 
                     If r.Cells("Betrag").Value IsNot DBNull.Value AndAlso IsNumeric(r.Cells("Betrag").Value) Then
                         Select Case r.Cells("BelegartenKz").Value.ToString
-                            Case "AR" : If r.Cells("Betrag").Value < 0 Then r.DefaultCellStyle.ForeColor = Color.Red
+                            Case "AR" : If r.Cells("Betrag").Value < 0 Then
-                            Case "AG" : If r.Cells("Betrag").Value > 0 Then r.DefaultCellStyle.ForeColor = Color.Red
+                                    r.DefaultCellStyle.ForeColor = Color.Red
+                                Else
+                                    r.DefaultCellStyle.ForeColor = Color.Black
+                                End If
+                            Case "AG" : If r.Cells("Betrag").Value < 0 Then
+                                    r.DefaultCellStyle.ForeColor = Color.Red
+                                Else
+                                    r.DefaultCellStyle.ForeColor = Color.Black
+                                End If
                         End Select
 
                     End If

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

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

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
+                        If leistender.UStV_LeistenderId <1 Then
-                            leistender = New cUStVLeistender("MS Europe BV")
+                            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 = ""

SDL/kunden/frmKundenblatt.vb

@@ -2280,7 +2280,7 @@ Public Class frmKundenblatt
     Sub initRechnungen()
         With dgvRg
             Dim sqlStr = ""
-            sqlStr &= "  SELECT TOP 1000 RK_ID,[RechnungsNr],[RechnungsDatum],case when [DruckDatumZeit] is null then 0 else 1 end as gedruckt, "
+            sqlStr &= "  SELECT TOP 1000 [Rechnungsart],RK_ID,[RechnungsNr],[RechnungsDatum],case when [DruckDatumZeit] is null then 0 else 1 end as gedruckt, "
             sqlStr &= " ( SELECT SUM(isnull([SteuerpflichtigerBetrag],0)+isnull([SteuerfreierBetrag],0))  FROM [RechnungsausgangPositionen] where [RechnungsausgangPositionen].RK_ID=[Rechnungsausgang].RK_ID ) as Rechnungsbetrag,"
             sqlStr &= " Sammelrechnung, [FilialenNr],[AbfertigungsNr],[UnterNr],[Abfertigungsdatum],  isnull(cast(RechnungsKundenNr as nvarchar(7)) + ' ','') + [RechnungsName 1] as [RechnungAn], "
             sqlStr &= " isnull(cast([VermittlerKundenNr] as nvarchar(7)) + ' ','') + [VermittlerName 1] as Vermittler, [LKW Kennzeichen],Sachbearbeiter "
@@ -2310,6 +2310,9 @@ Public Class frmKundenblatt
             .Columns("Sammelrechnung").Width = 45
             .Columns("Sammelrechnung").HeaderText = "SR"
 
+            .Columns("Rechnungsart").Width = 45
+            .Columns("Rechnungsart").HeaderText = "Beleg"
+
             .Columns("Rechnungsbetrag").Width = 100
             .Columns("Rechnungsbetrag").HeaderText = "Rechnungsbetrag"
             .Columns("Rechnungsbetrag").DefaultCellStyle.Format = "C"

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -48,7 +48,7 @@ Public Class frmMDMDatenverarbetiung
             Case "PLOSE"
                 Dim plose As cPLOSE_Inv_Data
                 pruef = plose.checkImport()
-                pruef = pruefData_PLOSE()
+                If pruef Then pruef = pruefData_PLOSE()
             Case "ASFINAG" : pruef = pruefData_ASFINAG()
             Case "UTA" : pruef = pruefData_UTA()
             Case "IDS" : pruef = pruefData_IDS()
@@ -1446,8 +1446,8 @@ Public Class frmMDMDatenverarbetiung
         Dim top = ""
         Dim sqlWhere = ""
         Select Case art
-            Case "IDS" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode<>740543"
+            Case "IDS" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode<>740543" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, " AND Adressen.AdressenNr = 401280 ", "")
-            Case "IDS_AT" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode=740543"
+            Case "IDS_AT" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode=740543" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, " AND Adressen.AdressenNr = 401280 ", "")
             Case Else
                 MsgBox("falscher Typ!") : Return False
 
@@ -4793,6 +4793,11 @@ RabattBerechnen:
 
         If Lieferant = "" Then Return False
 
+        If dt.Rows.Count = 1 Then
+            If dt.Columns.Contains("KdNrVERAG") AndAlso IsDBNull(dt(0).Item("KdNrVERAG")) Then Return False
+            If dt.Columns.Contains("AdressenNr") AndAlso IsDBNull(dt(0).Item("AdressenNr")) Then Return False
+        End If
+
         Select Case Lieferant
             Case "PLOSE" : OffertenNr = 80
             Case "ASFINAG" : OffertenNr = 11

SDL/seriendruck/usrCntlFakturierung.vb

@@ -204,27 +204,27 @@ Public Class usrcntlFakturierung
 
 
 
-        Dim rechnungenMitGesamtmautanhantCSV As String = (New SQL).getValueTxtBySqlVarList("SELECT COUNT(*) FROM Rechnungsausgang
+        Dim rechnungenMitGesamtmautanhangCSV As String = (New SQL).getValueTxtBySqlVarList("SELECT COUNT(*) FROM Rechnungsausgang
                         inner join RechnungsausgangAnhaenge on Rechnungsausgang.RK_ID = RechnungsausgangAnhaenge.RK_ID
                         WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "'   
                         and (RechnungsausgangAnhaenge.Bezeichnung like '%Maut.csv')
                         group by [Firma_ID], RechnungsNr,Buchungsjahr,DruckDatumZeit,[Status], RechnungsausgangAnhaenge.Bezeichnung ", "FMZOLL",, 0)
 
 
-        Dim rechnungenMitGesamtmautanhantPDF As String = (New SQL).getValueTxtBySqlVarList("SELECT COUNT(*) FROM Rechnungsausgang
+        Dim rechnungenMitGesamtmautanhangPDF As String = (New SQL).getValueTxtBySqlVarList("SELECT COUNT(*) FROM Rechnungsausgang
                         inner join RechnungsausgangAnhaenge on Rechnungsausgang.RK_ID = RechnungsausgangAnhaenge.RK_ID
                         WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "'   
                         and (RechnungsausgangAnhaenge.Bezeichnung like '%Maut.pdf')
                         group by [Firma_ID], RechnungsNr,Buchungsjahr,DruckDatumZeit,[Status], RechnungsausgangAnhaenge.Bezeichnung ", "FMZOLL",, 0)
 
-        If rechnungenMitGesamtmautanhantPDF <> "" Then
+        If rechnungenMitGesamtmautanhangPDF <> "" Then
-            MsgBox("Bei " & rechnungenMitGesamtmautanhantPDF & " Rechnungen befindet sich noch eine PDF-Gesamtmaut" & vbNewLine & "Diesen bitte vorher entfernen über MAUTBERICHTE ENTFERNEN, weil erst im Zuge der RE-Pos-Berechnung die Gesamtmaut angehängt wird." & vbNewLine & "Vorang wird abgebrochen!")
+            MsgBox("Bei " & rechnungenMitGesamtmautanhangPDF & " Rechnungen befindet sich noch eine PDF-Gesamtmaut" & vbNewLine & "Diesen bitte vorher entfernen über MAUTBERICHTE ENTFERNEN, weil erst im Zuge der RE-Pos-Berechnung die Gesamtmaut angehängt wird." & vbNewLine & "Vorang wird abgebrochen!")
             Exit Sub
 
         End If
 
-        If rechnungenMitGesamtmautanhantCSV <> "" Then
+        If rechnungenMitGesamtmautanhangCSV <> "" Then
-            MsgBox("Bei " & rechnungenMitGesamtmautanhantCSV & " Rechnungen befindet sich noch eine CSV-Gesamtmaut" & vbNewLine & "Diesen bitte vorher entfernen über MAUTBERICHTE ENTFERNEN, weil erst im Zuge der RE-Pos-Berechnung die Gesamtmaut angehängt wird." & vbNewLine & "Vorang wird abgebrochen!")
+            MsgBox("Bei " & rechnungenMitGesamtmautanhangCSV & " Rechnungen befindet sich noch eine CSV-Gesamtmaut" & vbNewLine & "Diesen bitte vorher entfernen über MAUTBERICHTE ENTFERNEN, weil erst im Zuge der RE-Pos-Berechnung die Gesamtmaut angehängt wird." & vbNewLine & "Vorang wird abgebrochen!")
             Exit Sub
 
         End If

VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb

@@ -500,6 +500,7 @@ Public Class cIDS
         MDMEinarb.ds_total += cnt - 1
         MDMEinarb.ds_count += counTrans
         MDMEinarb.import_date = Now()
+        MDMEinarb.importfilename = fi.Name
 
         If MDMEinarb.ds_total = MDMEinarb.ds_count Then
             MDMEinarb.completed = True

VERAG_PROG_ALLGEMEIN/Classes/cMDMEInarbeitung.vb

@@ -12,6 +12,7 @@ Public Class cMDMEinarbeitung
     Property completed As Boolean = False
     Property completed_date As Object = Nothing
     Property import_date As Object = Nothing
+    Property importfilename As Object = Nothing
 
     Public hasEntry = False
 
@@ -46,6 +47,7 @@ Public Class cMDMEinarbeitung
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("completed", completed))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("completed_date", completed_date))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("import_date", import_date))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("importfilename", importfilename))
 
         Return list
     End Function

VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb

@@ -1,11 +1,11 @@
 
-
 Imports com.sun.xml.internal.rngom
 Imports iTextSharp.text.pdf
 Imports iTextSharp.text.pdf.parser
 Imports System.IO
 Imports System.Windows.Forms
 
+
 Public Class cMDMFunctionsAllgemein
 
     Public Shared ploseAlteLogikSchnittstelle As Boolean = False
@@ -993,14 +993,43 @@ Public Class cMDMFunctionsAllgemein
                 If dsID > 0 Then
                     'Me.Cursor = Cursors.WaitCursor
                     Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dsID)
+
+
+                    Dim PathList As New List(Of String)
+                    Dim zielPfadZusammenfassung As String
+                    Dim merged As Boolean = False
+
+                    If DS.DATA_LIST.coll_daId > 0 Then
+                        For Each L As cDatenarchiv_Collection In DS.DATA_LIST.LIST
+                            If L.coll_pfad <> "" Then PathList.Add(L.coll_pfad)
+                        Next
+
+                    Else
+                        Dim PathTemp As String = DS.GET_TOP1_PATH
+                        If PathTemp <> "" Then PathList.Add(PathTemp)
+                    End If
+
+                    If PathList.Count > 1 Then
+                        zielPfadZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Merged_" & DS.da_KundenNr & ".pdf", ".pdf",, False, "Zusammenfassung")
+                        Dim fm_new As New VERAG_PROG_ALLGEMEIN.cFormularManager
+                        fm_new.mergePDFs(PathList, zielPfadZusammenfassung)
+                        merged = True
+
+                    End If
+
+                    Dim Path As String = IIf(zielPfadZusammenfassung <> "" AndAlso merged, zielPfadZusammenfassung, If(PathList.Any(), PathList.First(), ""))
+
+
                     If nummierung > 0 Then
 
                         'wenn PDF nicht beschreibbar, dann mittels Stamp!
                         If PDFisProtected Then
 
+                            If Path = "" Then Return Path
+
                             Dim tempPathNew = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(DS.da_name & "_modified", ".pdf", True, False, "USTVA")
 
-                            Dim pdfReader As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(DS.GET_TOP1_PATH)
+                            Dim pdfReader As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(Path)
                             PdfReader.unethicalreading = True
 
                             Dim fs = New FileStream(tempPathNew, FileMode.Create, FileAccess.Write, FileShare.None)
@@ -1013,7 +1042,7 @@ Public Class cMDMFunctionsAllgemein
                                 canvas.BeginText()
 
                                 'The origin (0,0) is at the bottom-left corner of the page and represent coordinates in points!!!!!
-                                Dim _height = pdfReader.GetPageSizeWithRotation(page).GetTop(25) 'oberer Rand
+                                Dim _height = pdfReader.GetPageSizeWithRotation(page).GetTop(20) 'oberer Rand
                                 Dim _width = pdfReader.GetPageSizeWithRotation(page).GetRight(0) / 2 'Mitte
 
                                 'Workaround!
@@ -1035,8 +1064,9 @@ Public Class cMDMFunctionsAllgemein
 
                         Else
 
+                            If Path = "" Then Return Path
 
-                            Dim pdfReader As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(DS.GET_TOP1_PATH)
+                            Dim pdfReader As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(Path)
 
                             Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager
                             Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
@@ -1047,7 +1077,7 @@ Public Class cMDMFunctionsAllgemein
 
                             pdfReader.Close()
 
-                            Dim PdfTmp = fm.fillPDFVorhandenesLokalesPDF_Path(DS.GET_TOP1_PATH, listTowrite, , , , ,)
+                            Dim PdfTmp = fm.fillPDFVorhandenesLokalesPDF_Path(IIf(zielPfadZusammenfassung <> "" AndAlso merged, zielPfadZusammenfassung, PathList.First), listTowrite, , , , ,)
                             Return PdfTmp
 
                         End If
@@ -1055,7 +1085,7 @@ Public Class cMDMFunctionsAllgemein
 
                     Else
 
-                        Return DS.GET_TOP1_PATH
+                        Return Path
                     End If
 
 
@@ -1084,24 +1114,24 @@ Public Class cMDMFunctionsAllgemein
                        ON ([tblUStVPositionen].[UStVPo_LeistenderId] > 0 
                            AND leist.[UStV_LeistenderId] = [tblUStVPositionen].[UStVPo_LeistenderId])
                        OR ([tblUStVPositionen].[UStVPo_LeistenderId] <= 0
-                           AND leist.[UStV_Leistender] = [tblUStVPositionen].[UStVPo_Leistender])                       
+                           AND leist.[UStV_Leistender]= [tblUStVPositionen].[UStVPo_Leistender])
                                          where UStVAn_ID=" & USTV_ANTRAG.UStVAn_ID & sqlWHere & " ORDER BY UStVPo_ID"
 
-        Dim dtNew As DataTable = sql.loadDgvBySql(StringSQL, "FMZOLL")
+        Dim dtNew As DataTable = sql.loadDgvBySql(StringSQL, " FMZOLL")
 
 
 
         If dtNew IsNot Nothing AndAlso dtNew.Rows.Count > 0 Then
 
-            If type = "excel" Then
+            If type = " excel" Then
 
 
                 Dim sumVAT As Double = 0
 
                 For Each row In dtNew.Rows
-                    If Not IsDBNull(row("Amount of tax refund")) AndAlso IsNumeric(row("Amount of tax refund")) Then sumVAT += CDbl(row("Amount of tax refund"))
+                    If Not IsDBNull(row(" Amount of tax refund")) AndAlso IsNumeric(row(" Amount of tax refund")) Then sumVAT += CDbl(row(" Amount of tax refund"))
-                    If Not IsDBNull(row("Amount of tax refund")) AndAlso IsNumeric(row("Amount of tax refund")) Then row("Amount of tax refund") = CDbl(row("Amount of tax refund"))
+                    If Not IsDBNull(row(" Amount of tax refund")) AndAlso IsNumeric(row(" Amount of tax refund")) Then row(" Amount of tax refund") = CDbl(row(" Amount of tax refund"))
-                    If Not IsDBNull(row("Name of supplier")) AndAlso row("Name of supplier") <> "" AndAlso Not IsDBNull(row("VAT")) AndAlso row("VAT") <> "" Then
+                    If Not IsDBNull(row(" Name of supplier")) AndAlso row(" Name of supplier") <> "" AndAlso Not IsDBNull(row("VAT")) AndAlso row("VAT") <> "" Then
                         row("Name of supplier") = row("Name of supplier").ToString.Replace(" " & row("VAT").ToString.Substring(0, 2), "")
                     End If
                 Next

VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb

@@ -25,9 +25,10 @@ Public Class cRMC
     Property rmc_daId As Object = Nothing
     Property rmc_archiviertDatum As Object
     Property rmc_archiv As Boolean = False
-    Property rmc_fibuNr As Boolean = False
+    Property rmc_fibuNr As Object = False
     Property rmc_sammelReNr As Object = Nothing
     Property UStVAn_ID As Object = Nothing
+    Property rmc_daId_InvAtt As Object = Nothing
 
     Public hasEntry = False
 
@@ -42,6 +43,14 @@ Public Class cRMC
         Me.rmc_reNr = rmc_reNr
         LOAD()
     End Sub
+
+
+    Sub New(rmc_kdNr, rmc_reNr, rmc_reDatum)
+        Me.rmc_kdNr = rmc_kdNr
+        Me.rmc_reNr = rmc_reNr
+        Me.rmc_reDatum = rmc_reDatum
+        LOAD()
+    End Sub
     Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
         Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
         'list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_id", rmc_id))
@@ -68,6 +77,7 @@ Public Class cRMC
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_sammelReNr", rmc_sammelReNr))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_betragMWST", rmc_betragMWST))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_ID", UStVAn_ID))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_daId_InvAtt", rmc_daId_InvAtt))
 
 
         Return list
@@ -166,11 +176,11 @@ Public Class cRMC
 
             Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
 
-                Using cmd As New SqlCommand(" SELECT rmc_reDatum,rmc_kdNr,[rmc_reNr],sum([rmc_betragNetto])[rmc_betragNetto],sum([rmc_betragMWST])[rmc_betragMWST] ,sum([rmc_betragBrutto] )[rmc_betragBrutto], [rmc_waehrung], sum([rmc_euroBrutto])[rmc_euroBrutto], rmc_daId FROM [tblRMCImport]
+                Using cmd As New SqlCommand(" SELECT rmc_reDatum,rmc_kdNr,[rmc_reNr],sum([rmc_betragNetto])[rmc_betragNetto],sum([rmc_betragMWST])[rmc_betragMWST] ,sum([rmc_betragBrutto] )[rmc_betragBrutto], [rmc_waehrung], sum([rmc_euroBrutto])[rmc_euroBrutto], rmc_daId, isnull(rmc_daId_InvAtt,0) as rmc_daId_InvAtt  FROM [tblRMCImport]
                                                 INNER JOIN Adressen as adr on rmc_kdNr=adr.[WölflKundenNr]
                                                 where cast(rmc_reDatum as date) between @von and @bis and AdressenNr=@AdressenNr
 	                                            AND rmc_landKZ ='" & LandKZ & "'" & IIf(Not Archiv, " And rmc_archiv = 0 ", "") & "
-                                                group by  rmc_reDatum,rmc_kdNr,[rmc_reNr],[rmc_waehrung], rmc_daId
+                                                group by  rmc_reDatum,rmc_kdNr,[rmc_reNr],[rmc_waehrung], rmc_daId, isnull(rmc_daId_InvAtt,0)
                                                 having sum([rmc_betragMWST])<>0
                                                 order by rmc_reDatum", conn)
 

VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb

@@ -1089,10 +1089,6 @@ Public Class cUTA
 
                     Case "20"
 
-                        'lngÜbertragungsposition = 6616
-
-
-
                         lngRecordCount = lngRecordCount + 1
                         lngÜbertragungsposition = lngÜbertragungsposition + 1
                         Dim clfBody As New cUTA.UTABody(lngÜbertragungsnummer, lngÜbertragungsposition, dtmErstellDatumUhrzeit)
@@ -1342,7 +1338,7 @@ Public Class cUTA
 
             MDMEinarb.ds_count += savedTrans
             MDMEinarb.import_date = Now()
-            If MDMEinarb.ds_count = MDMEinarb.ds_total Then
+            If MDMEinarb.ds_count = MDMEinarb.ds_total - 2 Then 'header and trailer wegzählen!
                 MDMEinarb.completed = True
                 MDMEinarb.completed_date = Now()
             End If