fakt Abrechnung, ustva, etc.

SDL/Fakturierung/cFakturierung.vb

@@ -1580,15 +1580,7 @@ Public Class cFakturierung
                                                               Dim MonthStart As String = IIf(CDate(MWSTAntrag.UStVAn_ReDatVon).Month < 10, "0", "") & CDate(MWSTAntrag.UStVAn_ReDatVon).Month
                                                               Dim MonthEnd As String = IIf(CDate(MWSTAntrag.UStVAn_ReDatBis).Month < 10, "0", "") & CDate(MWSTAntrag.UStVAn_ReDatBis).Month
 
-                                                              If rpt.txtLeistung.Text.Contains("-00") Then
+                                                              If rpt.txtLeistung.Text.Contains("00-00/23") Then
-                                                                  rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("-00", MonthStart & "-" & MonthEnd)
-                                                              ElseIf rpt.txtLeistung.Text.Contains("00-") Then
-                                                                  rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("00-", MonthStart & "-" & MonthEnd)
-                                                              ElseIf rpt.txtLeistung.Text.Contains("00") Then
-                                                                  rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("00", MonthStart & "-" & MonthEnd)
-                                                              End If
-
-                                                              If rpt.txtLeistung.Text.Contains("00/23") Then
                                                                   rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("00/23", "/" & CDate(MWSTAntrag.UStVAn_ReDatBis).Year.ToString.Substring(2))
                                                               ElseIf rpt.txtLeistung.Text.Contains("DL/23") Then
                                                                   rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("DL/23", "/" & CDate(MWSTAntrag.UStVAn_ReDatBis).Year.ToString.Substring(2))
@@ -1596,6 +1588,13 @@ Public Class cFakturierung
                                                                   rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("/23", "/" & CDate(MWSTAntrag.UStVAn_ReDatBis).Year.ToString.Substring(2))
                                                               End If
 
+                                                              If rpt.txtLeistung.Text.Contains("-00") Then
+                                                                  rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("-00", MonthStart & "-" & MonthEnd)
+                                                              ElseIf rpt.txtLeistung.Text.Contains("00-") Then
+                                                                  rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("00-", MonthStart & "-" & MonthEnd)
+                                                              ElseIf rpt.txtLeistung.Text.Contains("00") Then
+                                                                  rpt.txtLeistung.Text = rpt.txtLeistung.Text.Replace("00", MonthStart & "-" & MonthEnd)
+                                                              End If
 
                                                           End If
 
@@ -1704,6 +1703,16 @@ Public Class cFakturierung
                                                          End If
                                                      End If
 
+                                                     If RECHNUNG.Firma_ID = 19 Then
+
+                                                         rpt.lblSteuersatz.Visible = False
+                                                         rpt.lblSteuerbetrag.Visible = False
+                                                         rpt.lblSteuerpflichtigGes.Visible = False
+                                                         rpt.lblSteuerfreiGes.Visible = False
+                                                         rpt.lblZwText.Visible = False
+                                                         rpt.lblZWSumme.Visible = False
+                                                     End If
+
 
                                                  End Sub
 

SDL/Fakturierung/usrCntlFaktAbrechnung.vb

@@ -1793,7 +1793,7 @@ Public Class usrCntlFaktAbrechnung
 
                         'soll immer alle POS bekommen! laut Lidya! 28.04.2025 - aber nicht im Excel-Format sondern als PDF-Batinic 15.05.2025
                         Dim dtPOSList As New DataTable
-                        Dim prt As String = func.generatePosList(USTV, "", "", "", False, "prt", dtPOSList, isVZ)
+                        Dim prt As String = func.generatePosList(USTV, "", "", "", False, "prt", dtPOSList, isVZ, IIf(RECHNUNG IsNot Nothing, RECHNUNG.RK_ID, -1))
                         If prt <> "" Then
 
                             Try
@@ -1843,6 +1843,15 @@ Public Class usrCntlFaktAbrechnung
 
                                     Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "POS_LISTE", "", "", SPEDBUCH.AbfertigungsNr & ".pdf", USTV.UStVAn_KuNr, False)
                                     DS.uploadDataToDATENSERVER(tmpPath,,, False,,, True)
+
+                                    If .Rows.Count > 0 Then
+
+                                        For Each r As DataGridViewRow In .Rows
+                                            If r.Cells("Art").Value = "POS-LIST" Then .Rows.Remove(r)
+                                        Next
+
+                                    End If
+
                                     .Rows.Add(-1, "POS-LIST", DS.da_name, DS.da_id, -1)
                                 End If
                             Catch ex As Exception

SDL/USTV/frmMDM_USTVAntrag.Designer.vb

@@ -132,12 +132,12 @@ Partial Class frmMDM_USTVAntrag
         Me.VorauszahlungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.DeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
-        Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
         Me.ncs_Belege = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
+        Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
         Me.pnlBottom.SuspendLayout()
         CType(Me.pb_Beleg, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.picExcel, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -1706,13 +1706,13 @@ Partial Class frmMDM_USTVAntrag
         '
         Me.cns_vorauszahlen.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VorauszahlungToolStripMenuItem})
         Me.cns_vorauszahlen.Name = "cns_vorauszahlen"
-        Me.cns_vorauszahlen.Size = New System.Drawing.Size(152, 26)
+        Me.cns_vorauszahlen.Size = New System.Drawing.Size(181, 48)
         '
         'VorauszahlungToolStripMenuItem
         '
         Me.VorauszahlungToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AktivierenToolStripMenuItem, Me.DeaktivierenToolStripMenuItem})
         Me.VorauszahlungToolStripMenuItem.Name = "VorauszahlungToolStripMenuItem"
-        Me.VorauszahlungToolStripMenuItem.Size = New System.Drawing.Size(151, 22)
+        Me.VorauszahlungToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.VorauszahlungToolStripMenuItem.Text = "Vorauszahlung"
         '
         'AktivierenToolStripMenuItem
@@ -1727,22 +1727,6 @@ Partial Class frmMDM_USTVAntrag
         Me.DeaktivierenToolStripMenuItem.Size = New System.Drawing.Size(138, 22)
         Me.DeaktivierenToolStripMenuItem.Text = "deaktivieren"
         '
-        'UstCntlUSTV_AntragPosition1
-        '
-        Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0)
-        Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
-        Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261)
-        Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
-        '
-        'UstCntlUSTV_AntragErstattungen1
-        '
-        Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0)
-        Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1"
-        Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259)
-        Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
-        '
         'ncs_Belege
         '
         Me.ncs_Belege.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1})
@@ -1768,6 +1752,22 @@ Partial Class frmMDM_USTVAntrag
         Me.ToolStripMenuItem3.Size = New System.Drawing.Size(138, 22)
         Me.ToolStripMenuItem3.Text = "deaktivieren"
         '
+        'UstCntlUSTV_AntragPosition1
+        '
+        Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0)
+        Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
+        Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261)
+        Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
+        '
+        'UstCntlUSTV_AntragErstattungen1
+        '
+        Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0)
+        Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1"
+        Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259)
+        Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
+        '
         'frmMDM_USTVAntrag
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

SDL/USTV/frmMDM_USTVAntrag.resx

@@ -234,7 +234,7 @@
         XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
         fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
         tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAAB4JJREFUSEu9lntM1FcW
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAB4JJREFUSEu9lntM1FcW
         x0+yNWpdBURGEJ0ZXtVqZX0hFJAB5gVILVbQTRCQ1wwDw7wYGMSCgiI+IoivtbpBwOLqqnUXq30YlVrX
         bXAFu6Ua2ShG0jVoq1ZFwQffzb3zhG22/+0vOZnf3Nz8Pjn3nPs9X1qx10yqpnWU27iOEuo0pG6qpMKP
         qyljXxkpt6hozdF6qvxkN2XuW0OymiwqO1I33tBUPTNhsypTUpVuydhTOi5jTynNL08mQUEkiQwyEhql
@@ -394,7 +394,7 @@
         XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
         fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
         tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAABM1JREFUOE9dU3tM01cU
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAABM1JREFUOE9dU3tM01cU
         PjDIeGjymyTMQDFz6MwGIWJJKNBNrXGG+MfiNDPGqIMCnfjPGNMUjQlla9PiLEJnE17hJSDWKoKKrQUH
         OFcYNjhfCKaIggg+ECwtLbTf8vsB9fElX+65557z5Zx77qUgHx8KpnkEEFHqhg2xlwcHW5q6uuoazeba
         Zoultun69drLFkut4fbt2qu9vef1zc0qWW4uc/LkSdJoNFRWVkZbt24lgUBAlBMente5du2dc19+9Zcu

SDL/USTV/frmMDM_USTVAntrag.vb

@@ -4,6 +4,7 @@ Imports System.Windows.Documents
 Imports DocumentFormat.OpenXml.Drawing.Diagrams
 Imports itextsharp.text.pdf
 Imports Microsoft.Office.Interop
+Imports sun.swing
 Imports VERAG_PROG_ALLGEMEIN
 Imports VERAG_PROG_ALLGEMEIN.TESTJSON
 
@@ -2023,6 +2024,12 @@ Public Class frmMDM_USTVAntrag
             cns_neAntraege.Items.Add(oa)
         End If
 
+        If Not cns_neAntraege.Items.ContainsKey("zuwenig") Then
+            Dim oa = New ToolStripMenuItem() With {.Text = "zu wenig Email", .Name = "zuwenig", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+            AddHandler oa.Click, AddressOf mnuItem_Clicked
+            cns_neAntraege.Items.Add(oa)
+        End If
+
         cns_neAntraege.Show(Cursor.Position)
 
 
@@ -2039,6 +2046,9 @@ Public Class frmMDM_USTVAntrag
             ElseIf item.Name = "mail" Then
                 mailmitExcelauswertung()
 
+            ElseIf item.Name = "zuwenig" Then
+                zuwenigMail()
+
             ElseIf item.Name = "offeneAntraege" Then
 
                 Dim USTV_ANTRAG As New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(UStVAn_ID)
@@ -2224,8 +2234,98 @@ Public Class frmMDM_USTVAntrag
 
     End Sub
 
-    Private Sub dgvUSTVPositionen_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvUSTVPositionen.CellContentDoubleClick
 
+    Private Sub zuwenigMail()
+        Try
+
+
+            Dim spracheMail = ""
+            Dim listOfTextconserven = New cTextkonserve_LIST(6, "", 19)
+
+
+            Select Case USTV_ANTRAG.UStVAn_LandKz
+                Case "HR", "SRB" : spracheMail = "SRB"
+                Case "A", "AT", "D", "DE", "CH" : spracheMail = "DE"
+                Case "RO" : spracheMail = "RO"
+                Case Else
+                    spracheMail = "DE"
+            End Select
+
+
+            If listOfTextconserven.LIST.Any(Function(c) c.txt_sprache = spracheMail) Then
+                Dim r As cTextkonserve = listOfTextconserven.LIST.Find(Function(c) c.txt_sprache = spracheMail)
+                If r IsNot Nothing Then
+                    Dim Mail_Subject = ""
+                    Dim Mail_HTMLBody = ""
+
+                    Dim Mail_To = ""
+                    Dim Mail_CC = ""
+                    Dim Mail_BCC = ""
+
+                    Mail_Subject = r.txt_betreff
+                    Dim TextHTML = ""
+                    TextHTML &= r.txt_text
+
+                    'Mail_Subject = Mail_Subject.Replace("%BelegNr%", (USTV_ANTRAG.UStVAn_ReDatVon)
+                    '        Mail_Subject = Mail_Subject.Replace("%Belegdatum%", row.Item("Belegdatum"))
+                    '        Mail_Subject = Mail_Subject.Replace("%Name%", row.Item("Name"))
+                    '        Mail_Subject = Mail_Subject.Replace("%AbfertigungsNr%", row.Item("AbfertigungsNr"))
+                    '        Mail_Subject = Mail_Subject.Replace("%FilialenNr%", row.Item("FilialenNr"))
+                    '        Mail_Subject = Mail_Subject.Replace("%MWST%", row.Item("MWST"))
+                    '        Mail_Subject = Mail_Subject.Replace("%Betrag%", row.Item("Betrag"))
+
+                    '        TextHTML = TextHTML.Replace("%BelegNr%", row.Item("Belegnummer"))
+                    '        TextHTML = TextHTML.Replace("%Belegdatum%", row.Item("Belegdatum"))
+                    '        TextHTML = TextHTML.Replace("%Betrag%", row.Item("Betrag"))
+                    '        TextHTML = TextHTML.Replace("%Name%", row.Item("Name"))
+                    '        TextHTML = TextHTML.Replace("%AbfertigungsNr%", row.Item("AbfertigungsNr"))
+                    '        TextHTML = TextHTML.Replace("%MWST%", row.Item("MWST"))
+                    '        TextHTML = TextHTML.Replace("%FilialenNr%", row.Item("FilialenNr"))
+
+                    Mail_HTMLBody = "<div style=""font-family:Calibri, Arial"">" & TextHTML & "</div>"
+                    Mail_To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(USTV_ANTRAG.UStVAn_KuNr, "Rechnung an")
+                    Mail_CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(USTV_ANTRAG.UStVAn_KuNr, "Rechnung an")
+                    Mail_BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(USTV_ANTRAG.UStVAn_KuNr, "Rechnung an")
+                    Mail_HTMLBody &= "<br><br><br>" & cFakturierung.getSignature(USTV_ANTRAG.UStVAn_LandKz, 19)
+
+
+                    Dim outl As New Outlook.Application
+                    Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+                    Mail = outl.CreateItem(0)
+                    Mail.Subject = Mail_Subject
+                    Mail.HTMLBody = Mail_HTMLBody
+
+                    Mail.To = Mail_To
+                    Mail.CC = Mail_CC
+                    Mail.BCC = Mail_BCC
+
+                    For Each row As DataGridViewRow In dgvUSTVPositionen.SelectedRows.Cast(Of DataGridViewRow)().OrderBy(Function(dgvr) dgvr.Index)
+
+                        Dim pdf As String = ""
+                        pdf = func.getPDF(row.Cells("UStVPo_SchnittstellenNr").Value, row.Cells("UStVPo_ReNr").Value, row.Cells("UStVPo_ReDat").Value, row.Cells("UStVPo_daId").Value, -1, True, Antrag_LandKz, USTV_ANTRAG, New cFakturierung, False)
+
+                        If pdf <> "" Then
+                            Mail.Attachments.Add(pdf, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+                        End If
+
+                    Next
+
+
+
+                    Try
+                    Catch ex2 As Exception
+                        MsgBox(ex2.Message)
+                    End Try
+                    Mail.Display()
+
+                End If
+            End If
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!")
+        End Try
+    End Sub
+
+    Private Sub dgvUSTVPositionen_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvUSTVPositionen.CellContentDoubleClick
         Try
             If e.RowIndex >= 0 AndAlso e.ColumnIndex >= 0 Then
 

SDL/buchhaltung/frmBU_Mahnlauf.vb

@@ -45,7 +45,11 @@ Public Class frmBU_Mahnlauf
                       ORDER BY KTO.c_name"
 
             Dim sqlStringVerag360 = "SELECT i_personenkonto Konto,KTO.c_name, KTO.c_landid Land,Kunden.Abfertigungsverbot as AV,max(KTO.dec_aktuellersaldo) as Saldo,/*KTO.c_plz + ' ' + KTO.c_ort Ort,isnull(KTO.c_email,'') Email, */  " &
-                             "sum(eur_bruttobetrag+eur_zahlung) as Ausstand,cast(min (OWNFIELD_Belegdatum)as date) as 'ältesteRg',/*min(op.d_netto) Faelligkeit,*/max(si_mahnstufe) as MS,max(Kunden.UStV_Summe3470BetragEUR) as '3470',max(Kunden.Versicherungssumme) as V, max(KTO.dec_wert3) as Risiko,sum(case when OP.c_typ = 'g' then isnull(OP.eur_bruttobetrag, 0) + isnull(OP.eur_zahlung, 0) else 0 end) as Gutschrift, cast(MAX(d_mahnung)as date) Mahndatum,
+                             "sum(eur_bruttobetrag+eur_zahlung) as Ausstand,cast(min (OWNFIELD_Belegdatum)as date) as 'ältesteRg',/*min(op.d_netto) Faelligkeit,*/max(si_mahnstufe) as MS,max(Kunden.UStV_Summe3470BetragEUR) as '3470',max(Kunden.Versicherungssumme) as V, 
+                             
+                              max(KTO.dec_aktuellersaldo) - isnull(CASE WHEN Max(Kunden.UStV_SummeUmsatzsteuerbetragEUR) > max(Kunden.UStV_SummeErstattungsbetragEUR) THEN max(Kunden.UStV_SummeUmsatzsteuerbetragEUR) - max(Kunden.UStV_SummeErstattungsbetragEUR) ELSE 0 END ,0) - isnull(max(Kunden.UStV_Summe3470BetragEUR),0) + isnull(max(Kunden.UStV_SummeVZBetragEUR),0) - isnull(max(Kunden.UStV_SummeVorschaubetragEUR),0) - isnull(CASE WHEN ISNULL(max(Kunden.BankgarantieGültigBis), GETDATE()) < GETDATE() THEN 0 ELSE ISNULL(max(Kunden.BankgarantieBetrag), 0) END,0) as Risiko,
+                             
+                             sum(case when OP.c_typ = 'g' then isnull(OP.eur_bruttobetrag, 0) + isnull(OP.eur_zahlung, 0) else 0 end) as Gutschrift, cast(MAX(d_mahnung)as date) Mahndatum,
                             case 
                             when max(si_mahnstufe) = 1 Then 'telefonisch' 
                             when max(si_mahnstufe) = 2 Then 'Freitag'
@@ -79,12 +83,11 @@ Public Class frmBU_Mahnlauf
                                                       FROM [FIBU2].[dbo].[fibu_belegzeile] as BU
                                                       RIGHT join fibu_konto KTO on KTO.i_konto=BU.i_konto AND BU.i_firm_refid=KTO.i_firm_refid
                                                       where cast(d_beleg as date) = '" & txtZahlEingaenge._value & "' and BU.i_firm_refid=" & Firma_ID & SQLWhere & "
-                                                    
+                                                      and (BU.i_konto in (2800, 2801, 2802, 2803, 2811, 2812, 2813, 2814, 2817, 2818, 2822 ,2826, 2827, 2828, 2831, 2832, 2833, 2837, 2845) 
-                                                      and (BU.i_konto in (2800, 2801, 2802, 2803, 2811, 2812, 2813, 2814, 2817, 2818, 2822 ,2826, 2827, 2828, 2831, 2832, 2833, 2837, 2845) or i_gegenkonto in (2800, 2801, 2802, 2803, 2811, 2812, 2813, 2814, 2817, 2818, 2822 ,2826, 2827, 2828, 2831, 2832, 2833, 2837, 2845))
+                                                      or i_gegenkonto in (2800, 2801, 2802, 2803, 2811, 2812, 2813, 2814, 2817, 2818, 2822 ,2826, 2827, 2828, 2831, 2832, 2833, 2837, 2845))
                                                       order by Konto, i_beleg_refid, i_zeilen_refid"
 
 
-
             'MsgBox(sqlStr)
             Dim dt_OP As DataTable = SQL.loadDgvBySql(If(Firma_ID = 19, IIf(zahlungseingaenge, sqlStringVerag360Zahlungseingaenge, sqlStringVerag360), sqlStr), "FIBU")
 

SDL/frmdynMailvorlage.vb

@@ -58,6 +58,7 @@ Public Class frmdynMailvorlagen
         cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("OP-Liste", "3"))
         cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MDM-SR", "4"))
         cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Erstattungsschreiben", "5"))
+        cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Zu Wenig", "6"))
         cbxTyp.changeItem("")
 
 

SDL/mdm/usrCntlMDMAuswertungen.Designer.vb

@@ -120,6 +120,7 @@ Partial Class usrCntlMDMAuswertungen
         Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label36 = New System.Windows.Forms.Label()
         Me.TabPage3 = New System.Windows.Forms.TabPage()
+        Me.UsrCntlWoelfl_IM_CSVRg1 = New SDL.usrCntlWoelfl_IM_CSVRg()
         Me.tbIDS = New System.Windows.Forms.TabPage()
         Me.Label60 = New System.Windows.Forms.Label()
         Me.GroupBox18 = New System.Windows.Forms.GroupBox()
@@ -152,6 +153,7 @@ Partial Class usrCntlMDMAuswertungen
         Me.Label41 = New System.Windows.Forms.Label()
         Me.Button12 = New System.Windows.Forms.Button()
         Me.TabPage4 = New System.Windows.Forms.TabPage()
+        Me.UsrCntlMSE_KonvertCSV1 = New SDL.usrCntlMSE_KonvertCSV()
         Me.TabPage5 = New System.Windows.Forms.TabPage()
         Me.Label56 = New System.Windows.Forms.Label()
         Me.GroupBox17 = New System.Windows.Forms.GroupBox()
@@ -176,8 +178,10 @@ Partial Class usrCntlMDMAuswertungen
         Me.btnContractdaten = New System.Windows.Forms.Button()
         Me.Button15 = New System.Windows.Forms.Button()
         Me.pnl = New System.Windows.Forms.Panel()
-        Me.UsrCntlWoelfl_IM_CSVRg1 = New SDL.usrCntlWoelfl_IM_CSVRg()
+        Me.GroupBox13 = New System.Windows.Forms.GroupBox()
-        Me.UsrCntlMSE_KonvertCSV1 = New SDL.usrCntlMSE_KonvertCSV()
+        Me.Button14 = New System.Windows.Forms.Button()
+        Me.Label62 = New System.Windows.Forms.Label()
+        Me.Button18 = New System.Windows.Forms.Button()
         Me.GroupBox1.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -210,6 +214,7 @@ Partial Class usrCntlMDMAuswertungen
         Me.GroupBox15.SuspendLayout()
         Me.GroupBox14.SuspendLayout()
         Me.pnl.SuspendLayout()
+        Me.GroupBox13.SuspendLayout()
         Me.SuspendLayout()
         '
         'GroupBox1
@@ -1322,8 +1327,18 @@ Partial Class usrCntlMDMAuswertungen
         Me.TabPage3.Text = "WÖLFL"
         Me.TabPage3.UseVisualStyleBackColor = True
         '
+        'UsrCntlWoelfl_IM_CSVRg1
+        '
+        Me.UsrCntlWoelfl_IM_CSVRg1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(6, 167)
+        Me.UsrCntlWoelfl_IM_CSVRg1.Name = "UsrCntlWoelfl_IM_CSVRg1"
+        Me.UsrCntlWoelfl_IM_CSVRg1.Size = New System.Drawing.Size(728, 97)
+        Me.UsrCntlWoelfl_IM_CSVRg1.TabIndex = 10
+        '
         'tbIDS
         '
+        Me.tbIDS.Controls.Add(Me.Label62)
+        Me.tbIDS.Controls.Add(Me.GroupBox13)
         Me.tbIDS.Controls.Add(Me.Label60)
         Me.tbIDS.Controls.Add(Me.GroupBox18)
         Me.tbIDS.Controls.Add(Me.Label18)
@@ -1655,6 +1670,14 @@ Partial Class usrCntlMDMAuswertungen
         Me.TabPage4.Text = "MSE"
         Me.TabPage4.UseVisualStyleBackColor = True
         '
+        'UsrCntlMSE_KonvertCSV1
+        '
+        Me.UsrCntlMSE_KonvertCSV1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlMSE_KonvertCSV1.Location = New System.Drawing.Point(7, 7)
+        Me.UsrCntlMSE_KonvertCSV1.Name = "UsrCntlMSE_KonvertCSV1"
+        Me.UsrCntlMSE_KonvertCSV1.Size = New System.Drawing.Size(728, 97)
+        Me.UsrCntlMSE_KonvertCSV1.TabIndex = 0
+        '
         'TabPage5
         '
         Me.TabPage5.Controls.Add(Me.Label56)
@@ -1914,21 +1937,48 @@ Partial Class usrCntlMDMAuswertungen
         Me.pnl.Size = New System.Drawing.Size(1057, 54)
         Me.pnl.TabIndex = 26
         '
-        'UsrCntlWoelfl_IM_CSVRg1
+        'GroupBox13
         '
-        Me.UsrCntlWoelfl_IM_CSVRg1.BackColor = System.Drawing.Color.White
+        Me.GroupBox13.Controls.Add(Me.Button18)
-        Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(6, 167)
+        Me.GroupBox13.Controls.Add(Me.Button14)
-        Me.UsrCntlWoelfl_IM_CSVRg1.Name = "UsrCntlWoelfl_IM_CSVRg1"
+        Me.GroupBox13.Location = New System.Drawing.Point(322, 182)
-        Me.UsrCntlWoelfl_IM_CSVRg1.Size = New System.Drawing.Size(728, 97)
+        Me.GroupBox13.Name = "GroupBox13"
-        Me.UsrCntlWoelfl_IM_CSVRg1.TabIndex = 10
+        Me.GroupBox13.Size = New System.Drawing.Size(297, 134)
+        Me.GroupBox13.TabIndex = 25
+        Me.GroupBox13.TabStop = False
         '
-        'UsrCntlMSE_KonvertCSV1
+        'Button14
         '
-        Me.UsrCntlMSE_KonvertCSV1.BackColor = System.Drawing.Color.White
+        Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.UsrCntlMSE_KonvertCSV1.Location = New System.Drawing.Point(7, 7)
+        Me.Button14.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.UsrCntlMSE_KonvertCSV1.Name = "UsrCntlMSE_KonvertCSV1"
+        Me.Button14.Location = New System.Drawing.Point(6, 19)
-        Me.UsrCntlMSE_KonvertCSV1.Size = New System.Drawing.Size(728, 97)
+        Me.Button14.Name = "Button14"
-        Me.UsrCntlMSE_KonvertCSV1.TabIndex = 0
+        Me.Button14.Size = New System.Drawing.Size(121, 49)
+        Me.Button14.TabIndex = 4
+        Me.Button14.Text = "Kunden"
+        Me.Button14.UseVisualStyleBackColor = True
+        '
+        'Label62
+        '
+        Me.Label62.AutoSize = True
+        Me.Label62.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label62.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Me.Label62.Location = New System.Drawing.Point(325, 162)
+        Me.Label62.Name = "Label62"
+        Me.Label62.Size = New System.Drawing.Size(146, 17)
+        Me.Label62.TabIndex = 26
+        Me.Label62.Text = "IDS Preise/Rabatte"
+        '
+        'Button18
+        '
+        Me.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button18.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Button18.Location = New System.Drawing.Point(153, 19)
+        Me.Button18.Name = "Button18"
+        Me.Button18.Size = New System.Drawing.Size(121, 49)
+        Me.Button18.TabIndex = 5
+        Me.Button18.Text = "Preise"
+        Me.Button18.UseVisualStyleBackColor = True
         '
         'usrCntlMDMAuswertungen
         '
@@ -1995,6 +2045,7 @@ Partial Class usrCntlMDMAuswertungen
         Me.GroupBox14.PerformLayout()
         Me.pnl.ResumeLayout(False)
         Me.pnl.PerformLayout()
+        Me.GroupBox13.ResumeLayout(False)
         Me.ResumeLayout(False)
 
     End Sub
@@ -2153,4 +2204,8 @@ Partial Class usrCntlMDMAuswertungen
     Friend WithEvents TextBox2 As TextBox
     Friend WithEvents Label59 As Label
     Friend WithEvents Button17 As Button
+    Friend WithEvents Label62 As Label
+    Friend WithEvents GroupBox13 As GroupBox
+    Friend WithEvents Button18 As Button
+    Friend WithEvents Button14 As Button
 End Class

SDL/mdm/usrCntlMDMAuswertungen.resx

@@ -120,26 +120,26 @@
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="PictureBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAH1JREFUOE/V
-        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
+        0MEJgDAMQNHflXQmxxDcQt1CvAr1rq7hHIriKa1QQxQs/EtbHm0AMufcZhGQ8xoIjECVkJfQHXhcTlml
-        fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
+        hL4BLXoXfPDl2DrHIMEeKJR1AWiRfOEKLMrWGGg+Q38cKBsC0CL5wvba0FTHQPMZzkCjbApAi/4B7lqo
-        mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
+        BXidk8YAAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="PictureBox4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAH1JREFUOE/V
-        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
+        0MEJgDAMQNHflXQmxxDcQt1CvAr1rq7hHIriKa1QQxQs/EtbHm0AMufcZhGQ8xoIjECVkJfQHXhcTlml
-        fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
+        hL4BLXoXfPDl2DrHIMEeKJR1AWiRfOEKLMrWGGg+Q38cKBsC0CL5wvba0FTHQPMZzkCjbApAi/4B7lqo
-        mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
+        BXidk8YAAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="PictureBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAH1JREFUOE/V
-        kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
+        0MEJgDAMQNHflXQmxxDcQt1CvAr1rq7hHIriKa1QQxQs/EtbHm0AMufcZhGQ8xoIjECVkJfQHXhcTlml
-        fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
+        hL4BLXoXfPDl2DrHIMEeKJR1AWiRfOEKLMrWGGg+Q38cKBsC0CL5wvba0FTHQPMZzkCjbApAi/4B7lqo
-        mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
+        BXidk8YAAAAAAElFTkSuQmCC
 </value>
   </data>
 </root>

SDL/mdm/usrCntlMDMAuswertungen.vb

@@ -1409,7 +1409,9 @@ Public Class usrCntlMDMAuswertungen
         Me.Cursor = Cursors.Default
     End Sub
 
+    Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click
 
+    End Sub
 End Class
 
 

VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb

@@ -1032,7 +1032,7 @@ Public Class cMDMFunctionsAllgemein
 
     End Function
 
-    Shared Function generatePosList(USTV_ANTRAG As cUSTVAntrag, posId As String, Antrag_LandKz As String, SteuerNR As String, openFile As Boolean, type As String, ByRef dt As DataTable, Optional isVZ As Boolean = False) As String
+    Shared Function generatePosList(USTV_ANTRAG As cUSTVAntrag, posId As String, Antrag_LandKz As String, SteuerNR As String, openFile As Boolean, type As String, ByRef dt As DataTable, Optional isVZ As Boolean = False, Optional RK_ID As Integer = -1) As String
 
         Dim sql As New SQL
 
@@ -1040,7 +1040,7 @@ Public Class cMDMFunctionsAllgemein
         If posId <> "" Then
             sqlWHere = " And UStVPo_ID in(" & posId & ")"
         ElseIf isVZ Then
-            sqlWHere = " and UStVPo_VZ = 1 And UStVPo_VZ_RKID is null"
+            sqlWHere = " and UStVPo_VZ = 1 And (UStVPo_VZ_RKID is null" & IIf(RK_ID > 0, " or UStVPo_VZ_RKID = " & RK_ID & ")", ")")
         End If
 
         Dim StringSQL = "SELECT [UStVPo_ID] as Number ,[UStVPo_ReDat] as 'Date of Invoice',[UStVPo_ReNr] as 'Number of invoice' ,[UStVPo_Leistungsbezeichnung] as 'Name of service',[UStVPo_Leistender] as 'Name of supplier',leist.[UstV_Leistender_Strasse] + ' ' + leist.[UstV_Leistender_StrasseNr] as Street,