merge

SDL/Fakturierung/frmFaktSammelRgDrucken.vb

@@ -317,16 +317,16 @@ Public Class frmFaktSammelRgDrucken
             If isEU Then
                 If MyDatagridview1.Columns.Contains("keineMWST") Then
                     If MyDatagridview1.SelectedRows.Count = 1 Then
-                        '1. Schritt: kein MWST Kunde -> ORIGINAL-RE
+                        '1. Schritt: kein MWST Kunde -> ORIGINAL-RE per Mail!
                         MDMKopiedrucken = Not MyDatagridview1.SelectedRows(0).Cells("keineMWST").Value
                     End If
                 End If
-                '2. Schritt: MWST Kunde -> wenn ohne MWST-BEtrag ->Original sonst Kopie!
+                '2. Schritt: MWST Kunde -> wenn kein MWST-BEtrag ->Original sonst Kopie per Mail!
                 If MDMKopiedrucken Then
                     MDMKopiedrucken = CDbl(MyDatagridview1.SelectedRows(0).Cells("Steuer").Value) <> 0
                 End If
             Else
-                'NICHT EU IST SCHON IM CntlFakt geregelt, d.b. NICHT EU IMMER MIT KOPIE!!!!
+
             End If
 
         End If

SDL/USTV/frmMDM_USTVAntrag.Designer.vb

@@ -45,6 +45,8 @@ Partial Class frmMDM_USTVAntrag
         Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.lblLand = New System.Windows.Forms.Label()
         Me.Panel8 = New System.Windows.Forms.Panel()
+        Me.Label14 = New System.Windows.Forms.Label()
+        Me.txtEingereichtAm = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.lblMWSTAntrag = New System.Windows.Forms.Label()
         Me.Label13 = New System.Windows.Forms.Label()
         Me.txtGueltig = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -97,6 +99,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.btnEintragloeschen = New System.Windows.Forms.Button()
         Me.btnNeuerEintrag = New System.Windows.Forms.Button()
@@ -104,15 +107,13 @@ 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()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
+        Me.picExcel = New System.Windows.Forms.PictureBox()
-        Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
-        Me.Label14 = New System.Windows.Forms.Label()
-        Me.txtEingereichtAm = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.pnlBottom.SuspendLayout()
         CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.pnlHeader.SuspendLayout()
@@ -133,12 +134,14 @@ Partial Class frmMDM_USTVAntrag
         CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.pnlErstattungsdetails.SuspendLayout()
         Me.Panel1.SuspendLayout()
+        CType(Me.picExcel, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'pnlBottom
         '
         Me.pnlBottom.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
         Me.pnlBottom.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnlBottom.Controls.Add(Me.picExcel)
         Me.pnlBottom.Controls.Add(Me.Button4)
         Me.pnlBottom.Controls.Add(Me.picPDF)
         Me.pnlBottom.Controls.Add(Me.btnMail)
@@ -157,7 +160,7 @@ Partial Class frmMDM_USTVAntrag
         Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button4.ForeColor = System.Drawing.Color.Black
         Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button4.Location = New System.Drawing.Point(979, 30)
+        Me.Button4.Location = New System.Drawing.Point(1126, 13)
         Me.Button4.Name = "Button4"
         Me.Button4.Size = New System.Drawing.Size(103, 39)
         Me.Button4.TabIndex = 28
@@ -167,10 +170,10 @@ Partial Class frmMDM_USTVAntrag
         'picPDF
         '
         Me.picPDF.Image = Global.SDL.My.Resources.Resources.pdf
-        Me.picPDF.Location = New System.Drawing.Point(865, 30)
+        Me.picPDF.Location = New System.Drawing.Point(1067, 39)
         Me.picPDF.Name = "picPDF"
-        Me.picPDF.Size = New System.Drawing.Size(50, 50)
+        Me.picPDF.Size = New System.Drawing.Size(35, 35)
-        Me.picPDF.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
+        Me.picPDF.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
         Me.picPDF.TabIndex = 27
         Me.picPDF.TabStop = False
         '
@@ -179,9 +182,9 @@ Partial Class frmMDM_USTVAntrag
         Me.btnMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnMail.ForeColor = System.Drawing.Color.Black
         Me.btnMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnMail.Location = New System.Drawing.Point(1109, 30)
+        Me.btnMail.Location = New System.Drawing.Point(1126, 55)
         Me.btnMail.Name = "btnMail"
-        Me.btnMail.Size = New System.Drawing.Size(103, 39)
+        Me.btnMail.Size = New System.Drawing.Size(103, 28)
         Me.btnMail.TabIndex = 26
         Me.btnMail.Text = "Anträge"
         Me.btnMail.UseVisualStyleBackColor = True
@@ -433,6 +436,44 @@ Partial Class frmMDM_USTVAntrag
         Me.Panel8.Size = New System.Drawing.Size(973, 87)
         Me.Panel8.TabIndex = 19
         '
+        'Label14
+        '
+        Me.Label14.AutoSize = True
+        Me.Label14.BackColor = System.Drawing.Color.Transparent
+        Me.Label14.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label14.ForeColor = System.Drawing.Color.Black
+        Me.Label14.Location = New System.Drawing.Point(524, 64)
+        Me.Label14.Name = "Label14"
+        Me.Label14.Size = New System.Drawing.Size(101, 17)
+        Me.Label14.TabIndex = 27
+        Me.Label14.Text = "eingereicht am"
+        '
+        'txtEingereichtAm
+        '
+        Me.txtEingereichtAm._DateTimeOnly = False
+        Me.txtEingereichtAm._numbersOnly = False
+        Me.txtEingereichtAm._numbersOnlyKommastellen = ""
+        Me.txtEingereichtAm._numbersOnlyTrennzeichen = False
+        Me.txtEingereichtAm._Prozent = False
+        Me.txtEingereichtAm._ShortDateNew = False
+        Me.txtEingereichtAm._ShortDateOnly = True
+        Me.txtEingereichtAm._TimeOnly = False
+        Me.txtEingereichtAm._TimeOnly_Seconds = False
+        Me.txtEingereichtAm._value = ""
+        Me.txtEingereichtAm._Waehrung = False
+        Me.txtEingereichtAm._WaehrungZeichen = False
+        Me.txtEingereichtAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+        Me.txtEingereichtAm.ForeColor = System.Drawing.Color.Black
+        Me.txtEingereichtAm.Location = New System.Drawing.Point(654, 60)
+        Me.txtEingereichtAm.MaxLength = 10
+        Me.txtEingereichtAm.MaxLineLength = -1
+        Me.txtEingereichtAm.MaxLines_Warning = ""
+        Me.txtEingereichtAm.MaxLines_Warning_Label = Nothing
+        Me.txtEingereichtAm.Name = "txtEingereichtAm"
+        Me.txtEingereichtAm.Size = New System.Drawing.Size(100, 23)
+        Me.txtEingereichtAm.TabIndex = 26
+        '
         'lblMWSTAntrag
         '
         Me.lblMWSTAntrag.AutoSize = True
@@ -1213,6 +1254,14 @@ Partial Class frmMDM_USTVAntrag
         Me.Panel2.Size = New System.Drawing.Size(1438, 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(1282, 261)
+        Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
+        '
         'Panel4
         '
         Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke
@@ -1309,6 +1358,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
@@ -1359,59 +1416,15 @@ Partial Class frmMDM_USTVAntrag
         Me.ContextMenuStrip2.Name = "ContextMenuStrip1"
         Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
         '
-        'UstCntlUSTV_AntragPosition1
+        'picExcel
         '
-        Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.picExcel.Image = Global.SDL.My.Resources.Resources.Excel_logo
-        Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0)
+        Me.picExcel.Location = New System.Drawing.Point(1014, 39)
-        Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
+        Me.picExcel.Name = "picExcel"
-        Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261)
+        Me.picExcel.Size = New System.Drawing.Size(35, 35)
-        Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
+        Me.picExcel.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        '
+        Me.picExcel.TabIndex = 29
-        'UstCntlUSTV_AntragErstattungen1
+        Me.picExcel.TabStop = False
-        '
-        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
-        '
-        'Label14
-        '
-        Me.Label14.AutoSize = True
-        Me.Label14.BackColor = System.Drawing.Color.Transparent
-        Me.Label14.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label14.ForeColor = System.Drawing.Color.Black
-        Me.Label14.Location = New System.Drawing.Point(524, 64)
-        Me.Label14.Name = "Label14"
-        Me.Label14.Size = New System.Drawing.Size(101, 17)
-        Me.Label14.TabIndex = 27
-        Me.Label14.Text = "eingereicht am"
-        '
-        'txtEingereichtAm
-        '
-        Me.txtEingereichtAm._DateTimeOnly = False
-        Me.txtEingereichtAm._numbersOnly = False
-        Me.txtEingereichtAm._numbersOnlyKommastellen = ""
-        Me.txtEingereichtAm._numbersOnlyTrennzeichen = False
-        Me.txtEingereichtAm._Prozent = False
-        Me.txtEingereichtAm._ShortDateNew = False
-        Me.txtEingereichtAm._ShortDateOnly = True
-        Me.txtEingereichtAm._TimeOnly = False
-        Me.txtEingereichtAm._TimeOnly_Seconds = False
-        Me.txtEingereichtAm._value = ""
-        Me.txtEingereichtAm._Waehrung = False
-        Me.txtEingereichtAm._WaehrungZeichen = False
-        Me.txtEingereichtAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
-        Me.txtEingereichtAm.ForeColor = System.Drawing.Color.Black
-        Me.txtEingereichtAm.Location = New System.Drawing.Point(654, 60)
-        Me.txtEingereichtAm.MaxLength = 10
-        Me.txtEingereichtAm.MaxLineLength = -1
-        Me.txtEingereichtAm.MaxLines_Warning = ""
-        Me.txtEingereichtAm.MaxLines_Warning_Label = Nothing
-        Me.txtEingereichtAm.Name = "txtEingereichtAm"
-        Me.txtEingereichtAm.Size = New System.Drawing.Size(100, 23)
-        Me.txtEingereichtAm.TabIndex = 26
         '
         'frmMDM_USTVAntrag
         '
@@ -1452,6 +1465,7 @@ Partial Class frmMDM_USTVAntrag
         CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).EndInit()
         Me.pnlErstattungsdetails.ResumeLayout(False)
         Me.Panel1.ResumeLayout(False)
+        CType(Me.picExcel, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
 
     End Sub
@@ -1543,4 +1557,5 @@ Partial Class frmMDM_USTVAntrag
     Friend WithEvents Button4 As Button
     Friend WithEvents Label14 As Label
     Friend WithEvents txtEingereichtAm As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents picExcel As PictureBox
 End Class

SDL/USTV/frmMDM_USTVAntrag.vb

@@ -2,8 +2,6 @@
 Imports System.IO
 Imports System.Reflection
 Imports System.Windows.Documents
-Imports com.sun.tools.corba.se.idl.constExpr
-Imports IKVM.internal
 Imports itextsharp.text.pdf
 Imports itextsharp.text.pdf.parser
 Imports Microsoft.Office.Interop
@@ -71,10 +69,22 @@ Public Class frmMDM_USTVAntrag
 
             If UStVAn_ID <= 0 Then Exit Sub
 
+            '.SET_SQL("SELECT  [UStVAn_ID] ,[UStVPo_ID] ,[UStVPo_ReDat],[UStVPo_ReNr],[UStVPo_Leistungsbezeichnung],[UStVPo_Leistender],leist.[UstV_Leistender_Strasse] + ' ' + leist.[UstV_Leistender_StrasseNr] as [UstV_Leistender_Strasse],leist.[UstV_Leistender_PLZ],leist.[UstV_Leistender_Stadt],leist.[UstV_Leistender_Land],leist.[UstV_Leistender_UstNr],[UStVPo_USteuerbetrag],[UStVPo_Schnittstelle],[UStVPo_SchnittstellenNr],[UStVPo_Umrechnungskurs],[UStVPo_USteuerbetragEUR],[UStVPo_Sachbearbeiter], [UStVPo_daId] 
+            '          FROM [tblUStVPositionen] 
+            '          left join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender]                     
+            '          where UStVAn_ID='" & UStVAn_ID & "' ORDER BY UStVPo_ID", "FMZOLL")
+
             .SET_SQL("SELECT  [UStVAn_ID] ,[UStVPo_ID] ,[UStVPo_ReDat],[UStVPo_ReNr],[UStVPo_Leistungsbezeichnung],[UStVPo_Leistender],leist.[UstV_Leistender_Strasse] + ' ' + leist.[UstV_Leistender_StrasseNr] as [UstV_Leistender_Strasse],leist.[UstV_Leistender_PLZ],leist.[UstV_Leistender_Stadt],leist.[UstV_Leistender_Land],leist.[UstV_Leistender_UstNr],[UStVPo_USteuerbetrag],[UStVPo_Schnittstelle],[UStVPo_SchnittstellenNr],[UStVPo_Umrechnungskurs],[UStVPo_USteuerbetragEUR],[UStVPo_Sachbearbeiter], [UStVPo_daId] 
-                      FROM [tblUStVPositionen] 
+                                         FROM [tblUStVPositionen] 
-                      left join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender]                     
+                                         LEFT JOIN [tblUStVLeistender]  as leist
-                      where UStVAn_ID='" & UStVAn_ID & "' ORDER BY UStVPo_ID", "FMZOLL")
+                       ON ([tblUStVPositionen].[UStVPo_LeistenderId] > 0 
+                           AND leist.[UStV_LeistenderId] = [tblUStVPositionen].[UStVPo_LeistenderId])
+                       OR ([tblUStVPositionen].[UStVPo_LeistenderId] <= 0 
+                           AND leist.[UStV_Leistender] = [tblUStVPositionen].[UStVPo_Leistender])                       
+                                         where UStVAn_ID='" & UStVAn_ID & "' ORDER BY UStVPo_ID", "FMZOLL")
+
+
+
             .LOAD()
             .RowTemplate.Height = 20
             .AllowUserToOrderColumns = False
@@ -629,14 +639,21 @@ Public Class frmMDM_USTVAntrag
 
                         USTV_POS.UStVPo_Schnittstelle = True
                         USTV_POS.UStVPo_Leistungsbezeichnung = "Maut"
-                        USTV_POS.UStVPo_Leistender = ANTRAG.plose_Lieferant
+
-                        If ANTRAG.plose_Lieferant = "PLOSE Sistem Service" Then
+                        Dim leistender As New cUStVLeistender(ANTRAG.plose_Lieferant & " " & Antrag_LandKz, Antrag_LandKz)
-                            USTV_POS.UStVPo_Leistender = "PLOSE SISTEM SERVICE SPA"
+                        If leistender.UStV_LeistenderId < 1 Then
+                            leistender = New cUStVLeistender(ANTRAG.plose_Lieferant.ToString)
                         End If
 
+                        USTV_POS.UStVPo_Leistender = leistender.UStV_Leistender
+                        USTV_POS.UStVPo_LeistenderId = leistender.UStV_LeistenderId
+                        'If ANTRAG.plose_Lieferant = "PLOSE Sistem Service" Then
+                        '    USTV_POS.UStVPo_Leistender = "PLOSE SISTEM SERVICE SPA"
+                        'End If
+
                         USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
                         USTV_POS.UStVPo_Zeitstempel = Now()
-                        If USTV_POS.UStVPo_daId <> "" AndAlso USTV_POS.UStVPo_daId > 0 Then
+                        If IsNumeric(USTV_POS.UStVPo_daId) AndAlso USTV_POS.UStVPo_daId > 0 Then
                             USTV_POS.UStVPo_daId_loeschbar = False
                         Else
                             USTV_POS.UStVPo_daId_loeschbar = True
@@ -745,12 +762,18 @@ Public Class frmMDM_USTVAntrag
                     If Not alreadyExists(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then
                         Dim sql As New SQL
                         USTV_POS.UStVPo_Schnittstelle = True
-                        USTV_POS.UStVPo_Leistender = "VERAG 360 GmbH"
+
+                        Dim leistender As New cUStVLeistender("VERAG 360 GmbH" & " " & Antrag_LandKz, Antrag_LandKz)
+                        If leistender.UStV_LeistenderId < 1 Then
+                            leistender = New cUStVLeistender("VERAG 360 GmbH")
+                        End If
+
+                        USTV_POS.UStVPo_Leistender = leistender.UStV_Leistender.ToString
                         USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
                         USTV_POS.UStVPo_Zeitstempel = Now()
 
                         USTV_POS.UStVPo_daId = 0
-                        Dim rkID = sql.getValueTxtBySql("SELECT TOP(1) isnull(RK_ID,0) FROM Rechnungsausgang where cast(Rechnungsausgang.RechnungsDatum as Date) ='" & USTV_POS.UStVPo_ReDat & "' and Rechnungsausgang.RechnungsNr='" & USTV_POS.UStVPo_ReNr & "' AND FilialenNr = 4814  AND RK_ID is not null", "FMZOLL")
+                        Dim rkID = sql.getValueTxtBySql("SELECT TOP(1) isnull(RK_ID,0) FROM Rechnungsausgang where cast(Rechnungsausgang.RechnungsDatum as Date) ='" & USTV_POS.UStVPo_ReDat & "' and Rechnungsausgang.RechnungsNr='" & USTV_POS.UStVPo_ReNr & "' AND FilialenNr = " & r.Item("FilialenNr") & " AND RK_ID is not null", "FMZOLL")
                         If rkID <> "" AndAlso IsNumeric(rkID) Then USTV_POS.UStVPo_daId = rkID
                         If USTV_POS.UStVPo_daId > 0 Then
                             USTV_POS.UStVPo_daId_loeschbar = False
@@ -847,7 +870,7 @@ Public Class frmMDM_USTVAntrag
                     USTV_POS.UStVPo_ReNr = r.Item("rmc_reNr").ToString
                     USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr
                     USTV_POS.UStVPo_daId = r.Item("rmc_daId")
-                    If USTV_POS.UStVPo_daId <> "" AndAlso USTV_POS.UStVPo_daId > 0 Then
+                    If IsNumeric(USTV_POS.UStVPo_daId) AndAlso USTV_POS.UStVPo_daId > 0 Then
                         USTV_POS.UStVPo_daId_loeschbar = False
                     Else
                         USTV_POS.UStVPo_daId_loeschbar = True
@@ -858,7 +881,15 @@ Public Class frmMDM_USTVAntrag
 
                         USTV_POS.UStVPo_Schnittstelle = True
                         USTV_POS.UStVPo_Leistungsbezeichnung = "Diesel"
-                        USTV_POS.UStVPo_Leistender = "RMC Service GmbH"
+
+                        Dim leistender As New cUStVLeistender("RMC Service GmbH" & " " & Antrag_LandKz, Antrag_LandKz)
+                        If leistender.UStV_LeistenderId < 1 Then
+                            leistender = New cUStVLeistender("RMC Service GmbH")
+                        End If
+
+                        USTV_POS.UStVPo_Leistender = leistender.UStV_Leistender.ToString
+
+
                         USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
                         USTV_POS.UStVPo_Zeitstempel = Now()
 
@@ -919,7 +950,7 @@ Public Class frmMDM_USTVAntrag
                     USTV_POS.UStVPo_ReNr = r.Item("invoice_number") & " - " & kdNr & IIf(Antrag_LandKz = "BE", "/Belgium", "")
                     USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr
                     USTV_POS.UStVPo_daId = r.Item("daId")
-                    If USTV_POS.UStVPo_daId > 0 Then
+                    If IsNumeric(USTV_POS.UStVPo_daId) AndAlso USTV_POS.UStVPo_daId > 0 Then
                         USTV_POS.UStVPo_daId_loeschbar = False
                     Else
                         USTV_POS.UStVPo_daId_loeschbar = True
@@ -929,7 +960,13 @@ Public Class frmMDM_USTVAntrag
 
                         USTV_POS.UStVPo_Schnittstelle = True
                         USTV_POS.UStVPo_Leistungsbezeichnung = r.Item("specification_page_name")
-                        USTV_POS.UStVPo_Leistender = "MS Europe BV"
+
+                        Dim leistender As New cUStVLeistender("MS Europe BV" & " " & Antrag_LandKz, Antrag_LandKz)
+                        If leistender.UStV_LeistenderId < 1 Then
+                            leistender = New cUStVLeistender("MS Europe BV")
+                        End If
+
+                        USTV_POS.UStVPo_Leistender = leistender.UStV_Leistender.ToString
                         USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
                         USTV_POS.UStVPo_Zeitstempel = Now()
 
@@ -991,7 +1028,7 @@ Public Class frmMDM_USTVAntrag
                     USTV_POS.UStVPo_ReNr = r.Item("Rechnungsnummer").ToString
                     USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr
                     USTV_POS.UStVPo_daId = r.Item("daId")
-                    If USTV_POS.UStVPo_daId > 0 Then
+                    If IsNumeric(USTV_POS.UStVPo_daId) AndAlso USTV_POS.UStVPo_daId > 0 Then
                         USTV_POS.UStVPo_daId_loeschbar = False
                     Else
                         USTV_POS.UStVPo_daId_loeschbar = True
@@ -1000,6 +1037,13 @@ Public Class frmMDM_USTVAntrag
                     If Not alreadyExists(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then
 
                         USTV_POS.UStVPo_Schnittstelle = True
+
+                        Dim Leistender As New cUStVLeistender("Union Tank Eckstein Gmbh&Co KG, Kleinostheim" & " " & Antrag_LandKz, Antrag_LandKz)
+
+                        If Leistender IsNot Nothing Then
+                            USTV_POS.UStVPo_LeistenderId = Leistender.UStV_LeistenderId
+                        End If
+
                         USTV_POS.UStVPo_Leistungsbezeichnung = "MAUT, DIESEL oder KFZ-Zubehör"
                         USTV_POS.UStVPo_Leistender = "Union Tank Eckstein Gmbh&Co KG, Kleinostheim"
                         USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
@@ -1028,10 +1072,9 @@ Public Class frmMDM_USTVAntrag
                         End If
 
                         If USTV_POS.INSERT() Then
-                            'kdnnr von UTA nicht unsere verwenden!!!!
                             cUTA.UPDATE_ARCHIV(USTV_POS.UStVPo_ReDat, USTV_POS.UStVPo_ReNr, kdnrUTA, USTV_POS.UStVAn_ID)
                         End If
-                        'tblUStVPositionen
+
                     End If
 
                 Next
@@ -1065,7 +1108,7 @@ Public Class frmMDM_USTVAntrag
                     USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr
 
                     USTV_POS.UStVPo_daId = sql.getValueTxtBySql("SELECT TOP(1) tblIDSInvoicesNew.daId FROM [tblIDSTransactionsNew] INNER JOIN tbl_IDS_Länder ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode LEFT JOIN tblIDSInvoicesNew on tblIDSInvoicesNew.CustomerCode = tblIDSTransactionsNew.CustomerCode and tblIDSInvoicesNew.Invoicenumber = Paymentsummarynumber where tblIDSTransactionsNew.[YearMonthDay] ='" & USTV_POS.UStVPo_ReDat & "' AND ISNULL(tblIDSTransactionsNew.[OBONumber], ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) ='" & USTV_POS.UStVPo_ReNr & "' and tbl_IDS_Länder.Lieferland_ISO2='" & Antrag_LandKz & "' AND tblIDSInvoicesNew.daId is not null", "FMZOLL")
-                    If USTV_POS.UStVPo_daId <> "" AndAlso USTV_POS.UStVPo_daId > 0 Then
+                    If IsNumeric(USTV_POS.UStVPo_daId) AndAlso USTV_POS.UStVPo_daId > 0 Then
                         USTV_POS.UStVPo_daId_loeschbar = False
                     Else
                         USTV_POS.UStVPo_daId_loeschbar = True
@@ -1074,7 +1117,14 @@ Public Class frmMDM_USTVAntrag
 
                         USTV_POS.UStVPo_Schnittstelle = True
                         USTV_POS.UStVPo_Leistungsbezeichnung = "Diesel"
-                        USTV_POS.UStVPo_Leistender = "IDS EUROPE B.V."
+
+                        Dim leistender As New cUStVLeistender("IDS EUROPE B.V." & " " & Antrag_LandKz, Antrag_LandKz)
+                        If leistender.UStV_LeistenderId < 1 Then
+                            leistender = New cUStVLeistender("IDS EUROPE B.V.")
+                        End If
+
+                        USTV_POS.UStVPo_Leistender = leistender.UStV_Leistender.ToString
+
                         USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
                         USTV_POS.UStVPo_Zeitstempel = Now()
 
@@ -1139,7 +1189,7 @@ Public Class frmMDM_USTVAntrag
             Dim FIRMA As New cFirmen(1)
 
             If ERW.kde_keineMWSt Then
-                If Not vbYes = MsgBox("Der ausgewählte Kunde  " & ADR.Name_1 & " ist als KEIN MWST-Kunde deklariert!" & vbNewLine & "Trotzdem den Antrag speichern?", vbYesNoCancel) Then Exit Sub
+                If Not vbYes = MsgBox("Der ausgewählte Kunde  " & ADR.Name_1 & " ist als KEIN MWST-Kunde deklariert!" & vbNewLine & "Trotzdem Antrag speichern?", vbYesNoCancel) Then Exit Sub
             End If
 
             USTV_ANTRAG.UStVAn_LandNr = cbxLand._value
@@ -1166,7 +1216,13 @@ Public Class frmMDM_USTVAntrag
     Sub initPosition(UStVPo_ID)
         If UStVPo_ID > 0 Then
             Dim ANTR_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen(USTV_ANTRAG.UStVAn_ID, UStVPo_ID)
+
             Dim ANTR_Leistender As New VERAG_PROG_ALLGEMEIN.cUStVLeistender(ANTR_POS.UStVPo_Leistender)
+            If Not IsDBNull(ANTR_POS.UStVPo_LeistenderId) AndAlso ANTR_POS.UStVPo_LeistenderId > 0 Then
+                ANTR_Leistender = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(ANTR_POS.UStVPo_LeistenderId)
+            End If
+
+
             UstCntlUSTV_AntragPosition1.Enabled = True
             UstCntlUSTV_AntragPosition1.setValues(USTV_ANTRAG.UStVAn_KuNr, ANTR_POS, Antrag_LandKz, ANTR_Leistender)
         Else
@@ -1718,7 +1774,7 @@ Public Class frmMDM_USTVAntrag
 
             If dgvUSTVPositionen.SelectedRows.Count > 0 Then
                 Dim nummerierung As Boolean = False
-                nummerierung = MsgBox("Soll eine Nummerierung auf den PDF Dokumenten angegeben werden?", vbYesNoCancel)
+                If vbYes = MsgBox("Soll eine Nummerierung auf den PDF Dokumenten angegeben werden?", vbYesNoCancel) Then nummerierung = True
 
 
                 For Each row As DataGridViewRow In dgvUSTVPositionen.SelectedRows.Cast(Of DataGridViewRow)().OrderBy(Function(dgvr) dgvr.Index)
@@ -1967,7 +2023,7 @@ Public Class frmMDM_USTVAntrag
 
                     Else
 
-                            Return DS.GET_TOP1_PATH
+                        Return DS.GET_TOP1_PATH
                     End If
 
 
@@ -2158,6 +2214,68 @@ Public Class frmMDM_USTVAntrag
         End With
     End Sub
 
+    Private Sub picExcel_Click(sender As Object, e As EventArgs) Handles picExcel.Click
+
+        Dim dtNew As DataTable = cProgramFunctions.dgridViewTods(dgvUSTVPositionen, True)
+
+        If dtNew IsNot Nothing AndAlso dtNew.Rows.Count > 0 Then
+
+            If dtNew.Columns.Contains("UStVPo_Schnittstelle") Then dtNew.Columns.Remove("UStVPo_Schnittstelle")
+            If dtNew.Columns.Contains("UStVPo_SchnittstellenNr") Then dtNew.Columns.Remove("UStVPo_SchnittstellenNr")
+            If dtNew.Columns.Contains("UStVPo_USteuerbetragEUR") Then dtNew.Columns.Remove("UStVPo_USteuerbetragEUR")
+            If dtNew.Columns.Contains("UStVPo_Umrechnungskurs") Then dtNew.Columns.Remove("UStVPo_Umrechnungskurs")
+            If dtNew.Columns.Contains("UStVPo_Sachbearbeiter") Then dtNew.Columns.Remove("UStVPo_Sachbearbeiter")
+            If dtNew.Columns.Contains("UStVPo_daId") Then dtNew.Columns.Remove("UStVPo_daId")
+            If dtNew.Columns.Contains("UStVAn_ID") Then dtNew.Columns.Remove("UStVAn_ID")
+            If dtNew.Columns.Contains("clmnPDF") Then dtNew.Columns.Remove("clmnPDF")
+
+
+            Dim sumVAT As Double = 0
+
+            For Each row In dtNew.Rows
+                If Not IsDBNull(row("UStVPo_USteuerbetrag")) AndAlso IsNumeric(row("UStVPo_USteuerbetrag")) Then sumVAT += CDbl(row("UStVPo_USteuerbetrag"))
+                If Not IsDBNull(row("UStVPo_USteuerbetrag")) AndAlso IsNumeric(row("UStVPo_USteuerbetrag")) Then row("UStVPo_USteuerbetrag") = CDbl(row("UStVPo_USteuerbetrag"))
+            Next
+
+            Dim drLast = dtNew.NewRow
+            If dtNew.Columns.Contains("UStVPo_ID") Then drLast.Item("UStVPo_ID") = DBNull.Value
+            If dtNew.Columns.Contains("UStVPo_ReDat") Then drLast.Item("UStVPo_ReDat") = DBNull.Value
+            If dtNew.Columns.Contains("UStVPo_ReNr") Then drLast.Item("UStVPo_ReNr") = DBNull.Value
+            If dtNew.Columns.Contains("UStVPo_USteuerbetrag") Then drLast.Item("UStVPo_USteuerbetrag") = sumVAT
+            If dtNew.Columns.Contains("UStVPo_Leistender") Then drLast.Item("UStVPo_Leistender") = DBNull.Value
+            If dtNew.Columns.Contains("UstV_Leistender_Strasse") Then drLast.Item("UstV_Leistender_Strasse") = DBNull.Value
+            If dtNew.Columns.Contains("UstV_Leistender_Stadt") Then drLast.Item("UstV_Leistender_Stadt") = DBNull.Value
+            If dtNew.Columns.Contains("UstV_Leistender_Land") Then drLast.Item("UstV_Leistender_Land") = DBNull.Value
+            If dtNew.Columns.Contains("UstV_Leistender_PLZ") Then drLast.Item("UstV_Leistender_PLZ") = DBNull.Value
+            If dtNew.Columns.Contains("UstV_Leistender_UstNr") Then drLast.Item("UstV_Leistender_UstNr") = "SUM"
+            If dtNew.Columns.Contains("UStVPo_Leistungsbezeichnung") Then drLast.Item("UStVPo_Leistungsbezeichnung") = DBNull.Value
+
+            dtNew.Rows.InsertAt(drLast, dtNew.Rows.Count)
+
+
+            For Each col As DataColumn In dtNew.Columns
+
+                If col.ColumnName = "UStVPo_ID" Then col.ColumnName = col.ColumnName.Replace("UStVPo_ID", "Number")
+                If col.ColumnName = "UStVPo_ReDat" Then col.ColumnName = col.ColumnName.Replace("UStVPo_ReDat", "Date of invoice")
+                If col.ColumnName = "UStVPo_ReNr" Then col.ColumnName = col.ColumnName.Replace("UStVPo_ReNr", "Number of invoice")
+                If col.ColumnName = "UStVPo_USteuerbetrag" Then col.ColumnName = col.ColumnName.Replace("UStVPo_USteuerbetrag", "Amount of tax refund applied for")
+                If col.ColumnName = "UStVPo_Leistender" Then col.ColumnName = col.ColumnName.Replace("UStVPo_Leistender", "Name of supplier")
+                If col.ColumnName = "UstV_Leistender_Strasse" Then col.ColumnName = col.ColumnName.Replace("UstV_Leistender_Strasse", "Street")
+                If col.ColumnName = "UstV_Leistender_Stadt" Then col.ColumnName = col.ColumnName.Replace("UstV_Leistender_Stadt", "City")
+                If col.ColumnName = "UstV_Leistender_Land" Then col.ColumnName = col.ColumnName.Replace("UstV_Leistender_Land", "Country")
+                If col.ColumnName = "UstV_Leistender_PLZ" Then col.ColumnName = col.ColumnName.Replace("UstV_Leistender_PLZ", "ZIP-Code")
+                If col.ColumnName = "UstV_Leistender_UstNr" Then col.ColumnName = col.ColumnName.Replace("UstV_Leistender_UstNr", "VAT")
+                If col.ColumnName = "UStVPo_Leistungsbezeichnung" Then col.ColumnName = col.ColumnName.Replace("UStVPo_Leistungsbezeichnung", "Name of service")
+
+            Next
+
+
+            cProgramFunctions.genExcelFromDT_NEW(dtNew, {"K1:K" & (dtNew.Rows.Count + 1)},, "Statement itemising VAT amounts relating to the period covered by this application", "VAT NO.: " & USTV_ANTRAG.UStVAn_Steuernummer & "    " & "Name/Company: " & USTV_ANTRAG.UStVAn_Name & "    " & "VAT in " & Antrag_LandKz & ": " & txtStNr.Text, IIf(USTV_ANTRAG.UStVAn_Währungscode = "EUR", "€", ""), True, "E")
+        End If
+
+
+    End Sub
+
     Private Sub initdgvErstattungen()
 
 

SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb

@@ -49,6 +49,7 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.lblAenderungsdatum = New System.Windows.Forms.Label()
         Me.lblSachbearbeiter = New System.Windows.Forms.Label()
         Me.pnl = New System.Windows.Forms.Panel()
+        Me.cbxAntragsfilter = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components)
         Me.lblWarning = New System.Windows.Forms.Label()
         Me.btnLeistenderSave = New System.Windows.Forms.Button()
         Me.sbLeistender = New VERAG_PROG_ALLGEMEIN.MySearchBox()
@@ -157,6 +158,7 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.scanUSTVVollmachten._DATENSERVER_UOrdner3 = ""
         Me.scanUSTVVollmachten._OPEN_ORIGINAL = False
         Me.scanUSTVVollmachten._TYPE = "PDF"
+        Me.scanUSTVVollmachten.AllowDrop = True
         Me.scanUSTVVollmachten.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
         Me.scanUSTVVollmachten.BackColor = System.Drawing.Color.White
         Me.scanUSTVVollmachten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
@@ -187,6 +189,7 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.scanUSTVFABest._DATENSERVER_UOrdner3 = ""
         Me.scanUSTVFABest._OPEN_ORIGINAL = False
         Me.scanUSTVFABest._TYPE = "PDF"
+        Me.scanUSTVFABest.AllowDrop = True
         Me.scanUSTVFABest.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
         Me.scanUSTVFABest.BackColor = System.Drawing.Color.White
         Me.scanUSTVFABest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
@@ -291,9 +294,9 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
         Me.Label3.Location = New System.Drawing.Point(630, 31)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(101, 15)
+        Me.Label3.Size = New System.Drawing.Size(100, 15)
         Me.Label3.TabIndex = 5
-        Me.Label3.Text = "Leistungs-Geber:"
+        Me.Label3.Text = "Leistungsgeber*:"
         '
         'Label6
         '
@@ -388,6 +391,7 @@ Partial Class ustCntlUSTV_AntragPosition
         'pnl
         '
         Me.pnl.BackColor = System.Drawing.Color.White
+        Me.pnl.Controls.Add(Me.cbxAntragsfilter)
         Me.pnl.Controls.Add(Me.lblWarning)
         Me.pnl.Controls.Add(Me.btnLeistenderSave)
         Me.pnl.Controls.Add(Me.sbLeistender)
@@ -421,6 +425,20 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.pnl.Size = New System.Drawing.Size(1300, 239)
         Me.pnl.TabIndex = 1
         '
+        'cbxAntragsfilter
+        '
+        Me.cbxAntragsfilter._date = Nothing
+        Me.cbxAntragsfilter._showdate = False
+        Me.cbxAntragsfilter._value = ""
+        Me.cbxAntragsfilter.AutoSize = True
+        Me.cbxAntragsfilter.Location = New System.Drawing.Point(779, 29)
+        Me.cbxAntragsfilter.Name = "cbxAntragsfilter"
+        Me.cbxAntragsfilter.Size = New System.Drawing.Size(134, 17)
+        Me.cbxAntragsfilter.TabIndex = 24
+        Me.cbxAntragsfilter.Text = "*nach Antr.-Land filtern"
+        Me.cbxAntragsfilter.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        Me.cbxAntragsfilter.UseVisualStyleBackColor = True
+        '
         'lblWarning
         '
         Me.lblWarning.AutoSize = True
@@ -757,7 +775,7 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.cboLeistungsgeber.FormattingEnabled = True
         Me.cboLeistungsgeber.Location = New System.Drawing.Point(633, 7)
         Me.cboLeistungsgeber.Name = "cboLeistungsgeber"
-        Me.cboLeistungsgeber.Size = New System.Drawing.Size(280, 21)
+        Me.cboLeistungsgeber.Size = New System.Drawing.Size(127, 21)
         Me.cboLeistungsgeber.TabIndex = 9
         Me.cboLeistungsgeber.Visible = False
         '
@@ -915,6 +933,7 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner3 = ""
         Me.UsrcntlPDFScanList1._OPEN_ORIGINAL = False
         Me.UsrcntlPDFScanList1._TYPE = "PDF"
+        Me.UsrcntlPDFScanList1.AllowDrop = True
         Me.UsrcntlPDFScanList1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
         Me.UsrcntlPDFScanList1.BackColor = System.Drawing.Color.White
         Me.UsrcntlPDFScanList1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
@@ -1030,4 +1049,5 @@ Partial Class ustCntlUSTV_AntragPosition
     Friend WithEvents sbLeistender As VERAG_PROG_ALLGEMEIN.MySearchBox
     Friend WithEvents btnLeistenderSave As Button
     Friend WithEvents lblWarning As Label
+    Friend WithEvents cbxAntragsfilter As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue
 End Class

SDL/USTV/ustCntlUSTV_AntragPosition.vb

@@ -96,7 +96,16 @@ Public Class ustCntlUSTV_AntragPosition
         scanUSTVFABest.INIT(kdnr, "KUNDENDATEN", "FA_Bestaetigungen")
         scanUSTVVollmachten.INIT(kdnr, "KUNDENDATEN", "USTV_Vollmachten")
 
-        sbLeistender.initSearchBox(Me.FindForm, "[UStV_Leistender], ([UStV_Leistender] + ' ' + isnull([UstV_Leistender_UstNr],'')) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt  FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, "UstV_aktiv = 1", "UStV_Leistender", "UStV_Leistender", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender"})
+        Dim filter As String = "UstV_aktiv = 1"
+        If Antrag_LandKz <> "" Then
+            If cbxAntragsfilter.Checked Then filter &= " and left(UstV_Leistender_UstNr,2)='" & Antrag_LandKz & "'"
+            sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender], ([UStV_Leistender] + ' ' + isnull([UstV_Leistender_UstNr],'')) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt  FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, filter, "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"})
+
+        Else
+            sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender], ([UStV_Leistender] + ' ' + isnull([UstV_Leistender_UstNr],'')) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt  FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, filter, "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"})
+        End If
+
+        'sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender], ([UStV_Leistender] + ' ' + isnull([UstV_Leistender_UstNr],'')) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt  FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, "UstV_aktiv = 1", "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"})
 
         gridAktiv = True
     End Sub
@@ -144,8 +153,15 @@ Public Class ustCntlUSTV_AntragPosition
         End If
 
         If sbLeistender._value IsNot Nothing AndAlso sbLeistender._value <> "" Then
-            UStV_Leist = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(sbLeistender._value)
+
+            If IsNumeric(sbLeistender._value) Then
+                    UStV_Leist = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(CInt(sbLeistender._value))
+                Else
+                    UStV_Leist = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(sbLeistender._value)
+                End If
+
             UStV_POS.UStVPo_Leistender = UStV_Leist.UStV_Leistender
+            If UStV_Leist.UStV_LeistenderId > 0 Then UStV_POS.UStVPo_LeistenderId = UStV_Leist.UStV_LeistenderId
         Else
             'save = False
         End If
@@ -262,13 +278,13 @@ Public Class ustCntlUSTV_AntragPosition
                 UStV_Leist.UstV_Leistender_PLZ = If(txtPLZ.Text, "")
                 UStV_Leist.UstV_Leistender_Stadt = If(txtOrt.Text, "")
                 UStV_Leist.UstV_Leistender_Land = If(txtLand.Text, "")
-
                 UStV_Leist.UstV_Leistender_UstNr = If(txtUIDNr.Text, "")
 
                 If UStV_Leist.SAVE() Then
 
                     btnLeistenderSave.Visible = False
                     UStV_POS.UStVPo_Leistender = UStV_Leist.UStV_Leistender
+                    UStV_POS.UStVPo_LeistenderId = UStV_Leist.UStV_LeistenderId
                     'RaiseEvent CHANGED(UStV_POS.UStVPo_ID)
                     values_changed()
                 End If
@@ -344,6 +360,7 @@ Public Class ustCntlUSTV_AntragPosition
             cboSchnittstellennr.Items.Add(New MyListItem("IDS neu", 8))
             cboSchnittstellennr.Items.Add(New MyListItem("MSE neu", 9))
             cboSchnittstellennr.Items.Add(New MyListItem("UTA neu", 10))
+            cboSchnittstellennr.Items.Add(New MyListItem("PLOSE neu", 11))
         End If
 
     End Sub
@@ -351,7 +368,12 @@ Public Class ustCntlUSTV_AntragPosition
     Private Sub sbLeistender_VALUE_CHANGED() Handles sbLeistender.VALUE_CHANGED
 
         If sbLeistender._value IsNot Nothing AndAlso sbLeistender._value <> "" Then
-            UStV_Leist = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(sbLeistender._value)
+            If IsNumeric(sbLeistender._value) Then
+                UStV_Leist = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(CInt(sbLeistender._value))
+            Else
+                UStV_Leist = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(sbLeistender._value)
+            End If
+
             loadChangedDSToPanel(UStV_Leist)
         End If
 
@@ -380,6 +402,19 @@ Public Class ustCntlUSTV_AntragPosition
 
                 If sender Is txtUSTBetrag Then
                     If IsNumeric(txtUSTBetrag.Text) AndAlso IsNumeric(txtUmrechnungskurs.Text) Then
+
+                        'Umrechnung bei Währung <> EUR im Antrag!
+                        Dim antr As New cUSTVAntrag(UStV_POS.UStVAn_ID)
+
+                        If antr.UStVAn_Währungscode <> "EUR" AndAlso IsDate(UStV_POS.UStVPo_ReDat) Then
+                            If txtUmrechnungskurs.Text = 1 Or txtUmrechnungskurs.Text = "" Then
+                                Dim kurs As New cEZB_Waehrungskurse(antr.UStVAn_Währungscode)
+                                txtUmrechnungskurs.Text = kurs.ezb_kurs
+                            End If
+
+                        End If
+
+
                         txtUSTBetragEUR.Text = Math.Floor((txtUSTBetrag.Text / txtUmrechnungskurs.Text) * 100 + 0.5) / 100
                         txtChanged = True
                     End If
@@ -416,7 +451,11 @@ Public Class ustCntlUSTV_AntragPosition
 
 
                     If UStV_Leist.hasEntry Then
+
+
                         UStV_POS.UStVPo_Leistender = UStV_Leist.UStV_Leistender
+                        If UStV_Leist.UStV_LeistenderId > 0 Then UStV_POS.UStVPo_LeistenderId = UStV_Leist.UStV_LeistenderId
+
                         txtChanged = True
                         'UStV_POS.SAVE()
                         'RaiseEvent CHANGED(UStV_POS.UStVPo_ID)
@@ -459,4 +498,13 @@ Public Class ustCntlUSTV_AntragPosition
         UStV_POS.SAVE()
 
     End Sub
+
+    Private Sub cbxAntragsfilter_CheckedChanged(sender As Object, e As EventArgs) Handles cbxAntragsfilter.CheckedChanged
+
+        Dim filter As String = "UstV_aktiv = 1"
+        If Antrag_LandKz <> "" Then
+            If cbxAntragsfilter.Checked Then filter &= " and left(UstV_Leistender_UstNr,2)='" & Antrag_LandKz & "'"
+            sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender], ([UStV_Leistender] + ' ' + isnull([UstV_Leistender_UstNr],'')) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt  FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, filter, "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"})
+        End If
+    End Sub
 End Class

SDL/cProgramFunctions.vb

@@ -1124,7 +1124,7 @@ Public Class cProgramFunctions
         Return ""
     End Function
 
-    Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional waehrungsZeichen As String = "€", Optional fitCellsToContent As Boolean = False) As String
+    Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional waehrungsZeichen As String = "€", Optional fitCellsToContent As Boolean = False, Optional mergeHeadersToCell As Char = "") As String
         Try
 
             Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SDL\tmp\" ' My.Computer.FileSystem.GetTempFileName
@@ -1153,9 +1153,25 @@ Public Class cProgramFunctions
                 wb.Worksheets(0).FirstRow.InsertRowsAbove(2)
                 wb.Worksheets(0).Range("A1").Value = HeaderTxt
                 wb.Worksheets(0).Range("A1").Style.Font.Bold = True
+
+                If mergeHeadersToCell <> "" Then
+                    wb.Worksheets(0).Range("A1:" & mergeHeadersToCell & "1").Merge()
+                    wb.Worksheets(0).Range("A1:" & mergeHeadersToCell & "1").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center
+                    wb.Worksheets(0).Range("A1:" & mergeHeadersToCell & "1").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center
+                    wb.Worksheets(0).Range("A1:" & mergeHeadersToCell & "1").Style.Alignment.WrapText = True
+                End If
+
                 If HeaderTxt2 <> "" Then
                     wb.Worksheets(0).Range("A2").Value = HeaderTxt2
                     wb.Worksheets(0).Row(2).InsertRowsBelow(1)
+
+                    If mergeHeadersToCell <> "" Then
+                        wb.Worksheets(0).Range("A2:" & mergeHeadersToCell & "2").Merge()
+                        wb.Worksheets(0).Range("A2:" & mergeHeadersToCell & "2").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center
+                        wb.Worksheets(0).Range("A2:" & mergeHeadersToCell & "2").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center
+                        wb.Worksheets(0).Range("A2:" & mergeHeadersToCell & "2").Style.Alignment.WrapText = True
+                    End If
+
                 End If
 
             End If
@@ -1337,7 +1353,8 @@ Public Class cProgramFunctions
                     If valueTmp Is DBNull.Value Then
                         row.Item(column.Index) = ""
                     Else
-                        If replaceZeroDate AndAlso Not IsNumeric(valueTmp) Then valueTmp = valueTmp.ToString.Replace(" 00:00:00", "")
+                        If replaceZeroDate AndAlso valueTmp IsNot Nothing AndAlso Not IsNumeric(valueTmp) Then valueTmp = valueTmp.ToString.Replace(" 00:00:00", "")
+
                         row.Item(column.Index) = valueTmp
                     End If
                 Next

SDL/kunden/usrCntlCBAM.vb

@@ -1,9 +1,4 @@
-
+Public Class usrCntlCBAM
-
-Imports javax.xml.bind.annotation
-Imports VERAG_PROG_ALLGEMEIN.agsCustomsExchange
-
-Public Class usrCntlCBAM
 
     Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
     Public kdnr = -1
@@ -433,9 +428,9 @@ Public Class usrCntlCBAM
                      ,max([Rechnungsbetrag])Rechnungspreis
                      ,max([Rechnungswährung]) Rechnungswaehrung
                      ,isnull(max(Empfänger_CN_EORI),'') as EmpfängerEORI
-                     ,isnull(max(CZ_Name), '') as Empfänger
+                     ,isnull(max(CN_Name), '') as Empfänger
                      ,isnull(max(Versender_CZ_EORI),'') as AbsenderEORI
-                     ,isnull(max(CN_Name), '') as Absender
+                     ,isnull(max(CZ_Name), '') as Absender
 	  
                   FROM [tbl_DY_Zollmeldungen_Import]
                   where  
@@ -1173,7 +1168,7 @@ Public Class usrCntlCBAM
                 End If
                 Me.Cursor = Cursors.Default
 
-                End If
+            End If
 
 
 

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -91,6 +91,8 @@ Public Class frmMDMDatenverarbetiung
 
         Dim errorTmp = False
 
+        If Not checkAbrechnungsdatum(CDate(datPloseAnhang.Value)) Then Exit Sub
+
         If test Then
             If Not vbYes = MsgBox("Aktuell ist der Testlauf aktiviert, wirklich fortfahren?", vbYesNoCancel) Then Exit Sub
         End If
@@ -4236,17 +4238,22 @@ Public Class frmMDMDatenverarbetiung
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
 
+
+
         If test Then
             If Not vbYes = MsgBox("Aktuell ist der Testlauf aktiviert, wirklich fortfahren?", vbYesNoCancel) Then Exit Sub
         End If
 
         If vbYes = MsgBox("Möchten Sie den Vorgang wirklich manuell ausgeführen (wird bei Rechnungserstellung automatisch ausgeführt)", vbYesNoCancel) Then
 
+            If Not checkAbrechnungsdatum(datPloseAnhang.Value) Then Exit Sub
+
             MautD_Befuellen()
         End If
     End Sub
 
     Function MautD_Befuellen(Optional kdNr = "", Optional _Lieferant = "") As Boolean
+
         Select Case LIEFERANT
             Case "PLOSE" : deleteMautD("PLOSE") : Return genPLOSEInsertMautD(dat_Sum_Von.Value.ToShortDateString, dat_Sum_Bis.Value.ToShortDateString)
             Case "ASFINAG" : deleteMautD("AT") : Return genASFINAGInsertMautAT(kdNr)
@@ -4817,4 +4824,22 @@ RabattBerechnen:
         End If
 
     End Function
+
+    Private Function checkAbrechnungsdatum(abrDate As Date)
+
+
+        Dim checkDate As Boolean = False
+
+        If Not (abrDate.Day = 15 Or abrDate.Day = 30 Or abrDate.Day = 31 Or (abrDate.Month = 2 And abrDate.Day = 28)) Then
+            If Not vbYes = MsgBox("ACHTUNG, immer als Abrechnungsdatum den 15. bzw. den letzten Tag des Monats angeben!" & vbNewLine & "Dies kann zu Fehlern bei der Verrechnung führen!" & vbNewLine & "Möchten Sie wirklich mit dem " & abrDate.ToShortDateString & " fortfahren?", vbYesNoCancel) Then
+                checkDate = False
+            Else
+                checkDate = True
+            End If
+        Else
+            checkDate = True
+        End If
+
+        Return checkDate
+    End Function
 End Class

SDL/mdm/usrcntlFremdrechnungen.Designer.vb

@@ -216,9 +216,9 @@ Partial Class usrcntlFremdrechnungen
         Me.btnVERAGCardNew.Location = New System.Drawing.Point(468, 0)
         Me.btnVERAGCardNew.Margin = New System.Windows.Forms.Padding(0)
         Me.btnVERAGCardNew.Name = "btnVERAGCardNew"
-        Me.btnVERAGCardNew.Size = New System.Drawing.Size(78, 64)
+        Me.btnVERAGCardNew.Size = New System.Drawing.Size(78, 80)
         Me.btnVERAGCardNew.TabIndex = 45
-        Me.btnVERAGCardNew.Text = "VERAG"
+        Me.btnVERAGCardNew.Text = "VERAG AT-MAUT"
         Me.btnVERAGCardNew.TextAlign = System.Drawing.ContentAlignment.BottomCenter
         Me.btnVERAGCardNew.UseVisualStyleBackColor = True
         '

SDL/mdm/usrcntlFremdrechnungen.vb

@@ -218,24 +218,24 @@ Public Class usrcntlFremdrechnungen
 
             'UTA
             Case "UTA" : SQL_STR = "SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahlTop, "") &
-                    " [Rechnungsdatum],[Rechnungsnummer_pro_Lieferland] as Rechnungsnummer,Kundennummer,SUM(Gesamtbetrag_Brutto_in_Darstellwährung) as Bruttobetrag,SUM(Gesamtbetrag_Netto_in_Darstellwährung) as Nettobetrag, SUM(Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) as MWSt,[daId],[Lieferland_ISO2] as Land, 'RE' as Art, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblUTAImportNew] inner join adressen on Kundennummer = UTAKundenNr  where 1 = 1 " & IIf(kdNr > 0, " AND [AdressenNr]=" & kdNr, "") & " AND [Rechnungsdatum] " & setSQLWhere(SDLNrTmp, "Lieferland_ISO2") & "  group by [Rechnungsnummer_pro_Lieferland],[Rechnungsdatum],Kundennummer,[daId],[Lieferland_ISO2]"
+                    " Adressen.AdressenNr, Adressen.[Name 1], [Rechnungsdatum],[Rechnungsnummer_pro_Lieferland] as Rechnungsnummer,Kundennummer,SUM(Gesamtbetrag_Brutto_in_Darstellwährung) as Bruttobetrag,SUM(Gesamtbetrag_Netto_in_Darstellwährung) as Nettobetrag, SUM(Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) as MWSt,[daId],[Lieferland_ISO2] as Land, 'RE' as Art, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblUTAImportNew] inner join adressen on Kundennummer = UTAKundenNr  where 1 = 1 " & IIf(kdNr > 0, " AND [AdressenNr]=" & kdNr, "") & " AND [Rechnungsdatum] " & setSQLWhere(SDLNrTmp, "Lieferland_ISO2") & "  group by Adressen.AdressenNr, Adressen.[Name 1],[Rechnungsnummer_pro_Lieferland],[Rechnungsdatum],Kundennummer,[daId],[Lieferland_ISO2]"
 
-                SQL_STR &= " UNION ALL SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahlTop, "") & " [Datum], [RechnungsNr],[KundenNr],0,0,0,[daId],'',[DocumentTyp], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblUTADocuments] inner join adressen on KundenNr = UTAKundenNr  where 1 = 1 " & IIf(kdNr > 0, " AND [AdressenNr]=" & kdNr, "") & " and [Datum] " & setSQLWhere("_", "") & "  order by Rechnungsdatum desc"
+                SQL_STR &= " UNION ALL SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahlTop, "") & " Adressen.AdressenNr, Adressen.[Name 1],[Datum], [RechnungsNr],[KundenNr],0,0,0,[daId],'',[DocumentTyp], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblUTADocuments] inner join adressen on KundenNr = UTAKundenNr  where 1 = 1 " & IIf(kdNr > 0, " AND [AdressenNr]=" & kdNr, "") & " and [Datum] " & setSQLWhere("_", "") & "  order by Rechnungsdatum desc"
 
             'PLOSE
             Case "PLOSE" : SQL_STR = "SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahlTop, "") &
-                   " [plInv_SupplierRechnungsDatum] as Rechnungsdatum, [plInv_SupplierRechnungsNr] as Rechnungsnummer,[plInv_PLOSEKundennummer] as Kundennummer,[plInv_Nettobetrag] as Nettobetrag,[plInv_MWSTBetrag] as MWST,[plInv_Bruttobetrag] as Bruttobetrag,[plInv_daId] as daId, [plInv_SupplierCountry] as Land, cast(case when [plInv_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblPLOSE_Inv_Data  inner join Adressen on Adressen.PLOSEKundenNr = plInv_PLOSEKundennummer where 1 = 1 " & IIf(kdNr > 0, " AND Adressen.AdressenNr=" & kdNr, "") & " and [plInv_SupplierRechnungsDatum] " & setSQLWhere(SDLNrTmp, "plInv_SupplierCountry") & "  Order by plInv_SupplierRechnungsDatum desc, [plInv_SupplierRechnungsNr]"
+                   " Adressen.AdressenNr, Adressen.[Name 1],[plInv_SupplierRechnungsDatum] as Rechnungsdatum, [plInv_SupplierRechnungsNr] as Rechnungsnummer,[plInv_PLOSEKundennummer] as Kundennummer,[plInv_Nettobetrag] as Nettobetrag,[plInv_MWSTBetrag] as MWST,[plInv_Bruttobetrag] as Bruttobetrag,[plInv_daId] as daId, [plInv_SupplierCountry] as Land, cast(case when [plInv_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblPLOSE_Inv_Data  inner join Adressen on Adressen.PLOSEKundenNr = plInv_PLOSEKundennummer where 1 = 1 " & IIf(kdNr > 0, " AND Adressen.AdressenNr=" & kdNr, "") & " and [plInv_SupplierRechnungsDatum] " & setSQLWhere(SDLNrTmp, "plInv_SupplierCountry") & "  Order by plInv_SupplierRechnungsDatum desc, [plInv_SupplierRechnungsNr]"
 
             'MSE
             Case "MSE" : SQL_STR = "SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahlTop, "") &
-                    " [invoice_date] as Rechnungsdatum, [invoice_id] as Rechnungsnummer/*,[invoice_nr]*/,[customer_number] as Kundennummer, daId, [total_amount_euro] as Brutto_EUR  ,[total_vat_amount_euro] as MWST,[country] as Land, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblMSEInvoices where customer_number in (select customer_id from tblMSECustomers where 1 = 1 " & IIf(kdNr > 0, " AND [partner_customer_number]=" & kdNr, "") & " and [invoice_date] " & setSQLWhere(SDLNrTmp, "country") & " ) order by invoice_date desc, invoice_id"
+                    " partner_customer_number as AdressenNr, customer_name as [Name 1], [invoice_date] as Rechnungsdatum, [invoice_id] as Rechnungsnummer/*,[invoice_nr]*/,[customer_number] as Kundennummer, daId, [total_amount_euro] as Brutto_EUR  ,[total_vat_amount_euro] as MWST,[country] as Land, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblMSEInvoices inner join tblMSECustomers on customer_id = [customer_number]  where 1 = 1 " & IIf(kdNr > 0, " AND [partner_customer_number]=" & kdNr, "") & " and [invoice_date] " & setSQLWhere(SDLNrTmp, "country") & " order by invoice_date desc, invoice_id"
 
             'VERAG
             Case "VERAG" : SQL_STR = "SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahlTop, "") &
-                    " tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer , tblTrdinInvoice.SteuerbetragLokal, 1 as daId, cast(1 as bit) as PDFvorhanden FROM tblTrdinInvoice WHERE 1 = 1 " & IIf(kdNr > 0, " AND tblTrdinInvoice.RechnungsKundenNr=" & kdNr, "") & " AND tblTrdinInvoice.FilialenNr = 4814 and tblTrdinInvoice.Rechnungsdatum " & setSQLWhere(SDLNrTmp, "'AT'") & "  ORDER BY tblTrdinInvoice.Rechnungsdatum desc, tblTrdinInvoice.Rechnungsnummer"
+                    " Adressen.AdressenNr, Adressen.[Name 1], tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer , tblTrdinInvoice.SteuerbetragLokal, 1 as daId, cast(1 as bit) as PDFvorhanden FROM tblTrdinInvoice inner join Adressen on KundenNrZentrale = AdressenNr  WHERE 1 = 1 " & IIf(kdNr > 0, " AND tblTrdinInvoice.RechnungsKundenNr=" & kdNr, "") & " AND tblTrdinInvoice.FilialenNr = 4814  and tblTrdinInvoice.Rechnungsdatum " & setSQLWhere(SDLNrTmp, "'AT'") & "  ORDER BY tblTrdinInvoice.Rechnungsdatum desc, tblTrdinInvoice.Rechnungsnummer"
             'RMC
             Case "RMC" : SQL_STR = "SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahlTop, "") &
-               "[rmc_reDatum]  as Rechnungsdatum,[rmc_reNr] as Rechnungsnummer,rmc_kdNr as Kundennummer,[rmc_betragNetto] as Nettobetrag,[rmc_betragBrutto] as Bruttobetrag,[rmc_waehrung] as Währung ,[rmc_euroBrutto] as Brutto_EUR,[rmc_daId] as daId,[rmc_betragMWST] as MWST,rmc_landKZ as Land, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblRMCImport] inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr where 1 = 1 " & IIf(kdNr > 0, " AND AdressenNr=" & kdNr, "") & " and [rmc_reDatum] " & setSQLWhere(SDLNrTmp, "rmc_landKZ") & "  order by rmc_reDatum desc, rmc_reNr"
+               "Adressen.AdressenNr, Adressen.[Name 1],[rmc_reDatum]  as Rechnungsdatum,[rmc_reNr] as Rechnungsnummer,rmc_kdNr as Kundennummer,[rmc_betragNetto] as Nettobetrag,[rmc_betragBrutto] as Bruttobetrag,[rmc_waehrung] as Währung ,[rmc_euroBrutto] as Brutto_EUR,[rmc_daId] as daId,[rmc_betragMWST] as MWST,rmc_landKZ as Land, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblRMCImport] inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr where 1 = 1 " & IIf(kdNr > 0, " AND AdressenNr=" & kdNr, "") & " and [rmc_reDatum] " & setSQLWhere(SDLNrTmp, "rmc_landKZ") & "  order by rmc_reDatum desc, rmc_reNr"
 
             Case "ALLE" : Dim anzahl As Integer = anzahlTop / 6 : SQL_STR = " select * from (SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") &
                     "
@@ -1012,21 +1012,35 @@ Public Class usrcntlFremdrechnungen
         If Not dgvInitWait Then
             Try
                 If dgvLFRechnung.SelectedRows.Count > 0 AndAlso (aktLieferant = "IDS" Or aktLieferant = "ALLE") Then
+
+                    If dgvLFRechnung.SelectedRows.Count = 1 AndAlso dgvLFRechnung.SelectedRows(0).Cells("Lieferant").Value <> "IDS" Then
+                        dgvDetails.Visible = False
+                        Exit Sub
+                    End If
+
                     dgvDetails.Visible = True
+
                     If Not SplitContainer1.Panel2Collapsed Then
 
-                        Select Case aktLieferant
+                            Select Case aktLieferant
-                            Case "IDS" : initDGVRechnungsdetails(dgvLFRechnung.SelectedRows(0).Cells("invoice_id").Value)
+                                Case "IDS" : initDGVRechnungsdetails(dgvLFRechnung.SelectedRows(0).Cells("invoice_id").Value)
-                            Case "ALLE" : If dgvLFRechnung.Columns.Contains("Lieferant") AndAlso dgvLFRechnung.SelectedRows(0).Cells("Lieferant").Value = "IDS" Then initDGVRechnungsdetails(dgvLFRechnung.SelectedRows(0).Cells("invoice_id").Value)
+                            Case "ALLE"
+                                If dgvLFRechnung.Columns.Contains("Lieferant") AndAlso dgvLFRechnung.SelectedRows(0).Cells("Lieferant").Value = "IDS" Then
+                                    initDGVRechnungsdetails(dgvLFRechnung.SelectedRows(0).Cells("invoice_id").Value)
+                                Else
+                                    dgvDetails.Visible = False
+                                End If
                         End Select
 
+
+
                     Else
 
-                        dgvDetails.Visible = False
+                            dgvDetails.Visible = False
+                        End If
+
+
                     End If
-
-
-                End If
             Catch ex As Exception
                 'Neuer eintrag
                 MsgBox(ex.Message & ex.StackTrace)

SDL/seriendruck/usrCntlFakturierung.Designer.vb

@@ -33,15 +33,12 @@ Partial Class usrcntlFakturierung
         Me.Label61 = New System.Windows.Forms.Label()
         Me.GBMautberichte = New System.Windows.Forms.GroupBox()
         Me.TextBox1 = New System.Windows.Forms.TextBox()
-        Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Label5 = New System.Windows.Forms.Label()
         Me.lblAnzahlMautberichte = New System.Windows.Forms.Label()
         Me.pbMautAnh_Proz = New System.Windows.Forms.ProgressBar()
         Me.lblMautAnh_Proz = New System.Windows.Forms.Label()
-        Me.cbxDateMautbericht = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label69 = New System.Windows.Forms.Label()
         Me.Label68 = New System.Windows.Forms.Label()
-        Me.cbxMautbericht = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label62 = New System.Windows.Forms.Label()
         Me.Button18 = New System.Windows.Forms.Button()
         Me.Label44 = New System.Windows.Forms.Label()
@@ -68,7 +65,6 @@ Partial Class usrcntlFakturierung
         Me.cbxRechnungsjournaldrucken = New System.Windows.Forms.CheckBox()
         Me.Button20 = New System.Windows.Forms.Button()
         Me.Label72 = New System.Windows.Forms.Label()
-        Me.KdSearchBox3 = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
         Me.rbkunde = New System.Windows.Forms.RadioButton()
         Me.rbAlleKunden = New System.Windows.Forms.RadioButton()
         Me.txtPloseAnh_Einarbeitung = New System.Windows.Forms.TextBox()
@@ -77,7 +73,6 @@ Partial Class usrcntlFakturierung
         Me.lblPloseAnh_Proz = New System.Windows.Forms.Label()
         Me.Button19 = New System.Windows.Forms.Button()
         Me.Label70 = New System.Windows.Forms.Label()
-        Me.cboSachbearbeiter = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label67 = New System.Windows.Forms.Label()
         Me.dtRechnungsdatum = New System.Windows.Forms.DateTimePicker()
         Me.Label66 = New System.Windows.Forms.Label()
@@ -86,9 +81,13 @@ Partial Class usrcntlFakturierung
         Me.Label63 = New System.Windows.Forms.Label()
         Me.Label45 = New System.Windows.Forms.Label()
         Me.Button14 = New System.Windows.Forms.Button()
+        Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.cbxDateMautbericht = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cbxMautbericht = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.KdSearchBox3 = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
+        Me.cboSachbearbeiter = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.GroupBox1.SuspendLayout()
         Me.GBMautberichte.SuspendLayout()
-        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GBSammelrechnung.SuspendLayout()
         CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -98,6 +97,7 @@ Partial Class usrcntlFakturierung
         CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'GroupBox1
@@ -199,7 +199,7 @@ Partial Class usrcntlFakturierung
         Me.GBMautberichte.Enabled = False
         Me.GBMautberichte.Location = New System.Drawing.Point(10, 131)
         Me.GBMautberichte.Name = "GBMautberichte"
-        Me.GBMautberichte.Size = New System.Drawing.Size(697, 195)
+        Me.GBMautberichte.Size = New System.Drawing.Size(697, 211)
         Me.GBMautberichte.TabIndex = 16
         Me.GBMautberichte.TabStop = False
         '
@@ -212,16 +212,6 @@ Partial Class usrcntlFakturierung
         Me.TextBox1.Size = New System.Drawing.Size(106, 13)
         Me.TextBox1.TabIndex = 105
         '
-        'MyDatagridview1
-        '
-        Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1
-        Me.MyDatagridview1.BackgroundColor = System.Drawing.SystemColors.Window
-        Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.MyDatagridview1.Location = New System.Drawing.Point(4, 71)
-        Me.MyDatagridview1.Name = "MyDatagridview1"
-        Me.MyDatagridview1.Size = New System.Drawing.Size(471, 124)
-        Me.MyDatagridview1.TabIndex = 34
-        '
         'Label5
         '
         Me.Label5.AutoSize = True
@@ -255,17 +245,6 @@ Partial Class usrcntlFakturierung
         Me.lblMautAnh_Proz.Text = "0%"
         Me.lblMautAnh_Proz.TextAlign = System.Drawing.ContentAlignment.TopRight
         '
-        'cbxDateMautbericht
-        '
-        Me.cbxDateMautbericht._allowedValuesFreiText = Nothing
-        Me.cbxDateMautbericht._allowFreiText = False
-        Me.cbxDateMautbericht._value = ""
-        Me.cbxDateMautbericht.FormattingEnabled = True
-        Me.cbxDateMautbericht.Location = New System.Drawing.Point(265, 12)
-        Me.cbxDateMautbericht.Name = "cbxDateMautbericht"
-        Me.cbxDateMautbericht.Size = New System.Drawing.Size(87, 21)
-        Me.cbxDateMautbericht.TabIndex = 32
-        '
         'Label69
         '
         Me.Label69.AutoSize = True
@@ -283,18 +262,6 @@ Partial Class usrcntlFakturierung
         Me.Label68.TabIndex = 30
         Me.Label68.Text = "Generiert Mautberichte"
         '
-        'cbxMautbericht
-        '
-        Me.cbxMautbericht._allowedValuesFreiText = Nothing
-        Me.cbxMautbericht._allowFreiText = False
-        Me.cbxMautbericht._value = ""
-        Me.cbxMautbericht.DropDownWidth = 200
-        Me.cbxMautbericht.FormattingEnabled = True
-        Me.cbxMautbericht.Location = New System.Drawing.Point(265, 33)
-        Me.cbxMautbericht.Name = "cbxMautbericht"
-        Me.cbxMautbericht.Size = New System.Drawing.Size(152, 21)
-        Me.cbxMautbericht.TabIndex = 30
-        '
         'Label62
         '
         Me.Label62.AutoSize = True
@@ -320,7 +287,7 @@ Partial Class usrcntlFakturierung
         Me.Label44.AutoSize = True
         Me.Label44.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label44.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Label44.Location = New System.Drawing.Point(11, 340)
+        Me.Label44.Location = New System.Drawing.Point(11, 345)
         Me.Label44.Name = "Label44"
         Me.Label44.Size = New System.Drawing.Size(436, 17)
         Me.Label44.TabIndex = 15
@@ -369,7 +336,7 @@ Partial Class usrcntlFakturierung
         Me.GBSammelrechnung.Controls.Add(Me.Label45)
         Me.GBSammelrechnung.Controls.Add(Me.Button14)
         Me.GBSammelrechnung.Enabled = False
-        Me.GBSammelrechnung.Location = New System.Drawing.Point(10, 351)
+        Me.GBSammelrechnung.Location = New System.Drawing.Point(10, 356)
         Me.GBSammelrechnung.Name = "GBSammelrechnung"
         Me.GBSammelrechnung.Size = New System.Drawing.Size(697, 393)
         Me.GBSammelrechnung.TabIndex = 14
@@ -611,34 +578,6 @@ Partial Class usrcntlFakturierung
         Me.Label72.TabIndex = 42
         Me.Label72.Text = "* hier wird eine RE-Nr erzeugt, die Rechnungen gelten dann als ""gedruckt"" und kön" &
     "nen somit nicht mehr geändert werden."
-        '
-        'KdSearchBox3
-        '
-        Me.KdSearchBox3._AlleFirmenCLUSTER = False
-        Me.KdSearchBox3._AllowSetValue = True
-        Me.KdSearchBox3._autoSizeGross = False
-        Me.KdSearchBox3._display_Name1 = False
-        Me.KdSearchBox3._displayAVISO_Email = False
-        Me.KdSearchBox3._displayFullName = False
-        Me.KdSearchBox3._displayWoelflKd = False
-        Me.KdSearchBox3._hideIfListEmpty = True
-        Me.KdSearchBox3._loadKdData = False
-        Me.KdSearchBox3._searchName1 = True
-        Me.KdSearchBox3._UseFIRMA = ""
-        Me.KdSearchBox3._ValueKdAndName = True
-        Me.KdSearchBox3.dgvpos = "LEFT"
-        Me.KdSearchBox3.KdName = ""
-        Me.KdSearchBox3.KdNr = "-1"
-        Me.KdSearchBox3.kdNrField = Nothing
-        Me.KdSearchBox3.KdNrNullInt = Nothing
-        Me.KdSearchBox3.Location = New System.Drawing.Point(87, 308)
-        Me.KdSearchBox3.Name = "KdSearchBox3"
-        Me.KdSearchBox3.nurAktive = True
-        Me.KdSearchBox3.searchActive = True
-        Me.KdSearchBox3.Size = New System.Drawing.Size(350, 20)
-        Me.KdSearchBox3.TabIndex = 41
-        Me.KdSearchBox3.TIMER_SEARCH = True
-        Me.KdSearchBox3.usrcntl = Nothing
         '
         'rbkunde
         '
@@ -715,17 +654,6 @@ Partial Class usrcntlFakturierung
         Me.Label70.TabIndex = 30
         Me.Label70.Text = "6. Hängt Mautgesamtbericht an Sammenrechnungen an."
         '
-        'cboSachbearbeiter
-        '
-        Me.cboSachbearbeiter._allowedValuesFreiText = Nothing
-        Me.cboSachbearbeiter._allowFreiText = False
-        Me.cboSachbearbeiter._value = ""
-        Me.cboSachbearbeiter.FormattingEnabled = True
-        Me.cboSachbearbeiter.Location = New System.Drawing.Point(529, 38)
-        Me.cboSachbearbeiter.Name = "cboSachbearbeiter"
-        Me.cboSachbearbeiter.Size = New System.Drawing.Size(152, 21)
-        Me.cboSachbearbeiter.TabIndex = 29
-        '
         'Label67
         '
         Me.Label67.AutoSize = True
@@ -796,6 +724,78 @@ Partial Class usrcntlFakturierung
         Me.Button14.Text = "Rechnungspos. berechnen"
         Me.Button14.UseVisualStyleBackColor = True
         '
+        'MyDatagridview1
+        '
+        Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1
+        Me.MyDatagridview1.BackgroundColor = System.Drawing.SystemColors.Window
+        Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.MyDatagridview1.Location = New System.Drawing.Point(4, 71)
+        Me.MyDatagridview1.Name = "MyDatagridview1"
+        Me.MyDatagridview1.Size = New System.Drawing.Size(471, 135)
+        Me.MyDatagridview1.TabIndex = 34
+        '
+        'cbxDateMautbericht
+        '
+        Me.cbxDateMautbericht._allowedValuesFreiText = Nothing
+        Me.cbxDateMautbericht._allowFreiText = False
+        Me.cbxDateMautbericht._value = ""
+        Me.cbxDateMautbericht.FormattingEnabled = True
+        Me.cbxDateMautbericht.Location = New System.Drawing.Point(265, 12)
+        Me.cbxDateMautbericht.Name = "cbxDateMautbericht"
+        Me.cbxDateMautbericht.Size = New System.Drawing.Size(87, 21)
+        Me.cbxDateMautbericht.TabIndex = 32
+        '
+        'cbxMautbericht
+        '
+        Me.cbxMautbericht._allowedValuesFreiText = Nothing
+        Me.cbxMautbericht._allowFreiText = False
+        Me.cbxMautbericht._value = ""
+        Me.cbxMautbericht.DropDownWidth = 200
+        Me.cbxMautbericht.FormattingEnabled = True
+        Me.cbxMautbericht.Location = New System.Drawing.Point(265, 33)
+        Me.cbxMautbericht.Name = "cbxMautbericht"
+        Me.cbxMautbericht.Size = New System.Drawing.Size(152, 21)
+        Me.cbxMautbericht.TabIndex = 30
+        '
+        'KdSearchBox3
+        '
+        Me.KdSearchBox3._AlleFirmenCLUSTER = False
+        Me.KdSearchBox3._AllowSetValue = True
+        Me.KdSearchBox3._autoSizeGross = False
+        Me.KdSearchBox3._display_Name1 = False
+        Me.KdSearchBox3._displayAVISO_Email = False
+        Me.KdSearchBox3._displayFullName = False
+        Me.KdSearchBox3._displayWoelflKd = False
+        Me.KdSearchBox3._hideIfListEmpty = True
+        Me.KdSearchBox3._loadKdData = False
+        Me.KdSearchBox3._searchName1 = True
+        Me.KdSearchBox3._UseFIRMA = ""
+        Me.KdSearchBox3._ValueKdAndName = True
+        Me.KdSearchBox3.dgvpos = "LEFT"
+        Me.KdSearchBox3.KdName = ""
+        Me.KdSearchBox3.KdNr = "-1"
+        Me.KdSearchBox3.kdNrField = Nothing
+        Me.KdSearchBox3.KdNrNullInt = Nothing
+        Me.KdSearchBox3.Location = New System.Drawing.Point(87, 308)
+        Me.KdSearchBox3.Name = "KdSearchBox3"
+        Me.KdSearchBox3.nurAktive = True
+        Me.KdSearchBox3.searchActive = True
+        Me.KdSearchBox3.Size = New System.Drawing.Size(350, 20)
+        Me.KdSearchBox3.TabIndex = 41
+        Me.KdSearchBox3.TIMER_SEARCH = True
+        Me.KdSearchBox3.usrcntl = Nothing
+        '
+        'cboSachbearbeiter
+        '
+        Me.cboSachbearbeiter._allowedValuesFreiText = Nothing
+        Me.cboSachbearbeiter._allowFreiText = False
+        Me.cboSachbearbeiter._value = ""
+        Me.cboSachbearbeiter.FormattingEnabled = True
+        Me.cboSachbearbeiter.Location = New System.Drawing.Point(529, 38)
+        Me.cboSachbearbeiter.Name = "cboSachbearbeiter"
+        Me.cboSachbearbeiter.Size = New System.Drawing.Size(152, 21)
+        Me.cboSachbearbeiter.TabIndex = 29
+        '
         'usrcntlFakturierung
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -812,7 +812,6 @@ Partial Class usrcntlFakturierung
         Me.GroupBox1.ResumeLayout(False)
         Me.GBMautberichte.ResumeLayout(False)
         Me.GBMautberichte.PerformLayout()
-        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.GBSammelrechnung.ResumeLayout(False)
         Me.GBSammelrechnung.PerformLayout()
         CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit()
@@ -823,6 +822,7 @@ Partial Class usrcntlFakturierung
         CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 

SDL/seriendruck/usrCntlFakturierung.vb

@@ -1,4 +1,6 @@
-Imports System.IO
+Imports System.Globalization
+Imports System.IO
+Imports System.Web.UI.WebControls.Expressions
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class usrcntlFakturierung
@@ -709,9 +711,9 @@ Public Class usrcntlFakturierung
 
                                                         If sumCurrenRow > 0 Then
 
-                                                            preis = Math.Round(sumCurrenRow * rowBS("Bankspesen %") + 0.5, 2)
+                                                            preis = CInt(Math.Round(sumCurrenRow * rowBS("Bankspesen %") + 0.5, MidpointRounding.AwayFromZero))
                                                         Else
-                                                            preis = Math.Round(0 - sumCurrenRow * rowBS("Bankspesen %") + 0.5, 2)
+                                                            preis = CInt(Math.Round(0 - sumCurrenRow * rowBS("Bankspesen %") + 0.5, MidpointRounding.AwayFromZero))
 
                                                         End If
                                                     Else
@@ -806,7 +808,7 @@ Public Class usrcntlFakturierung
 
                             End If
 
-                            End If
+                        End If
 
 
                     ElseIf f.Contains("_Maut.pdf") Then
@@ -822,7 +824,7 @@ Public Class usrcntlFakturierung
                                 End If
 
                             End If
-                            End If
+                        End If
                     End If
                 Next
 
@@ -1012,10 +1014,10 @@ Public Class usrcntlFakturierung
                         If Not isEU Then
 
                             If rowRE("keinMWSTKunde") Then
-                                'kein MWST Kunde -> OROGINAL-RE
+                                'kein MWST Kunde -> ORIGINAL-RE Ausdruck
                                 cFakturierung.doSAMMELRechnungsDruck_Abschnitt(rowRE("RechnungsNr"), rowRE("Firma_ID"), rowRE("Buchungsjahr"), rowRE("DruckDatumZeit"), "", True, True, 7, path,, , , , , , ,,, cbxMautanh.Checked, False)
                             Else
-                                'MWST Kunde -> wenn ohne MWST-BEtrag ->Original sonst Kopie!
+                                'MWST Kunde -> wenn kein MWST-Betrag ->Original sonst Kopie Ausdruck!
                                 cFakturierung.doSAMMELRechnungsDruck_Abschnitt(rowRE("RechnungsNr"), rowRE("Firma_ID"), rowRE("Buchungsjahr"), rowRE("DruckDatumZeit"), "", True, True, 7, path,, , , , , , ,,, cbxMautanh.Checked, rowRE("Steuer") <> 0)
 
                             End If
@@ -1025,10 +1027,10 @@ Public Class usrcntlFakturierung
                     Else
 
                         If rowRE("keinMWSTKunde") Then
-                            'kein MWST Kunde -> ORIGINAL-RE
+                            'kein MWST Kunde -> ORIGINAL-RE Ausdruck
                             cFakturierung.doSAMMELRechnungsDruck_Abschnitt(rowRE("RechnungsNr"), rowRE("Firma_ID"), rowRE("Buchungsjahr"), rowRE("DruckDatumZeit"), "", True, True, 7, path,, , , , , , ,,, cbxMautanh.Checked, False)
                         Else
-                            'MWST Kunde -> wenn ohne MWST-BEtrag ->Original sonst Kopie!
+                            'MWST Kunde -> wenn kein MWST-Betrag ->Original sonst Kopie Ausdruck!
                             cFakturierung.doSAMMELRechnungsDruck_Abschnitt(rowRE("RechnungsNr"), rowRE("Firma_ID"), rowRE("Buchungsjahr"), rowRE("DruckDatumZeit"), "", True, True, 7, path,, , , , , , ,,, cbxMautanh.Checked, rowRE("Steuer") <> 0)
 
                         End If
@@ -1051,9 +1053,9 @@ Public Class usrcntlFakturierung
 
                 Next
 
-                    If listPDFs.Count > 0 Then
+                If listPDFs.Count > 0 Then
 
-                        Dim pathPDF = listPDFs(0).ToString
+                    Dim pathPDF = listPDFs(0).ToString
 
                     If listPDFs.Count > 1 Then
                         Dim pathPDFMerge = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("MDM_Sammelrechnung.pdf", ".pdf", False, False)
@@ -1072,19 +1074,19 @@ Public Class usrcntlFakturierung
 
                     End If
 
-                        pbPloseAnh_Proz.Value = 100
+                    pbPloseAnh_Proz.Value = 100
-                        txtPloseAnh_Einarbeitung.Text = dtSelectedSammelrechnungen.Rows.Count & " / " & dtSelectedSammelrechnungen.Rows.Count
+                    txtPloseAnh_Einarbeitung.Text = dtSelectedSammelrechnungen.Rows.Count & " / " & dtSelectedSammelrechnungen.Rows.Count
-                        lblPloseAnh_Proz.Text = "100.00 %"
+                    lblPloseAnh_Proz.Text = "100.00 %"
 
 
 
                 Else
-                        MsgBox("Datei von " & rechnungsdatum.ToShortDateString & " konnte nicht erstellt werden!")
+                    MsgBox("Datei von " & rechnungsdatum.ToShortDateString & " konnte nicht erstellt werden!")
-
-                    End If
 
                 End If
 
+            End If
+
 
             If cbxRechnungsjournaldrucken.Checked Then
                 REJournalExcel(Sachbearbeiter, rechnungsdatum, -1)
@@ -1511,15 +1513,59 @@ Public Class usrcntlFakturierung
     End Function
 
     Private Sub cbxDateMautbericht_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxDateMautbericht.SelectedValueChanged
-        With MyDatagridview1
 
 
-            .Columns.Clear()
+        Dim dtSummen As DataTable = (New SQL).loadDgvBySql("SELECT [Datenquelle] as Lieferant,sum([Net Amount]) as Netto,sum([VAT Amount]) as VAT,sum([Total Amount]) as Brutto
-            .SET_SQL("SELECT [Datenquelle] as Lieferant,sum([Net Amount]) as Netto,sum([VAT Amount]) as VAT,sum([Total Amount]) as Brutto
                                                             FROM [VERAG].[dbo].[tblMautbericht] 
                                                               where   cast([Billingdate] as date) = '" & cbxDateMautbericht._value & "'
                                                               group by [Datenquelle]", "FMZOLL")
-            .LOAD()
+
+        Dim sumNetto As Double = 0
+            Dim sumVAT As Double = 0
+            Dim sumBrutto As Double = 0
+
+            For Each row As DataRow In dtSummen.Rows
+            If Not IsDBNull(row("Netto")) AndAlso IsNumeric(row("Netto")) Then sumNetto += CDbl(row("Netto"))
+            If Not IsDBNull(row("VAT")) AndAlso IsNumeric(row("VAT")) Then sumVAT += CDbl(row("VAT"))
+            If Not IsDBNull(row("Brutto")) AndAlso IsNumeric(row("Brutto")) Then sumBrutto += CDbl(row("Brutto"))
+        Next
+
+            Dim drLast = dtSummen.NewRow
+
+            If dtSummen.Columns.Contains("Lieferant") Then drLast.Item("Lieferant") = "SUMME"
+            If dtSummen.Columns.Contains("Netto") Then drLast.Item("Netto") = sumNetto
+            If dtSummen.Columns.Contains("VAT") Then drLast.Item("VAT") = sumVAT
+            If dtSummen.Columns.Contains("Brutto") Then drLast.Item("Brutto") = sumBrutto
+
+        dtSummen.Rows.InsertAt(drLast, dtSummen.Rows.Count)
+
+
+        With MyDatagridview1
+
+            .Columns.Clear()
+
+            .DataSource = dtSummen
+
+            If dtSummen.Columns.Contains("Netto") Then
+                .Columns(1).DefaultCellStyle.Format = "c2"
+                .Columns(1).DefaultCellStyle.FormatProvider = CultureInfo.GetCultureInfo("de-DE")
+                .Columns(1).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+            End If
+
+            If .Columns.Contains("VAT") Then
+                .Columns(2).DefaultCellStyle.Format = "c2"
+                .Columns(2).DefaultCellStyle.FormatProvider = CultureInfo.GetCultureInfo("de-DE")
+                .Columns(2).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+            End If
+
+            If .Columns.Contains("Brutto") Then
+                .Columns(3).DefaultCellStyle.Format = "c2"
+                .Columns(3).DefaultCellStyle.FormatProvider = CultureInfo.GetCultureInfo("de-DE")
+                .Columns(3).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
+            End If
+
+            .AllowUserToAddRows = False
+            .Columns("Lieferant").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
 
 
         End With

VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb

@@ -293,7 +293,7 @@ Public Class cUStVPositionen
     Property UStVPo_ReNr As Object = Nothing '                 NVARCHAR(20)  NULL,
     Property UStVPo_USteuerbetrag As Object = Nothing '        MONEY          Not NULL,
     Property UStVPo_Leistungsbezeichnung As Object = Nothing ' NVARCHAR(255) NULL,
-    Property UStVPo_Leistender As Object = Nothing '           NVARCHAR(65)  NULL,
+    Property UStVPo_Leistender As String = "" ''NVARCHAR(65)  NULL,
     Property UStVPo_Schnittstelle As Object = Nothing '        BIT            Default ((0)) Not NULL,
     Property UStVPo_SchnittstellenNr As Object = Nothing '     SMALLINT       Default ((0)) Not NULL,
     Property UStVPo_Umrechnungskurs As Object = Nothing '      FLOAT(53)     NULL,
@@ -301,7 +301,8 @@ Public Class cUStVPositionen
     Property UStVPo_Sachbearbeiter As Object = Nothing '       NVARCHAR(15)  NULL,
     Property UStVPo_Zeitstempel As Object = Nothing '          DATETIME       Default (getdate()) NULL,
     Property UStVPo_daId As Object = Nothing
-    Property UStVPo_daId_loeschbar As Object = Nothing
+    Property UStVPo_daId_loeschbar As Boolean = True
+    Property UStVPo_LeistenderId As Integer ' 
 
     Dim SQL As New SQL
 
@@ -401,6 +402,7 @@ Public Class cUStVPositionen
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVPo_Zeitstempel", UStVPo_Zeitstempel))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVPo_daId", UStVPo_daId))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVPo_daId_loeschbar", UStVPo_daId_loeschbar))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVPo_LeistenderId", UStVPo_LeistenderId))
         Return list
     End Function
 

VERAG_PROG_ALLGEMEIN/Classes/USTV/cUStVLeistender.vb

@@ -11,17 +11,28 @@ Public Class cUStVLeistender
     Property UstV_Leistender_Land As Object = Nothing
     Property UstV_Leistender_UstNr As Object = Nothing
     Property UstV_Leistender_Adresse As Boolean
+    Property UStV_LeistenderId As Integer
 
 
     Public hasEntry = False
 
         Dim SQL As New SQL
 
-    Sub New(UStV_Leistender)
+    Sub New(UStV_Leistender As String)
         Me.UStV_Leistender = UStV_Leistender
         LOAD()
     End Sub
 
+    Sub New(Id As Integer)
+        Me.UStV_LeistenderId = Id
+        LOADBYID()
+    End Sub
+
+    Sub New(UStV_Leistender As String, Land As String)
+        Me.UStV_Leistender = UStV_Leistender
+        LOADByLand(Land)
+    End Sub
+
 
     Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
         Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
@@ -33,6 +44,7 @@ Public Class cUStVLeistender
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstV_Leistender_Land", UstV_Leistender_Land))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstV_Leistender_UstNr", UstV_Leistender_UstNr))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstV_Leistender_Adresse", UstV_Leistender_Adresse))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStV_LeistenderId", UStV_LeistenderId,, True))
         Return list
         End Function
 
@@ -60,9 +72,9 @@ Public Class cUStVLeistender
     End Function
 
     Public Sub LOAD()
-            Try
+        Try
-                hasEntry = False
+            hasEntry = False
-                Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
                 Using cmd As New SqlCommand("SELECT * FROM tblUStVLeistender WHERE UStV_Leistender=@UStV_Leistender  ", conn)
                     cmd.Parameters.AddWithValue("@UStV_Leistender", UStV_Leistender)
                     Dim dr = cmd.ExecuteReader()
@@ -82,14 +94,73 @@ Public Class cUStVLeistender
                     dr.Close()
                 End Using
             End Using
-            Catch ex As Exception
+        Catch ex As Exception
-                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
-            End Try
+        End Try
-        End Sub
+    End Sub
 
 
 
-        Public Function getUpdateCmd() As String
+    Public Sub LOADBYID()
+        Try
+            hasEntry = False
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+                Using cmd As New SqlCommand("SELECT * FROM tblUStVLeistender WHERE UStV_LeistenderId=@UStV_LeistenderId  ", conn)
+                    cmd.Parameters.AddWithValue("@UStV_LeistenderId", UStV_LeistenderId)
+                    Dim dr = cmd.ExecuteReader()
+                    If dr.Read Then
+                        For Each li In getParameterList()
+                            Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
+
+                            If dr.Item(li.Text) Is DBNull.Value Then
+                                propInfo.SetValue(Me, Nothing)
+                            Else
+                                propInfo.SetValue(Me, dr.Item(li.Text))
+                            End If
+
+                        Next
+                        hasEntry = True
+                    End If
+                    dr.Close()
+                End Using
+            End Using
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+    End Sub
+
+    Public Sub LOADByLand(Land As String)
+        Try
+            hasEntry = False
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+                Using cmd As New SqlCommand("SELECT * FROM tblUStVLeistender WHERE UStV_Leistender=@UStV_Leistender and left(UstV_Leistender_UstNr, 2) =  '" & Land & "'", conn)
+                    cmd.Parameters.AddWithValue("@UStV_Leistender", UStV_Leistender)
+
+                    Dim dr = cmd.ExecuteReader()
+                    If dr.Read Then
+                        For Each li In getParameterList()
+                            Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
+
+                            If dr.Item(li.Text) Is DBNull.Value Then
+                                propInfo.SetValue(Me, Nothing)
+                            Else
+                                propInfo.SetValue(Me, dr.Item(li.Text))
+                            End If
+
+                        Next
+                        hasEntry = True
+                    End If
+                    dr.Close()
+                End Using
+            End Using
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+    End Sub
+
+
+
+    Public Function getUpdateCmd() As String
             Try
                 Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
 

VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb

@@ -247,36 +247,45 @@ Public Class cIDS
 
 
             Else
+                Try
 
-                Dim ymd = isleernothing((currentRow(0)))
-                Dim cc = isleernothing((currentRow(1)))
-                Dim pyn = isleernothing((currentRow(2)))
-                Dim occ = isleernothing((currentRow(5)))
-                Dim oc = isleernothing((currentRow(6)))
-                Dim ptc = isleernothing((currentRow(7)))
 
-                Dim ids As New cIDS(ymd, pyn, cc, occ, oc, ptc)
+                    Dim ymd = isleernothing((currentRow(0)))
+                    Dim cc = isleernothing((currentRow(1)))
+                    Dim pyn = isleernothing((currentRow(2)))
+                    Dim occ = isleernothing((currentRow(5)))
+                    Dim oc = isleernothing((currentRow(6)))
+                    Dim ptc = isleernothing((currentRow(7)))
+                    Dim ids As New cIDS(ymd, pyn, cc, occ, oc, ptc)
 
-                With ids
+                    Dim avprive = isleernothing((currentRow(12)))
-                    .YearMonthDay = isleernothing((currentRow(0)))
+
-                    .CustomerCode = isleernothing((currentRow(1)))
+                    With ids
-                    .Paymentsummarynumber = isleernothing((currentRow(2)))
+                        .YearMonthDay = isleernothing((currentRow(0)))
-                    .CustomerName = isleernothing((currentRow(3)))
+                        .CustomerCode = isleernothing((currentRow(1)))
-                    .OutletCountry = isleernothing((currentRow(4)))
+                        .Paymentsummarynumber = isleernothing((currentRow(2)))
-                    .OutletCountryCode = isleernothing((currentRow(5)))
+                        .CustomerName = isleernothing((currentRow(3)))
-                    .OutletCode = isleernothing((currentRow(6)))
+                        .OutletCountry = isleernothing((currentRow(4)))
-                    .ProductTypeCode = isleernothing((currentRow(7)))
+                        .OutletCountryCode = isleernothing((currentRow(5)))
-                    .TransactionVolume = isleernothing((currentRow(8)))
+                        .OutletCode = isleernothing((currentRow(6)))
-                    .AmminclVAT = isleernothing((currentRow(9)))
+                        .ProductTypeCode = isleernothing((currentRow(7)))
-                    .TotalNetAmount = isleernothing((currentRow(10)))
+                        .TransactionVolume = isleernothing((currentRow(8)))
-                    .VATAmount = isleernothing((currentRow(11)))
+                        .AmminclVAT = isleernothing((currentRow(9)))
-                    .avpriceexclVAT = isleernothing((currentRow(12)))
+                        .TotalNetAmount = isleernothing((currentRow(10)))
-                    .VRNumber = isleernothing((currentRow(13)))
+                        .VATAmount = isleernothing((currentRow(11)))
-                    .OBONumber = isleernothing((currentRow(14)))
+                        .avpriceexclVAT = IIf(avprive <> "" AndAlso IsNumeric(avprive), avprive, 0)
+                        .VRNumber = isleernothing((currentRow(13)))
+                        .OBONumber = isleernothing((currentRow(14)))
+
+                        Console.WriteLine("IDS: " & isleernothing((currentRow(1))) & " - " & lngRecordCount & " - " & isleernothing((currentRow(10))))
+                        .SAVE()
+
+                    End With
+
+                Catch ex As Exception
+                    VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+                End Try
 
-                    Console.WriteLine("IDS: " & isleernothing((currentRow(1))) & " - " & lngRecordCount & " - " & isleernothing((currentRow(10))))
-                    .SAVE()
-                End With
             End If
 
         Loop

VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb

@@ -193,7 +193,7 @@ Public Class cTrdInvoice
 
             Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
 
-                Using cmd As New SqlCommand(" SELECT tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer, tblTrdinInvoice.SteuerbetragLokal, tblTrdinInvoice.UStVAn_ID
+                Using cmd As New SqlCommand(" SELECT tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer, tblTrdinInvoice.SteuerbetragLokal, tblTrdinInvoice.UStVAn_ID, tblTrdinInvoice.FilialenNr
                                               FROM tblTrdinInvoice
                                               WHERE tblTrdinInvoice.Rechnungsdatum Between @von And @bis AND tblTrdinInvoice.SteuerbetragLokal<>0 AND tblTrdinInvoice.RechnungsKundenNr=@AdressenNr AND tblTrdinInvoice.WährungLokal='EUR'" & IIf(Archiv, " ", " AND isnull(tblTrdinInvoice.UStVAn_ID,0) = 0 ") & "
                                               ORDER BY tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer", conn)

VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb

@@ -155,7 +155,7 @@ Public Class cUIDPruefung
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
             Case "AMBAR" : where = " And Filialen.FilialenNr  IN (5701)"
             Case "IMEX" : where = " And Filialen.FilialenNr  IN (5501)"
-            Case "ATILLA" : where = " And Filialen.FilialenNr IN (4801 )"
+            Case "ATILLA" : where = " And Filialen.FilialenNr IN (4801)"
             Case "UNISPED" : where = " AND Filialen.firma='UNISPED' "
             Case Else : where = " AND Filialen.firma='VERAG' " '" And isnull(FilialenNr,'')  Not IN (5501,5701)"
         End Select