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

SDL/Classes/cRKSV.vb

@@ -2157,7 +2157,7 @@ Public Class cRKSV
         Return GJ.INCREASE_JOURNAL()
     End Function
 
-    Public Shared Function insertKB(PERSONAL As cPersonal, BELEG As EABeleg, RKSV_id As Integer, RKSV_Beleg_Id As Integer, RKSV_aktiv As Integer, ByRef JournalNr As Integer, Firma As String, POSFIBU As Integer, Optional Finanzwege As String = "Bar", Optional BelegSofortInFIBUverbuchten As Boolean = False)
+    Public Shared Function insertKB(PERSONAL As cPersonal, BELEG As EABeleg, RKSV_id As Integer, RKSV_Beleg_Id As Integer, RKSV_aktiv As Integer, ByRef JournalNr As Integer, Firma As String, POSFIBU As Integer, ByRef BelegNrFIBU As String, Optional Finanzwege As String = "Bar", Optional BelegSofortInFIBUverbuchten As Boolean = False)
         Try
             If BELEG.POS.Count = 0 Then
                 MsgBox("Keine Positionen gefunden")
@@ -2391,7 +2391,7 @@ Public Class cRKSV
                     '################
 
                     If BelegSofortInFIBUverbuchten AndAlso (BELEG.Beleg_TYP = "L" Or BELEG.Beleg_TYP = "K") Then
-                        CreateSyskaBuchung(RKSV_id, BELEG, KBEntry_List, KBEntryGB_List, KBEntryST_List, IIf(BELEG.Beleg_TYP = "L", "AUSZAHLUNG", "EINZAHLUNG"))
+                        CreateSyskaBuchung(RKSV_id, BELEG, KBEntry_List, KBEntryGB_List, KBEntryST_List, IIf(BELEG.Beleg_TYP = "L", "AUSZAHLUNG", "EINZAHLUNG"), BelegNrFIBU)
                     End If
 
                     BELEG.gebucht = True
@@ -2538,7 +2538,7 @@ Public Class cRKSV
     Public Shared Property DefaultMandant As Integer = IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, 9, 7)
     Public Shared Property DefaultKassenkonto As Integer = 2700
 
-    Public Shared Function CreateSyskaBuchung(RKSV_id As Integer, beleg As EABeleg, KBEntry_list As List(Of cKassenbuch), KBEntryGB_list As List(Of cKassenbuch), KBEntryST_list As List(Of cKassenbuch), typ As String) As Boolean
+    Public Shared Function CreateSyskaBuchung(RKSV_id As Integer, beleg As EABeleg, KBEntry_list As List(Of cKassenbuch), KBEntryGB_list As List(Of cKassenbuch), KBEntryST_list As List(Of cKassenbuch), typ As String, ByRef BelegUID As String) As Boolean
 
 
         If beleg Is Nothing Then Throw New ArgumentNullException(NameOf(beleg))
@@ -2597,17 +2597,18 @@ Public Class cRKSV
             Throw New InvalidOperationException("Kann keine Belegnummer erzeugen.")
         End If
 
-        ' update nummern table only if we will actually book (betrag<>0)
         If betrag <> 0 Then
             sql.doSQL("UPDATE [FIBU2].dbo.fibu_nummern SET i_nummer_refid = " & SafeIntToSql(i_beleg_refid) & " WHERE i_firm_refid = " & SafeIntToSql(mandant) & " AND c_nummernart LIKE 'Buchungsnummer'", "FIBU")
         End If
 
+        'eigene Ermittlung der Belegnummer erforderlich!!!!!
+
         Dim FIBU_YEAR = jahr
-        Dim BelegNrUID As String = "BR"
+        Dim BelegNrUID = "BR"
         'If periode = 1 Then FIBU_YEAR = FIBU_YEAR - 1
         BelegNrUID &= FIBU_YEAR.ToString.Substring(2, 2)
         BelegNrUID &= i_beleg_refid.ToString("D5")
-
+        BelegUID = BelegNrUID
 
         'insert perioden-salden!!
 

SDL/Fakturierung/cFakturierung.vb

@@ -494,7 +494,6 @@ Public Class cFakturierung
 
         ' Dim Nettozahlungsziel
 
-
         If RECHNUNG.RechnungsKundenNr > 0 Then
 
             Select Case RECHNUNG.[BelegartenNr]
@@ -514,8 +513,6 @@ Public Class cFakturierung
             Dim RECHNUNG_AD As New VERAG_PROG_ALLGEMEIN.cAdressen(RECHNUNG.RechnungsKundenNr)
             Dim RECHNUNG_KD As New VERAG_PROG_ALLGEMEIN.cKunde(RECHNUNG.RechnungsKundenNr)
 
-
-
             If getRTXT_SQL(strText, RECHNUNG, RECHNUNG_AD, RECHNUNG.Firma_ID, RECHNUNG.RechnungsLandKz, RECHNUNG.OffertenNr, True) Then
             ElseIf getRTXT_SQL(strText, RECHNUNG, RECHNUNG_AD, RECHNUNG.Firma_ID, RECHNUNG.RechnungsLandKz, , True) Then
             ElseIf getRTXT_SQL(strText, RECHNUNG, RECHNUNG_AD, RECHNUNG.Firma_ID, ,, True) Then
@@ -1349,6 +1346,7 @@ Public Class cFakturierung
             '    Return False
             'End If
 
+
             Dim sum = 0
             Select Case Rechnung.RechnungSprache
                 Case "EN"
@@ -1525,6 +1523,9 @@ Public Class cFakturierung
             rpt.txtKdAuftragsNr.Text = If(Rechnung.KdAuftragsNr, "")
             rpt.txtKdAuftragsNr_Ueberschrift.Visible = (rpt.txtKdAuftragsNr.Text <> String.Empty)
 
+            If Rechnung.FilialenNr = 4813 Then rpt.txtKdAuftragsNr_Ueberschrift.Text = "Beleg-Nr.:"
+
+
             rpt.TextBox1.Text = If(Rechnung.TextZZ, "").ToString.Replace("; ", vbNewLine).Trim
             rpt.txtVermerk.Text = (If(Rechnung.Text, "").ToString.Trim & vbNewLine & vbNewLine & If(Rechnung.Notiz, "").ToString.Trim).ToString.Trim
 

SDL/Fakturierung/rptRechnungDruck.Designer.vb

@@ -1500,13 +1500,14 @@ Partial Public Class rptRechnungDruck
         '
         'rptRechnungDruck
         '
+        Me.MasterReport = False
         Me.PageSettings.Margins.Bottom = 0.3937008!
         Me.PageSettings.Margins.Left = 0.3937008!
         Me.PageSettings.Margins.Right = 0.3937008!
         Me.PageSettings.Margins.Top = 0.3937008!
         Me.PageSettings.PaperHeight = 11.0!
         Me.PageSettings.PaperWidth = 8.5!
-        Me.PrintWidth = 7.480316!
+        Me.PrintWidth = 7.48071!
         Me.Sections.Add(Me.ReportHeader1)
         Me.Sections.Add(Me.PageHeader)
         Me.Sections.Add(Me.GroupHeader4)
@@ -1514,12 +1515,6 @@ Partial Public Class rptRechnungDruck
         Me.Sections.Add(Me.GroupFooter4)
         Me.Sections.Add(Me.PageFooter)
         Me.Sections.Add(Me.ReportFooter1)
-        Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-family: Arial; font-style: normal; text-decoration: none; font-weight: norma" &
-            "l; font-size: 10pt; color: Black; ddo-char-set: 204", "Normal"))
-        Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-size: 16pt; font-weight: bold", "Heading1", "Normal"))
-        Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-family: Times New Roman; font-size: 14pt; font-weight: bold; font-style: ita" &
-            "lic", "Heading2", "Normal"))
-        Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-size: 13pt; font-weight: bold", "Heading3", "Normal"))
         CType(Me.lblLeistungNr, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblAnzahl, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSteuerfrei, System.ComponentModel.ISupportInitialize).EndInit()

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.Designer.vb

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class usrcntlVerzollungspreise
     Inherits System.Windows.Forms.UserControl
 
     'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class usrcntlVerzollungspreise
     'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
     'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.lblVollmachtDE = New System.Windows.Forms.Label()
         Me.pic = New System.Windows.Forms.PictureBox()
@@ -48,6 +48,7 @@ Partial Class usrcntlVerzollungspreise
         Me.cbxZollpflichtigeAbfertigung = New System.Windows.Forms.CheckBox()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.MyComboBoxSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cbxAusDB = New System.Windows.Forms.CheckBox()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvZusatzleistung, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -309,12 +310,23 @@ Partial Class usrcntlVerzollungspreise
         Me.MyComboBoxSprache.Size = New System.Drawing.Size(144, 21)
         Me.MyComboBoxSprache.TabIndex = 39
         '
+        'cbxAusDB
+        '
+        Me.cbxAusDB.AutoSize = True
+        Me.cbxAusDB.Location = New System.Drawing.Point(243, 13)
+        Me.cbxAusDB.Name = "cbxAusDB"
+        Me.cbxAusDB.Size = New System.Drawing.Size(61, 17)
+        Me.cbxAusDB.TabIndex = 40
+        Me.cbxAusDB.Text = "aus DB"
+        Me.cbxAusDB.UseVisualStyleBackColor = True
+        '
         'usrcntlVerzollungspreise
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.WhiteSmoke
         Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Controls.Add(Me.cbxAusDB)
         Me.Controls.Add(Me.MyComboBoxSprache)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.cbxZollpflichtigeAbfertigung)
@@ -368,4 +380,5 @@ Partial Class usrcntlVerzollungspreise
     Friend WithEvents cbxZollpflichtigeAbfertigung As CheckBox
     Friend WithEvents Label1 As Label
     Friend WithEvents MyComboBoxSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cbxAusDB As CheckBox
 End Class

SDL/kassenbuch/frmBelegNeu.vb

@@ -1597,6 +1597,8 @@ Public Class frmBelegNeu
 
         Try
 
+            Dim BelegNrFIBU As String = ""
+
             If Not BELEG.gebucht And Not BELEG.gebuchtStorno Then
 
                 Me.Cursor = Cursors.WaitCursor
@@ -1638,7 +1640,7 @@ Public Class frmBelegNeu
                 Dim JournalNr = 0
 
 
-                If Not cRKSV.insertKB(PERSONAL, BELEG, KASSE.rksv_id, RKSV_Beleg_Id, KASSE.rksv_aktiv, JournalNr, KASSE.rksv_firma, POSFIBU, Zahlungsmittel, (isLeihgeldeinzahlung AndAlso cboBuchungsoforterzeugen.Checked)) Then
+                If Not cRKSV.insertKB(PERSONAL, BELEG, KASSE.rksv_id, RKSV_Beleg_Id, KASSE.rksv_aktiv, JournalNr, KASSE.rksv_firma, POSFIBU, BelegNrFIBU, Zahlungsmittel, (isLeihgeldeinzahlung AndAlso cboBuchungsoforterzeugen.Checked)) Then
                     KASSE.DECREASE_BELEG_UMSATZ(oldBelegZaehler, summeBRUTTO * -1)
                     VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Programmfehler bei Eintrag ins Kassenbuch.", "", System.Reflection.MethodInfo.GetCurrentMethod.Name)
                     Me.Cursor = Cursors.Default : warnClose = False : Me.Close() : Exit Sub

SDL/kassenbuch/frmNacherfassungLeihgeld.vb

@@ -283,6 +283,8 @@ Public Class frmNacherfassungLeihgeld
 
         Try
 
+            Dim BelegNrFIBU As String = ""
+
             If BELEG.gebucht Or BELEG.gebuchtStorno Then
                 If BELEG.rksv_id > 0 Then KASSE.LOAD(BELEG.rksv_id)
                 cRKSV.printKundenBelegLG(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, "LG")
@@ -348,7 +350,7 @@ Public Class frmNacherfassungLeihgeld
 
 
                 Dim JournalNr = 0
-                If Not cRKSV.insertKB(PERSONAL, BELEG, KASSE.rksv_id, RKSV_Beleg_Id, (KASSE.rksv_aktiv Or KASSE.rksvDE_aktiv), JournalNr, KASSE.rksv_firma, -1,, cbxOP_sofort_buchen.Checked) Then
+                If Not cRKSV.insertKB(PERSONAL, BELEG, KASSE.rksv_id, RKSV_Beleg_Id, (KASSE.rksv_aktiv Or KASSE.rksvDE_aktiv), JournalNr, KASSE.rksv_firma, -1, BelegNrFIBU,, cbxOP_sofort_buchen.Checked) Then
                     Me.Cursor = Cursors.Default : Me.Close() : Exit Sub
                 End If
 
@@ -456,12 +458,13 @@ Public Class frmNacherfassungLeihgeld
                         If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" AndAlso spedBuchExisting Then
                             Dim verarbOK As Boolean = True
                             Dim SPEDBUCH As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(BELEG.FilialenNr, BELEG.AbfertigungsNr)
+                            SPEDBUCH.BelegNr = BelegNrFIBU
                             Dim RK_ID As Integer = -1
 
                             If Not gen_RECHNUNG_BySPEDBUCH(BELEG.KundenNr, SPEDBUCH, RK_ID, cbxOP_sofort_buchen.Checked, summeBRUTTO, summeNETTO, BELEG) Then verarbOK = False
                             If RK_ID > 0 Then
                                 Dim RECHNUNG As New cRechnungsausgang(RK_ID)
-
+                                RECHNUNG.KdAuftragsNr = BelegNrFIBU
                                 If Not cFakturierung.doRechnungsDruck(RECHNUNG, Today(),, 4) Then verarbOK = False
                                 If RECHNUNG.[DruckDatumZeit] IsNot Nothing Then
                                     RECHNUNG.[DruckDatumZeit] = Nothing

SDL/kunden/usrCntlKundenKontakte.vb

@@ -45,7 +45,11 @@
 
                         Dim rowIndex As Integer = dgvAufschub.Rows.Add(r("kkd_id"), r("kkd_kkaBez"), r("kkd_Tel"), r("kkd_Email"), anspr, r("kkd_Fax"))
 
-                        If VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(r("kkd_email")) <> "" Or VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(r("kkd_emailcc")) <> "" Or VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(r("kkd_emailbcc")) <> "" Then
+                        Dim mail As String = IIf(Not IsDBNull(r("kkd_email")), VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(r("kkd_email")), "")
+                        Dim mailcc As String = IIf(Not IsDBNull(r("kkd_emailcc")), VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(r("kkd_emailcc")), "")
+                        Dim mailbcc As String = IIf(Not IsDBNull(r("kkd_emailbcc")), VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(r("kkd_emailbcc")), "")
+
+                        If mail <> "" Or mailcc <> "" Or mailbcc <> "" Then
                             Dim dgvRow As DataGridViewRow = dgvAufschub.Rows(rowIndex)
                             dgvRow.DefaultCellStyle.BackColor = Color.IndianRed
                         End If

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -34,7 +34,7 @@ Public Class frmMDMDatenverarbetiung
 
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
         Select Case LIEFERANT
-            Case "PLOSE" : genSummenbericht_PLOSE() : genSummenbericht_nachLand_PLOSE()
+            Case "PLOSE" : genSummenbericht_PLOSE() : genSummenbericht_nachLand_PLOSE() : genSummenbericht_nachLeistungsNr_PLOSE()
             Case "ASFINAG" : genSummenbericht_ASFINAG()
             Case "UTA" : genSummenbericht_UTA()
             Case "IDS" : genSummenbericht_IDS(17, cbxIDSmitVerag.Checked) : genSummenbericht_IDS(21, cbxIDSmitVerag.Checked)
@@ -376,6 +376,93 @@ Public Class frmMDMDatenverarbetiung
 
 
 
+                                          sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_Nettobetrag").Value, 4, 0)
+                                          sumMWST += SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_MWSTBetrag").Value, 4, 0)
+                                          sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_Bruttobetrag").Value, 4, 0)
+
+                                      End Sub
+
+
+        AddHandler rpt.ReportFooter1.Format, Sub()
+                                                 rpt.lblSumMenge.Text = sumMenge.ToString("N0")
+                                                 'rpt.lblSumPreis.Text = sumPreis.ToString("N2")
+                                                 rpt.lblSumNetto.Text = sumNetto.ToString("N2")
+                                                 rpt.lblSumMwst.Text = sumMWST.ToString("N2")
+                                                 rpt.lblSumBrutto.Text = sumBrutto.ToString("N2")
+
+                                             End Sub
+
+        print.Viewer.LoadDocument(rpt)
+        print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
+        print.Show()
+    End Sub
+
+    Sub genSummenbericht_nachLeistungsNr_PLOSE()
+        Dim displayFilter = False
+        Dim sqlstr As String = ""
+        sqlstr = "  SELECT 	  count(*) Anzahl	,plp_LeistungsNr
+                    ,sum(plose_Menge) as plose_Menge
+                    ,sum(plose_Preis) as plose_Preis
+                    ,sum(plose_NettobetragWaehrungAbbuchung) as plose_Nettobetrag
+                    ,sum(plose_MWSTBetragWaehrungAbbuchung) as plose_MWSTBetrag
+                    ,sum(plose_BruttobetragWaehrungAbbuchung) as plose_Bruttobetrag 
+                     FROM tblPLOSE_Details 
+                     INNER JOIN [tblPLOSE_Produktbeschreibung] on plose_ProduktCode = plp_ProductCode
+                     WHERE plose_DatumTransaktion BETWEEN '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "'
+                      AND plose_Fakturiert = 0
+                      AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & ")
+                    group by plp_LeistungsNr
+                    order by plp_LeistungsNr"
+
+
+        Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
+        'DataGridView.DataSource = dt
+
+
+        Dim print As New frmPrintLayout
+        print.Text = "PLOSE"
+
+        Dim rpt As New rptPLOSE_TransaktionenSumary
+
+        rpt.DataSource = dt
+
+
+        'If cbxProdukt.Checked Then
+        '    rpt.GroupHeader2.DataField = "prod_descr"
+        'Else
+        '    rpt.GroupHeader2.Visible = False
+        '    rpt.GroupFooter2.Visible = False
+        'End If
+
+
+
+        Dim sum = 0
+        rpt.lblUeberschrift.Text = "PLOSE Summenbericht nach Land " & dat_Sum_Von.Text & " bis " & dat_Sum_Bis.Text
+        rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
+        'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & "  /  " & PERSONAL.Niederlassung
+
+        'Dim cnt As Integer = 0
+        rpt.lblDat.Text = Now.ToLongDateString
+
+
+        Dim sumPreis As Double = 0
+        Dim sumNetto As Double = 0
+        Dim sumMWST As Double = 0
+        Dim sumBrutto As Double = 0
+        Dim sumMenge As Double = 0
+
+        AddHandler rpt.Detail.Format, Sub()
+                                          '   rpt.lblProduktBeschreibung.Text = isDbnullEmpty(rpt.Fields.Item("BC_DESCR").Value, "")
+                                          rpt.lblAnzahl.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Anzahl").Value, "")
+                                          rpt.lblProdukt.Text = SQL.isDbnullEmpty(rpt.Fields.Item("plp_LeistungsNr").Value, "")
+                                          rpt.lblMenge.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Währung").Value, "")
+                                          ' rpt.lblPreis.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_Preis").Value, 2, "")
+                                          rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_Nettobetrag").Value, 2, "")
+                                          rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_MWSTBetrag").Value, 2, "")
+                                          rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_Bruttobetrag").Value, 2, "")
+
+
+
                                           sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_Nettobetrag").Value, 4, 0)
                                           sumMWST += SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_MWSTBetrag").Value, 4, 0)
                                           sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("plose_Bruttobetrag").Value, 4, 0)

SDL/mdm/usrCntlMDMAuswertungen.Designer.vb

@@ -127,6 +127,13 @@ 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.Label72 = New System.Windows.Forms.Label()
+        Me.GroupBox21 = New System.Windows.Forms.GroupBox()
+        Me.txtJahr_rechnungen = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.PictureBox8 = New System.Windows.Forms.PictureBox()
+        Me.Label70 = New System.Windows.Forms.Label()
+        Me.Label71 = New System.Windows.Forms.Label()
+        Me.Button21 = New System.Windows.Forms.Button()
         Me.Label66 = New System.Windows.Forms.Label()
         Me.GroupBox20 = New System.Windows.Forms.GroupBox()
         Me.cbxNurUnter50EUR = New System.Windows.Forms.CheckBox()
@@ -202,6 +209,7 @@ 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.cbxRechnungsdetails = New System.Windows.Forms.CheckBox()
         Me.GroupBox1.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -222,6 +230,8 @@ Partial Class usrCntlMDMAuswertungen
         Me.GroupBox9.SuspendLayout()
         CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.TabPage3.SuspendLayout()
+        Me.GroupBox21.SuspendLayout()
+        CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupBox20.SuspendLayout()
         CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.tbIDS.SuspendLayout()
@@ -333,9 +343,9 @@ Partial Class usrCntlMDMAuswertungen
         Me.Label4.ForeColor = System.Drawing.SystemColors.ControlDarkDark
         Me.Label4.Location = New System.Drawing.Point(7, 11)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(296, 17)
+        Me.Label4.Size = New System.Drawing.Size(293, 17)
         Me.Label4.TabIndex = 9
-        Me.Label4.Text = "Wölfl Rechnungen als CSV bereitstellen"
+        Me.Label4.Text = "RMC Rechnungen als CSV bereitstellen"
         '
         'GroupBox2
         '
@@ -434,11 +444,11 @@ Partial Class usrCntlMDMAuswertungen
         '
         Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Button1.Image = Global.SDL.My.Resources.Resources.Excel_logo
         Me.Button1.Location = New System.Drawing.Point(6, 19)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(121, 49)
         Me.Button1.TabIndex = 4
-        Me.Button1.Text = "CSV erstellen"
         Me.Button1.UseVisualStyleBackColor = True
         '
         'Label8
@@ -1420,6 +1430,8 @@ Partial Class usrCntlMDMAuswertungen
         '
         'TabPage3
         '
+        Me.TabPage3.Controls.Add(Me.Label72)
+        Me.TabPage3.Controls.Add(Me.GroupBox21)
         Me.TabPage3.Controls.Add(Me.Label66)
         Me.TabPage3.Controls.Add(Me.GroupBox20)
         Me.TabPage3.Controls.Add(Me.UsrCntlWoelfl_IM_CSVRg1)
@@ -1429,9 +1441,96 @@ Partial Class usrCntlMDMAuswertungen
         Me.TabPage3.Name = "TabPage3"
         Me.TabPage3.Size = New System.Drawing.Size(1049, 990)
         Me.TabPage3.TabIndex = 2
-        Me.TabPage3.Text = "WÖLFL"
+        Me.TabPage3.Text = "RMC"
         Me.TabPage3.UseVisualStyleBackColor = True
         '
+        'Label72
+        '
+        Me.Label72.AutoSize = True
+        Me.Label72.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label72.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Me.Label72.Location = New System.Drawing.Point(9, 267)
+        Me.Label72.Name = "Label72"
+        Me.Label72.Size = New System.Drawing.Size(238, 17)
+        Me.Label72.TabIndex = 19
+        Me.Label72.Text = "RMC Rechnungen ohne Kunden"
+        '
+        'GroupBox21
+        '
+        Me.GroupBox21.Controls.Add(Me.cbxRechnungsdetails)
+        Me.GroupBox21.Controls.Add(Me.txtJahr_rechnungen)
+        Me.GroupBox21.Controls.Add(Me.PictureBox8)
+        Me.GroupBox21.Controls.Add(Me.Label70)
+        Me.GroupBox21.Controls.Add(Me.Label71)
+        Me.GroupBox21.Controls.Add(Me.Button21)
+        Me.GroupBox21.Location = New System.Drawing.Point(6, 283)
+        Me.GroupBox21.Name = "GroupBox21"
+        Me.GroupBox21.Size = New System.Drawing.Size(697, 111)
+        Me.GroupBox21.TabIndex = 18
+        Me.GroupBox21.TabStop = False
+        '
+        'txtJahr_rechnungen
+        '
+        Me.txtJahr_rechnungen._DateTimeOnly = False
+        Me.txtJahr_rechnungen._numbersOnly = False
+        Me.txtJahr_rechnungen._numbersOnlyKommastellen = ""
+        Me.txtJahr_rechnungen._numbersOnlyTrennzeichen = True
+        Me.txtJahr_rechnungen._Prozent = False
+        Me.txtJahr_rechnungen._ShortDateNew = False
+        Me.txtJahr_rechnungen._ShortDateOnly = False
+        Me.txtJahr_rechnungen._TimeOnly = False
+        Me.txtJahr_rechnungen._TimeOnly_Seconds = False
+        Me.txtJahr_rechnungen._value = ""
+        Me.txtJahr_rechnungen._Waehrung = False
+        Me.txtJahr_rechnungen._WaehrungZeichen = True
+        Me.txtJahr_rechnungen.ForeColor = System.Drawing.Color.Black
+        Me.txtJahr_rechnungen.Location = New System.Drawing.Point(185, 47)
+        Me.txtJahr_rechnungen.MaxLineLength = -1
+        Me.txtJahr_rechnungen.MaxLines_Warning = ""
+        Me.txtJahr_rechnungen.MaxLines_Warning_Label = Nothing
+        Me.txtJahr_rechnungen.Name = "txtJahr_rechnungen"
+        Me.txtJahr_rechnungen.Size = New System.Drawing.Size(53, 20)
+        Me.txtJahr_rechnungen.TabIndex = 13
+        '
+        'PictureBox8
+        '
+        Me.PictureBox8.Image = Global.SDL.My.Resources.Resources.woelfl
+        Me.PictureBox8.Location = New System.Drawing.Point(640, 8)
+        Me.PictureBox8.Name = "PictureBox8"
+        Me.PictureBox8.Size = New System.Drawing.Size(51, 37)
+        Me.PictureBox8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.PictureBox8.TabIndex = 11
+        Me.PictureBox8.TabStop = False
+        '
+        'Label70
+        '
+        Me.Label70.AutoSize = True
+        Me.Label70.Location = New System.Drawing.Point(145, 50)
+        Me.Label70.Name = "Label70"
+        Me.Label70.Size = New System.Drawing.Size(27, 13)
+        Me.Label70.TabIndex = 8
+        Me.Label70.Text = "Jahr"
+        '
+        'Label71
+        '
+        Me.Label71.AutoSize = True
+        Me.Label71.Location = New System.Drawing.Point(145, 19)
+        Me.Label71.Name = "Label71"
+        Me.Label71.Size = New System.Drawing.Size(277, 13)
+        Me.Label71.TabIndex = 5
+        Me.Label71.Text = "RMC-Rechnungen ohne zugehörigen Kunden im System."
+        '
+        'Button21
+        '
+        Me.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button21.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Button21.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.Button21.Location = New System.Drawing.Point(6, 19)
+        Me.Button21.Name = "Button21"
+        Me.Button21.Size = New System.Drawing.Size(121, 49)
+        Me.Button21.TabIndex = 4
+        Me.Button21.UseVisualStyleBackColor = True
+        '
         'Label66
         '
         Me.Label66.AutoSize = True
@@ -1439,9 +1538,9 @@ Partial Class usrCntlMDMAuswertungen
         Me.Label66.ForeColor = System.Drawing.SystemColors.ControlDarkDark
         Me.Label66.Location = New System.Drawing.Point(9, 136)
         Me.Label66.Name = "Label66"
-        Me.Label66.Size = New System.Drawing.Size(347, 17)
+        Me.Label66.Size = New System.Drawing.Size(344, 17)
         Me.Label66.TabIndex = 15
-        Me.Label66.Text = "Wölfl Rechnungen Bearbeitungsbetrag Quartal"
+        Me.Label66.Text = "RMC Rechnungen Bearbeitungsbetrag Quartal"
         '
         'GroupBox20
         '
@@ -1581,17 +1680,17 @@ Partial Class usrCntlMDMAuswertungen
         '
         Me.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button20.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Button20.Image = Global.SDL.My.Resources.Resources.Excel_logo
         Me.Button20.Location = New System.Drawing.Point(6, 19)
         Me.Button20.Name = "Button20"
         Me.Button20.Size = New System.Drawing.Size(121, 49)
         Me.Button20.TabIndex = 4
-        Me.Button20.Text = "CSV erstellen"
         Me.Button20.UseVisualStyleBackColor = True
         '
         'UsrCntlWoelfl_IM_CSVRg1
         '
         Me.UsrCntlWoelfl_IM_CSVRg1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(12, 292)
+        Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(6, 421)
         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
@@ -2254,6 +2353,18 @@ Partial Class usrCntlMDMAuswertungen
         Me.pnl.Size = New System.Drawing.Size(1057, 54)
         Me.pnl.TabIndex = 26
         '
+        'cbxRechnungsdetails
+        '
+        Me.cbxRechnungsdetails.AutoSize = True
+        Me.cbxRechnungsdetails.Checked = True
+        Me.cbxRechnungsdetails.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxRechnungsdetails.Location = New System.Drawing.Point(273, 49)
+        Me.cbxRechnungsdetails.Name = "cbxRechnungsdetails"
+        Me.cbxRechnungsdetails.Size = New System.Drawing.Size(152, 17)
+        Me.cbxRechnungsdetails.TabIndex = 18
+        Me.cbxRechnungsdetails.Text = "Rechnungsdetail anzeigen"
+        Me.cbxRechnungsdetails.UseVisualStyleBackColor = True
+        '
         'usrCntlMDMAuswertungen
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2295,6 +2406,9 @@ Partial Class usrCntlMDMAuswertungen
         CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
         Me.TabPage3.ResumeLayout(False)
         Me.TabPage3.PerformLayout()
+        Me.GroupBox21.ResumeLayout(False)
+        Me.GroupBox21.PerformLayout()
+        CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit()
         Me.GroupBox20.ResumeLayout(False)
         Me.GroupBox20.PerformLayout()
         CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit()
@@ -2508,4 +2622,12 @@ Partial Class usrCntlMDMAuswertungen
     Friend WithEvents txtLeistungsNr As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents cboQuartal As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents cbxNurUnter50EUR As CheckBox
+    Friend WithEvents Label72 As Label
+    Friend WithEvents GroupBox21 As GroupBox
+    Friend WithEvents txtJahr_rechnungen As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents PictureBox8 As PictureBox
+    Friend WithEvents Label70 As Label
+    Friend WithEvents Label71 As Label
+    Friend WithEvents Button21 As Button
+    Friend WithEvents cbxRechnungsdetails As CheckBox
 End Class

SDL/mdm/usrCntlMDMAuswertungen.vb

@@ -1542,12 +1542,44 @@ Public Class usrCntlMDMAuswertungen
 
 
         Catch ex As System.Exception
-            MsgBox(ex.Message & ex.StackTrace)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
 
         Me.Cursor = Cursors.Default
 
     End Sub
+
+    Private Sub Button21_Click(sender As Object, e As EventArgs) Handles Button21.Click
+
+        Try
+
+
+            Me.Cursor = Cursors.WaitCursor
+
+            Dim Jahr As Integer = Now().Year
+
+            If txtJahr_rechnungen.Text <> "" AndAlso IsNumeric(txtJahr_rechnungen.Text) AndAlso txtJahr_rechnungen.Text.Length = 4 Then
+                Jahr = txtJahr_rechnungen.Text
+            End If
+
+            Dim rmc As cRMC
+            Dim dt = rmc.getRMCREchnungenOhneAdressen(New VERAG_PROG_ALLGEMEIN.SQL, Jahr, cbxRechnungsdetails.Checked)
+
+            If dt.Rows.Count > 0 Then
+                cProgramFunctions.genExcelFromDT_NEW(dt,,,,,, True)
+            Else
+                MsgBox("keine Daten für ausgewählten Zeitraum")
+            End If
+
+
+        Catch ex As System.Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+
+        Me.Cursor = Cursors.Default
+
+
+    End Sub
 End Class
 
 

VERAG_PROG_ALLGEMEIN/AVISO/cMeineFunktionenAVISO.vb

@@ -187,7 +187,7 @@ Public Class cMeineFunktionenAVISO
         Dim AvisoDAL As New VERAG_PROG_ALLGEMEIN.cAvisoDAL
         Dim VermerkeDAL As New VERAG_PROG_ALLGEMEIN.cVermerkeDAL
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
-            MsgBox("Keine Berechtigung!")
+            MsgBox("Keine Berechtigung! - VERIMEX")
             Return False
         End If
 

VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb

@@ -314,7 +314,7 @@ Public Class cAdressen
 
         Try
             Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL(False)
-                Using cmd As New SqlCommand("Select TOP(1) * FROM Adressen WHERE (UstIdKz + UstIdNr='" & UIDNr & "' or Steuernummer ='" & UIDNr & "') AND (WölflKundenNr = " & woelflKdNr & " OR weitereWölflKundenNr = " & woelflKdNr & ") " & IIf(isWoelfKdNr, " AND AdressenNr LIKE '15%'", ""), conn)
+                Using cmd As New SqlCommand("Select TOP(1) * FROM Adressen WHERE (UstIdKz + UstIdNr='" & UIDNr & "' or Steuernummer ='" & UIDNr & "') AND (WölflKundenNr = " & woelflKdNr & " OR weitereWölflKundenNr = " & woelflKdNr & ") " & IIf(isWoelfKdNr, " AND (AdressenNr LIKE '15%' or AdressenNr LIKE '18%')", ""), conn)
 
                     Dim dr = cmd.ExecuteReader()
                     If dr.Read Then

VERAG_PROG_ALLGEMEIN/Classes/cMDMEInarbeitung.vb

@@ -199,6 +199,8 @@ Public Class cMDMEinarbeitung
 
         Dim REDat
 
+        'todo: refactor!!!!!
+
         If import_date.Day < 15 Then
             'vor 15, letzer Monat Monatsletzter!
             If import_date.Month <> 1 Then

VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb

@@ -332,6 +332,37 @@ Public Class cRMC
 
 
 
+    End Function
+
+
+
+    Public Shared Function getRMCREchnungenOhneAdressen(SQL As SQL, jahr As Integer, Optional getInvoiceData As Boolean = False) As DataTable
+
+
+        Dim SQLFirst As String = ""
+        If getInvoiceData Then
+            SQLFirst = "SELECT [rmc_kdNr], [rmc_kdName], [rmc_landKZ], [rmc_reDatum], [rmc_reNr], [rmc_waehrung], case WHEN rmc_daid IS NULL THEN 0 else 1 end as PDF_Rechnung, case WHEN rmc_daId_InvAtt IS NULL THEN 0 else 1 end as PDF_Anhang "
+        Else
+            SQLFirst = "SELECT DISTINCT r.rmc_kdNr,r.rmc_kdName "
+        End If
+
+
+        Dim SQLstr = "FROM tblRMCImport r
+                WHERE
+                    r.rmc_reDatum >= '" & jahr & "-01-01'
+                    AND r.rmc_reDatum < '" & jahr + 1 & "-01-01'
+                    AND NOT EXISTS (
+                        SELECT 1 FROM Adressen a WHERE a.WölflKundenNr = r.rmc_kdNr
+                    )
+                    AND NOT EXISTS (
+                        SELECT 1 FROM Adressen a WHERE a.weitereWölflKundenNr = r.rmc_kdNr)"
+
+        Dim dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLFirst & SQLstr, "FMZOLL")
+
+        Return dt
+
+
+
     End Function
 
     Public Class Paramter
@@ -341,7 +372,7 @@ Public Class cRMC
 
         Shared Function GET_PARAM_ByName(tcParam_name, TESTSYSTEM) As String
             Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value]  FROM [tblPartnersystem_Paramter] WHERE  Param_system='RMC' AND [Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
-    End Function
+        End Function
 
         Shared Function getFTPConenction(ByRef API_String As String, ByRef API As DataTable, ByRef program As String) As Boolean
 

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb

@@ -34,7 +34,7 @@ Public Class frmMitarbeitersuche
     Private Sub frmMitarbeitersuche_Load(sender As Object, e As EventArgs) Handles Me.Load
         pnl.Visible = False
         If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MITARBEITER_VERZEICHNIS", "SDL") Then
-            MsgBox("Noch nicht verfügbar!")
+            MsgBox("keine Berechtigung für MA-Verzeichnis!")
             Me.Close()
             Exit Sub
         End If