diff --git a/SDL/Classes/cRKSV.vb b/SDL/Classes/cRKSV.vb index 65e857bf..78cd3f75 100644 --- a/SDL/Classes/cRKSV.vb +++ b/SDL/Classes/cRKSV.vb @@ -1,8 +1,7 @@ -Imports SDL.RKSVServer -Imports System.Drawing.Printing -Imports GrapeCity.ActiveReports +Imports GrapeCity.ActiveReports +Imports GrapeCity.DataVisualization.TypeScript +Imports SDL.RKSVServer Imports VERAG_PROG_ALLGEMEIN.DSFinVKService -Imports VERAG_PROG_ALLGEMEIN.TESTJSON Public Class cRKSV Shared SQL As New SQL @@ -2369,13 +2368,12 @@ Public Class cRKSV End If '################ - ' Buchung im EABeleg eintragen. + ' DIREKTVERBUCHUNG SYSKA '################ If BelegSofortInFIBUverbuchten AndAlso BELEG.Beleg_TYP = "L" Then - Dim stapelbuchung As Boolean = True + Dim stapelbuchung As Boolean = False 'createSyskaBuchung(RKSV_id, BELEG, stapelbuchung, KBEntry_List, KBEntryGB_List, KBEntryST_List) - End If BELEG.gebucht = True @@ -2406,245 +2404,757 @@ Public Class cRKSV Private Shared Function createSyskaBuchung(RKSV_id As Integer, beleg As EABeleg, Stapelbuchung As Boolean, KBEntry_list As List(Of cKassenbuch), KBEntryGB_list As List(Of cKassenbuch), KBEntryST_list As List(Of cKassenbuch)) As Boolean - Dim mandant As Integer = 7 'ATILLA - Dim Buchungstext As String = beleg.LKW_Kennzeichen + "_" + beleg.Frachtführer + "_" + beleg.Fahrer + "_" + beleg.Passnummer - Dim BuchungstextBemerkung As String = "" - If Buchungstext.ToString.Length > 48 Then - BuchungstextBemerkung = Buchungstext.Substring(49, Buchungstext.ToString.Length - 48) - Buchungstext = Buchungstext.Substring(0, 48) + If Not Stapelbuchung Then + + If beleg.Beleg_TYP = "L" Then + + 'INFO -> Leihgeld ist immer 0% MWSt + + Dim VERAG_SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Dim MANDANT As Integer = 9 'ATILLA = 7 ' TEST = 9 + Dim Kassenkonto As Integer = 2700 + Dim BelegBuchungsKreis As String = "KE" + + Dim JAHR As Integer = Now.Year + Dim PERIODE As Integer = Now.Month + Dim BETRAG As Double = 0 + Dim BUCHUNGSBETRAG As Double = 0 + Dim TYP As String = "EINZAHLUNG" + + Dim Kontonummer As Integer = 0 + Dim Sollkonto As Integer = 0 + Dim Habenkonto As Integer = 0 + Dim Personenkonto As Integer = 0 + Dim kontenzaehler As Integer = 0 + + Dim Bestandskonto As Integer = Kassenkonto + Dim Erlöskonto As Integer = 0 + Dim Sachkonto As Integer = 0 + + If beleg.KundenNr > 0 Then + Habenkonto = beleg.KundenNr + Kontonummer = beleg.KundenNr + End If + + Personenkonto = Habenkonto '/* die ersten 2 Kontovoraussetzungen schaffen */ + + Dim dt_Verbuchungskonten As New DataTable + dt_Verbuchungskonten.Columns.Add("Nr", GetType(Integer)) + dt_Verbuchungskonten.Columns.Add("Konto", GetType(Integer)) + dt_Verbuchungskonten.Columns.Add("Soll", GetType(Double)) + dt_Verbuchungskonten.Columns.Add("Haben", GetType(Double)) + + 'ist immer nur 1 POSITION!!!!! + + For Each r In KBEntry_list + BETRAG = r.Betrag + Next + + 'Bestandkonto und Erlöskonto immer fix! + Dim Forderungskonto As String = VERAG_SQL.getValueTxtBySqlVarList("SELECT i_fordkto FROM [FIBU2].dbo.fibu_konto WHERE [FIBU2].dbo.fibu_konto.i_konto = " & beleg.KundenNr & " AND [FIBU2].dbo.fibu_konto.i_firm_refid = " & MANDANT, "FIBU",, "2000") + + For Each r In KBEntryGB_list + + Dim R1 As DataRow = dt_Verbuchungskonten.NewRow + R1("Nr") = 1 + R1("Konto") = Personenkonto + R1("Soll") = 0 + R1("Haben") = 0 + dt_Verbuchungskonten.Rows.Add(R1) + kontenzaehler += 1 + + Dim R2 As DataRow = dt_Verbuchungskonten.NewRow + R2("Nr") = kontenzaehler + R2("Konto") = Forderungskonto + R2("Soll") = 0 + R2("Haben") = 0 + dt_Verbuchungskonten.Rows.Add(R2) + kontenzaehler += 1 + + Dim R3 As DataRow = dt_Verbuchungskonten.NewRow + R3("Nr") = 1 + R3("Konto") = r.Konto + Erlöskonto = r.Konto + R3("Soll") = r.Soll + R3("Haben") = r.Haben + dt_Verbuchungskonten.Rows.Add(R3) + kontenzaehler += 1 + + Dim R4 As DataRow = dt_Verbuchungskonten.NewRow + R4("Nr") = kontenzaehler + R4("Konto") = Kassenkonto + R4("Soll") = r.Haben + R4("Haben") = r.Soll + dt_Verbuchungskonten.Rows.Add(R4) + kontenzaehler += 1 + + If r.Buchungstext = "AUSZAHLUNG" Then + BelegBuchungsKreis = "KA" + TYP = r.Buchungstext + Else + TYP = r.Buchungstext + BelegBuchungsKreis = "KE" + End If + + Next + + + Dim Buchungstext As String = IIf(BETRAG < 0, "STORNO", "") & BelegBuchungsKreis & "_" & beleg.AbfertigungsNr & "_" & beleg.LKW_Kennzeichen & "_" & beleg.Frachtführer & "_" & beleg.Fahrer & "_" & beleg.Passnummer + Dim BuchungstextBemerkung As String = "" + If Buchungstext IsNot Nothing AndAlso Buchungstext.Length > 48 Then + BuchungstextBemerkung = Buchungstext.Substring(48) + Buchungstext = Buchungstext.Substring(0, 48) + End If + + Dim ckennsoll2 = "" + Dim ckennhab2 = "" + + + Dim ckennsoll = "LE" + Dim kkennungsoll As Integer = 0 + Dim kkennungsoll2 As Integer = 0 + + Dim ckennhab = "LE" + Dim kkennunghab As Integer = 0 + Dim kkennunghab2 As Integer = 0 + + Dim dt_Sollkonto As DataTable = VERAG_SQL.loadDgvBySql("SELECT top(1) isnull([FIBU2].dbo.fibu_konto.c_kontoart,'LE'), isnull([FIBU2].dbo.fibu_konto.i_kennung,0) FROM [FIBU2].dbo.fibu_konto WHERE [FIBU2].dbo.fibu_konto.i_konto = " & Sollkonto & " AND [FIBU2].dbo.fibu_konto.i_firm_refid = " & MANDANT, "FIBU") + If dt_Sollkonto.Rows.Count > 0 Then + kkennungsoll = dt_Sollkonto.Rows(0).Item("i_kennung") + ckennsoll = dt_Sollkonto.Rows(0).Item("c_kontoart") + End If + Dim dt_Habenkonto As DataTable = VERAG_SQL.loadDgvBySql("SELECT TOP(1) isnull([FIBU2].dbo.fibu_konto.c_kontoart,'LE'), isnull([FIBU2].dbo.fibu_konto.i_kennung,0) FROM [FIBU2].dbo.fibu_konto WHERE [FIBU2].dbo.fibu_konto.i_konto = " & Habenkonto & " AND [FIBU2].dbo.fibu_konto.i_firm_refid = " & MANDANT, "FIBU") + If dt_Habenkonto.Rows.Count > 0 Then + kkennunghab = dt_Habenkonto.Rows(0).Item("i_kennung") + ckennhab = dt_Habenkonto.Rows(0).Item("c_kontoart") + End If + 'STAPEL NICHT UNBEDINGT NOTWENDIG + Dim StapelAZK As String = VERAG_SQL.getValueTxtBySqlVarList("SELECT [FIBU2].dbo.fibu_stapelart.i_stapel_refid FROM [FIBU2].dbo.fibu_stapelart WHERE [FIBU2].dbo.fibu_stapelart.c_stapelname LIKE 'Auszahlungskasse 1' AND [FIBU2].dbo.fibu_stapelart.i_firm_refid = " & MANDANT, "FIBU",, "") + Dim Zaehler1 As String = VERAG_SQL.getValueTxtBySqlVarList("SELECT COUNT([FIBU2].dbo.fibu_stapel.i_lfdnr) FROM [FIBU2].dbo.fibu_stapel WHERE ISNULL([FIBU2].dbo.fibu_stapel.si_pruef, 0) > 0", "FIBU",, "0") + + If CInt(Zaehler1) > 0 Then + StapelAZK = VERAG_SQL.getValueTxtBySqlVarList("SELECT [FIBU2].dbo.fibu_stapelart.i_stapel_refid FROM [FIBU2].dbo.fibu_stapelart WHERE [FIBU2].dbo.fibu_stapelart.c_stapelname LIKE 'Auszahlungskasse 2' AND [FIBU2].dbo.fibu_stapelart.i_firm_refid = " & MANDANT, "FIBU",, "") + End If + Dim ZSBuchnr As String = "" + If StapelAZK <> "" Then ZSBuchnr = VERAG_SQL.getValueTxtBySqlVarList("SELECT MAX([FIBU2].dbo.fibu_stapel.i_lfdnr)+1 FROM [FIBU2].dbo.fibu_stapel WHERE [FIBU2].dbo.fibu_stapel.i_firm_refid = " & MANDANT & " AND [FIBU2].dbo.fibu_stapel.i_stapel_refid = " & StapelAZK, "FIBU",, "0") + Dim ZSBuchnrINT As Integer + If ZSBuchnr = "" Or ZSBuchnr = "0" Then + ZSBuchnrINT = 1 + Else + ZSBuchnrINT = CInt(ZSBuchnr) + End If + + If StapelAZK = "" Then StapelAZK = "0000" + + Dim dt_creation As String = Now.ToString("dd HH:mm:ss") + Dim ProtokollID As String = StapelAZK.ToString() & "-" & ZSBuchnrINT.ToString("0000") & "-" & JAHR & "-" & PERIODE.ToString("N2") & "-" & dt_creation + + Dim pruef As Integer = 0 + Dim ZSzeilenr As Integer = 0 + Dim Belegart As Integer = 1 + Dim Splitart As Integer = 0 + + '1. Belegssalden anlegen, falls nicht vorhanden! - erste Schleife (Schleifen1rec) + For Each konto As DataRow In dt_Verbuchungskonten.Rows + erstelleEBSalden(MANDANT, JAHR, konto.Item("Konto")) + Next + + Dim i_beleg_refid As String = (New VERAG_PROG_ALLGEMEIN.SQL).getValueTxtBySqlVarList("SELECT [FIBU2].dbo.fibu_nummern.i_nummer_refid + 1 From [FIBU2].dbo.fibu_nummern Where [FIBU2].dbo.fibu_nummern.i_firm_refid = " & MANDANT & " And [FIBU2].dbo.fibu_nummern.c_nummernart Like 'Buchungsnummer' ", "FIBU",, "0") + Dim Buchungstyp = "g" + Dim i_op_refid = "" + + If i_beleg_refid <> "" AndAlso IsNumeric(i_beleg_refid) Then + + i_op_refid = i_beleg_refid + + If BETRAG <> 0 AndAlso TYP = "EINZAHLUNG" Then + + VERAG_SQL.doSQL("UPDATE [FIBU2].dbo.fibu_nummern SET [FIBU2].dbo.fibu_nummern.i_nummer_refid = " & i_beleg_refid & " WHERE [FIBU2].dbo.fibu_nummern.i_firm_refid = " & MANDANT & " And [FIBU2].dbo.fibu_nummern.c_nummernart Like 'Buchungsnummer'", "FIBU") + + End If + + End If + + insertBelegskopf(MANDANT, JAHR, 1, i_beleg_refid, beleg.BelegDat.ToShortDateString, beleg.BelegNr, Belegart, Buchungstext, BETRAG, "EUR", Now().ToShortTimeString, "AUTO", ProtokollID) + + + Dim SollHabenKZ = "S" + + Dim Sollkonto2 As Integer = 0 + Dim Habenkonto2 As Integer = 0 + + Dim SollSumme As Double = 0 + + Dim dec_sollsumme As Double = 0 + Dim dec_habensumme As Double = 0 + + ZSzeilenr += 1 + + If TYP = "EINZAHLUNG" Then + + If BETRAG <> 0 Then + + Sollkonto2 = Bestandskonto '/* bei Einzahlung und Bestandskonto im Soll */ + Habenkonto2 = Kontonummer '/* gilt für den ersten Datensatz der ersten Buchungszeile pro Artikel */ + ckennhab2 = "LE" + ckennsoll2 = "KO" + kkennunghab2 = 0 + kkennungsoll2 = 0 + + BUCHUNGSBETRAG = BETRAG + + Dim rows() As DataRow = dt_Verbuchungskonten.Select("Konto = '" & sollkonto2 & "'") + If rows.Length > 0 Then + Dim row As DataRow = rows(0) + If Not IsDBNull(row("Soll")) Then + dec_sollsumme = Convert.ToDecimal(row("Soll")) + End If + row("Soll") = dec_sollsumme + BETRAG + End If + + insertBelegszeile(MANDANT, JAHR, PERIODE, i_beleg_refid, beleg.BelegDat, beleg.BelegNr, beleg.Belegart, Buchungstext, BETRAG, "EUR", ZSzeilenr, ckennsoll2, sollkonto2, Habenkonto2, SollHabenKZ) + + End If + + + + ElseIf TYP = "AUSZAHLUNG" Then + + If BETRAG <> 0 Then + '/* Umkehrung von Soll und Habenkonto und Betragsvorzeichenwechsel */ + Sollkonto2 = Erlöskonto + Habenkonto2 = 0 + dec_sollsumme = 0 + + BUCHUNGSBETRAG = BETRAG * (-1) + + Dim rows() As DataRow = dt_Verbuchungskonten.Select("Konto = '" & sollkonto2 & "'") + If rows.Length > 0 Then + Dim row As DataRow = rows(0) + If Not IsDBNull(row("Soll")) Then + dec_sollsumme = Convert.ToDecimal(row("Soll")) + End If + row("Soll") = dec_sollsumme + BETRAG * (-1) + End If + + insertBelegszeile(MANDANT, JAHR, PERIODE, i_beleg_refid, beleg.BelegDat, beleg.BelegNr, beleg.Belegart, Buchungstext, BETRAG, "EUR", ZSzeilenr, ckennsoll2, sollkonto2, Habenkonto2, SollHabenKZ) + + End If + + + End If + + '1. Belegszeile + + If TYP = "AUSZAHLUNG" Then + + If BETRAG <> 0 Then + + 'BEGIN /* bei Auszahlung die zweite Datenzeile zur ersten Bestandskontobuchung */ + + ZSzeilenr += 1 + + sollkonto2 = Bestandskonto + Habenkonto2 = 0 + ckennsoll2 = "KO" + SollHabenKZ = "H" + + + Dim rows() As DataRow = dt_Verbuchungskonten.Select("Konto = '" & sollkonto2 & "'") + If rows.Length > 0 Then + Dim row As DataRow = rows(0) + If Not IsDBNull(row("Haben")) Then + dec_habensumme = Convert.ToDecimal(row("Haben")) + End If + row("Haben") = dec_habensumme + BETRAG * (-1) + End If + End If + + End If + + + '2. Belegszeile + insertBelegszeile(MANDANT, JAHR, PERIODE, i_beleg_refid, beleg.BelegDat, beleg.BelegNr, beleg.Belegart, Buchungstext, BUCHUNGSBETRAG, "EUR", ZSzeilenr, ckennsoll2, Sollkonto2, Habenkonto2, SollHabenKZ) + + + If TYP = "EINZAHLUNG" Then + ZSzeilenr += 1 + If BETRAG > 0 Then + + 'BEGIN /* dritte Buchungszeile */ + sollkonto2 = Forderungskonto + Habenkonto2 = Bestandskonto + ckennsoll2 = "DB" + SollHabenKZ = "H" + + Dim rows() As DataRow = dt_Verbuchungskonten.Select("Konto = '" & sollkonto2 & "'") + If rows.Length > 0 Then + Dim row As DataRow = rows(0) + If Not IsDBNull(row("Soll")) Then + dec_habensumme = Convert.ToDecimal(row("Soll")) + End If + row("Soll") = dec_habensumme + BETRAG + End If + End If + '3. Buchungszeile - NUR BEI EINZAHLUNG + insertBelegszeile(MANDANT, JAHR, PERIODE, i_beleg_refid, beleg.BelegDat, beleg.BelegNr, beleg.Belegart, Buchungstext, BUCHUNGSBETRAG, "EUR", ZSzeilenr, ckennsoll2, Sollkonto2, Habenkonto2, SollHabenKZ) + + Else + + ZSzeilenr += 1 + + If BETRAG > 0 Then + sollkonto2 = Forderungskonto + Habenkonto2 = 0 + ckennsoll2 = "DB" + SollHabenKZ = "S" + + + Dim rows() As DataRow = dt_Verbuchungskonten.Select("Konto = '" & sollkonto2 & "'") + If rows.Length > 0 Then + Dim row As DataRow = rows(0) + If Not IsDBNull(row("Soll")) Then + dec_habensumme = Convert.ToDecimal(row("Soll")) + End If + row("Soll") = dec_habensumme + BETRAG * (-1) + End If + End If + + '4. Buchungszeile + insertBelegszeile(MANDANT, JAHR, PERIODE, i_beleg_refid, beleg.BelegDat, beleg.BelegNr, beleg.Belegart, Buchungstext, BUCHUNGSBETRAG, "EUR", ZSzeilenr, ckennsoll2, Sollkonto2, Habenkonto2, SollHabenKZ) + End If + + ZSzeilenr += 1 + + + If TYP = "AUSZAHLUNG" Then + + If BETRAG > 0 Then + + 'BEGIN /* fünfte Buchungszeile bei Auszahlung und Direktverbuchung */ + + sollkonto2 = Erlöskonto + Habenkonto2 = 0 + ckennsoll2 = "KO" + SollHabenKZ = "H" + + + Dim rows() As DataRow = dt_Verbuchungskonten.Select("Konto = '" & sollkonto2 & "'") + If rows.Length > 0 Then + Dim row As DataRow = rows(0) + If Not IsDBNull(row("Haben")) Then + dec_habensumme = Convert.ToDecimal(row("Haben")) + End If + row("Haben") = dec_habensumme + BETRAG * (-1) + End If + + + '5. Buchungszeile + insertBelegszeile(MANDANT, JAHR, PERIODE, i_beleg_refid, beleg.BelegDat, beleg.BelegNr, beleg.Belegart, Buchungstext, BUCHUNGSBETRAG, "EUR", ZSzeilenr, ckennsoll2, Sollkonto2, Habenkonto2, SollHabenKZ) + + End If + + + End If + + + + Dim SkontoDatum = beleg.BelegDat + Dim Nettodatum = beleg.BelegDat + + Dim si_tage As Integer = 0 + Dim dec_skonto As Integer = 0 + Dim si_ntage As Integer = 0 + + Dim c_sprache As String = "" + Dim c_ustidnr As String = "" + Dim c_zahlziel As String = "" + + getDEBDaten(MANDANT, Sollkonto2, c_sprache, c_ustidnr, c_zahlziel, si_tage, dec_skonto, si_ntage, SkontoDatum, Nettodatum) + + '7/1 Schritt -> Salden-Fortschreibung! + Dim opvorgangsbetrag As Double = 0 + Saldenaktualisierung(TYP, BETRAG, beleg, dec_sollsumme, dec_habensumme, MANDANT, Sollkonto2, Forderungskonto, Bestandskonto, Sachkonto, Erlöskonto, opvorgangsbetrag) + + '7/2 Schritt -> Saldenperiodenbuchungen (Salden-Fortschreibung)! + + For Each konto As DataRow In dt_Verbuchungskonten.Rows 'Schleifen2rec + If Not IsDBNull(konto("Soll")) AndAlso konto("Soll") <> 0 Or Not IsDBNull(konto("Haben")) AndAlso konto("Haben") <> 0 Then + periodenBuchungen(PERIODE, konto("Konto"), MANDANT, JAHR, konto("Soll"), konto("Haben")) + End If + Next + + '8. Schritt -> Offene Posten anlegen + createOP(MANDANT, BETRAG, beleg.BelegNr, beleg.BelegDat.ToShortDateString, beleg.BelegNr, Buchungstext, BUCHUNGSBETRAG, "EUR", Personenkonto, Forderungskonto, i_op_refid, Buchungstyp, c_sprache, c_zahlziel, dec_skonto, SkontoDatum, Nettodatum, c_ustidnr) + createOPVorgang(MANDANT, TYP, BETRAG, JAHR, PERIODE, i_beleg_refid, beleg.BelegDat.ToShortDateString, Buchungstext, Personenkonto, opvorgangsbetrag, i_op_refid, dt_creation, Sachkonto, "AUTO") + + End If + End If - Dim VERAG_SQL As New VERAG_PROG_ALLGEMEIN.SQL - - '2 - 'Default-Values - 'IF ISNULL(@Kassakonto, '') = '' SET @Kassakonto = '2700' - 'SET @Buchungsbelegkreis = 'KE' - 'If @Auszahlungsbetrag <> 0 SET @Buchungsbelegkreis = 'KA' - '3 - 'Anmerkung „Stornobuchung“, wenn Ein-/Auszahlung negativ. - '4 - 'Ermittelt Debitoren-Personenkonto (@i_personenkonto = Kundenkonto) und Durchbuchungskonto @i_fordkto (default 2000). - Dim Sollkonto As Integer = 0 - Dim Habenkonto As Integer = 0 - Dim kontenzaehler As Integer = 0 + End Function + + Private Shared Sub erstelleEBSalden(mandant As String, Jahr As Integer, Konto As Integer) + + Dim Zaehler As String = (New VERAG_PROG_ALLGEMEIN.SQL).getValueTxtBySqlVarList("Select COUNT([FIBU2].dbo.fibu_periodensaldo.i_konto) FROM [FIBU2].dbo.fibu_periodensaldo WHERE [FIBU2].dbo.fibu_periodensaldo.i_firm_refid = " & mandant & "And [FIBU2].dbo.fibu_periodensaldo.si_jahr =" & Jahr & " And [FIBU2].dbo.fibu_periodensaldo.i_konto = " & Konto, "FIBU",, "0") + Dim aktSAldo As String = (New VERAG_PROG_ALLGEMEIN.SQL).getValueTxtBySqlVarList("Select [FIBU2].dbo.fibu_konto.dec_aktuellersaldo FROM [FIBU2].dbo.fibu_konto WHERE [FIBU2].dbo.fibu_konto.i_firm_refid = " & mandant & " And [FIBU2].dbo.fibu_konto.i_konto = " & Konto, "FIBU",, "0") + If Zaehler = "" Or Zaehler = "0" Then + + If aktSAldo = "" Then aktSAldo = "0" + aktSAldo = aktSAldo.Replace(",", ".") + + + + '• Für alle dort enthaltenen Konten stellt es sicher, dass es im aktuellen Jahr Periodensalden in fibu_periodensaldo gibt (falls nicht, werden Null-EBs angelegt)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + Dim SQL_UPATE As String = "INSERT INTO [FIBU2].dbo.fibu_periodensaldo ( + i_firm_refid, si_jahr, i_konto, i_perioden, + dec_eroeff, dec_abschluss, + dec_soll_1, dec_haben_1, dec_soll_2, dec_haben_2, dec_soll_3, dec_haben_3, + dec_soll_4, dec_haben_4, dec_soll_5, dec_haben_5, dec_soll_6, dec_haben_6, + dec_soll_7, dec_haben_7, dec_soll_8, dec_haben_8, dec_soll_9, dec_haben_9, + dec_soll_10, dec_haben_10, dec_soll_11, dec_haben_11, dec_soll_12, dec_haben_12, + dec_soll_13, dec_haben_13, + eur_eroeff, eur_abschluss, + eur_soll_1, eur_haben_1, eur_soll_2, eur_haben_2, eur_soll_3, eur_haben_3, + eur_soll_4, eur_haben_4, eur_soll_5, eur_haben_5, eur_soll_6, eur_haben_6, + eur_soll_7, eur_haben_7, eur_soll_8, eur_haben_8, eur_soll_9, eur_haben_9, + eur_soll_10, eur_haben_10, eur_soll_11, eur_haben_11, eur_soll_12, eur_haben_12, + eur_soll_13, eur_haben_13, i_buchungskreis + ) + VALUES('" & mandant & "', '" & Jahr & "', '" & Konto & "', 0, " & aktSAldo & ", 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, " & aktSAldo & ", 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 1)" + + + Dim erstellt As Boolean = (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(SQL_UPATE, "FIBU") - If beleg.KundenNr > 0 Then - Habenkonto = beleg.KundenNr End If - Dim Forderungskonto As String = VERAG_SQL.getValueTxtBySqlVarList("SELECT i_fordkto FROM [FIBU2].dbo.fibu_konto WHERE [FIBU2].dbo.fibu_konto.i_konto = " & Habenkonto & " AND [FIBU2].dbo.fibu_konto.i_firm_refid = " & mandant, "FIBU",, "2000") - 'Baut eine temporäre Verbuchungskonten-Tabelle OWNTABLE_Verbuchungskonten: - Dim dt_Verbuchungskonten As New DataTable - dt_Verbuchungskonten.Columns.Add("Nr", GetType(Integer)) - dt_Verbuchungskonten.Columns.Add("Konto", GetType(Integer)) - dt_Verbuchungskonten.Columns.Add("Soll", GetType(Double)) - dt_Verbuchungskonten.Columns.Add("Haben", GetType(Double)) + End Sub - 'Einträge für Personenkonto und Durchbuchungskonto (Spalten für kumuliertes Soll/Haben). + Private Shared Sub insertBelegskopf(mandant As Integer, Jahr As Integer, periode As Integer, beleg_ref_id As Integer, datumKurz As String, BelegNr As String, BelegArt As String, Buchungstext As String, Belegkopfbetrag As Double, Waehrung As String, creationDate As String, Benutzer As String, ProtokollID As String) - Dim R1 As DataRow = dt_Verbuchungskonten.NewRow - R1("Nr") = 1 - R1("Konto") = Habenkonto - R1("Soll") = 1 - R1("Haben") = 1 - dt_Verbuchungskonten.Rows.Add(R1) - kontenzaehler += 1 - Dim R2 As DataRow = dt_Verbuchungskonten.NewRow - R2("Nr") = 1 - R2("Konto") = CInt(Forderungskonto) - R2("Soll") = 1 - R2("Haben") = 1 - dt_Verbuchungskonten.Rows.Add(R2) - kontenzaehler += 1 + Dim SQL_Insert = "INSERT INTO [FIBU2].dbo.fibu_belegkopf (i_firm_refid, si_jahr, si_periode, i_beleg_refid, d_beleg, c_urbelegid, si_belegart, c_buchtext, dec_betrag, c_waehrung, dec_fremdbetrag, eur_betrag, i_auftragid, d_gebucht, c_benutzer, i_buchungskreis, i_quelle_modul, c_quelle_maske, si_manipulation, i_stapel_refid, c_protokoll_id) + VALUES('" & mandant & "', " & Jahr & ", " & periode & ", " & beleg_ref_id & ", '" & datumKurz & "', '" & BelegNr & "', '" & BelegArt & "', '" & Buchungstext & "', " & Belegkopfbetrag & ", '" & Waehrung & "', " & Belegkopfbetrag & ", " & Belegkopfbetrag & ", 0, '" & creationDate & "', '" & Benutzer & "', 1, 21, 'Fleximport', 0, 2, '" & ProtokollID.Replace(",", ".") & "');" - Dim dt_Sollkonto As DataTable = VERAG_SQL.loadDgvBySql("SELECT top(1) isnull([FIBU2].dbo.fibu_konto.c_kontoart,'LE'), isnull([FIBU2].dbo.fibu_konto.i_kennung,0) FROM [FIBU2].dbo.fibu_konto WHERE [FIBU2].dbo.fibu_konto.i_konto = " & Sollkonto & " AND [FIBU2].dbo.fibu_konto.i_firm_refid = " & mandant, "FIBU") - Dim dt_Habenkonto As DataTable = VERAG_SQL.loadDgvBySql("SELECT TOP(1) isnull([FIBU2].dbo.fibu_konto.c_kontoart,'LE'), isnull([FIBU2].dbo.fibu_konto.i_kennung,0) FROM [FIBU2].dbo.fibu_konto WHERE [FIBU2].dbo.fibu_konto.i_konto = " & Habenkonto & " AND [FIBU2].dbo.fibu_konto.i_firm_refid = " & mandant, "FIBU") + Dim inserted As Boolean = (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(SQL_Insert, "FIBU") - Dim StapelAZK As String = VERAG_SQL.getValueTxtBySqlVarList("SELECT [FIBU2].dbo.fibu_stapelart.i_stapel_refid FROM [FIBU2].dbo.fibu_stapelart WHERE [FIBU2].dbo.fibu_stapelart.c_stapelname LIKE 'Auszahlungskasse 1' AND [FIBU2].dbo.fibu_stapelart.i_firm_refid = " & mandant, "FIBU",, "") - Dim Zaehler1 As String = VERAG_SQL.getValueTxtBySqlVarList("SELECT COUNT([FIBU2].dbo.fibu_stapel.i_lfdnr) FROM [FIBU2].dbo.fibu_stapel WHERE ISNULL([FIBU2].dbo.fibu_stapel.si_pruef, 0) > 0", "FIBU",, "0") - If CInt(Zaehler1) > 0 Then - StapelAZK = VERAG_SQL.getValueTxtBySqlVarList("SELECT [FIBU2].dbo.fibu_stapelart.i_stapel_refid FROM [FIBU2].dbo.fibu_stapelart WHERE [FIBU2].dbo.fibu_stapelart.c_stapelname LIKE 'Auszahlungskasse 2' AND [FIBU2].dbo.fibu_stapelart.i_firm_refid = " & mandant, "FIBU",, "") + End Sub + + Private Shared Sub insertBelegszeile(mandant As Integer, Jahr As Integer, periode As Integer, beleg_ref_id As Integer, datumKurz As String, BelegNr As String, BelegArt As String, Buchungstext As String, Buchungsbetrag As Double, Waehrung As String, ZeilenNr As Integer, ckennsoll2 As String, Sollkonto2 As Integer, Habenkonto2 As Integer, SollhabenKZ As String) + + Dim SQL_Insert = "INSERT INTO [FIBU2].dbo.fibu_belegzeile (i_firm_refid, si_jahr, si_periode, si_rel_periode, i_beleg_refid, i_zeilen_refid, c_kennung, i_konto, c_sollhabenkz, i_steuer_refid, i_gegenkonto, dec_betrag, c_waehrung, dec_fremdbetrag, eur_betrag, d_beleg, d_gebucht, c_urbelegid, si_belegart, c_buchtext, i_buchungskreis) + VALUES('" & mandant & "', " & Jahr & ", " & periode & ", " & periode & ", " & beleg_ref_id & ", " & ZeilenNr & ", '" & ckennsoll2 & "', " & Sollkonto2 & ", '" & SollhabenKZ & "', 0, " & Habenkonto2 & ", " & Buchungsbetrag & ", '" & Waehrung & "', " & Buchungsbetrag & ", " & Buchungsbetrag & ", '" & datumKurz & "', '" & datumKurz & "', '" & BelegNr & "','" & BelegArt & "', '" & Buchungstext & "', 1);" + + Dim inserted As Boolean = (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(SQL_Insert, "FIBU") + + + End Sub + + Private Shared Sub periodenBuchungen(periode As Integer, konto As Integer, Mandant As String, Jahr As Integer, Sollsumme As Double, HabenSumme As Double) + + If periode > 0 AndAlso periode < 13 Then + + Dim periodenSoll_SQL As String = "SELECT [FIBU2].dbo.fibu_periodensaldo.dec_soll_" & periode & " From [FIBU2].dbo.fibu_periodensaldo Where [FIBU2].dbo.fibu_periodensaldo.i_firm_refid = " & Mandant & " And [FIBU2].dbo.fibu_periodensaldo.si_jahr = " & Jahr & " And [FIBU2].dbo.fibu_periodensaldo.i_konto = " & konto + Dim periodenHaben_SQL As String = "SELECT [FIBU2].dbo.fibu_periodensaldo.dec_haben_" & periode & " From [FIBU2].dbo.fibu_periodensaldo Where [FIBU2].dbo.fibu_periodensaldo.i_firm_refid = " & Mandant & " And [FIBU2].dbo.fibu_periodensaldo.si_jahr = " & Jahr & " And [FIBU2].dbo.fibu_periodensaldo.i_konto = " & konto + + Dim periodenSoll = (New VERAG_PROG_ALLGEMEIN.SQL).getValueTxtBySqlVarList(periodenSoll_SQL, "FIBU") + Dim periodenHaben = (New VERAG_PROG_ALLGEMEIN.SQL).getValueTxtBySqlVarList(periodenHaben_SQL, "FIBU") + + Dim periodenSoll_DBl As Double = 0 + Dim periodenHaben_DBl As Double = 0 + + If periodenSoll <> "" AndAlso IsNumeric(periodenSoll) Then + periodenSoll_DBl = CDbl(periodenSoll) + End If + + If periodenHaben <> "" AndAlso IsNumeric(periodenHaben) Then + periodenHaben_DBl = CDbl(periodenHaben) + End If + + periodenSoll_DBl += Sollsumme + periodenHaben_DBl += HabenSumme + + Dim SQL_Update = "UPDATE [FIBU2].dbo.fibu_periodensaldo SET + [FIBU2].dbo.fibu_periodensaldo.dec_soll_" & periode & " = " & periodenSoll_DBl & ", + [FIBU2].dbo.fibu_periodensaldo.dec_haben_" & periode & " = " & periodenHaben_DBl & ", + [FIBU2].dbo.fibu_periodensaldo.eur_soll_" & periode & " = " & periodenSoll_DBl & ", + [FIBU2].dbo.fibu_periodensaldo.eur_haben_" & periode & " = " & periodenHaben_DBl & " + WHERE [FIBU2].dbo.fibu_periodensaldo.i_firm_refid = " & Mandant & " + And [FIBU2].dbo.fibu_periodensaldo.si_jahr = " & Jahr & " + And [FIBU2].dbo.fibu_periodensaldo.i_konto = " & konto + + Dim updated As Boolean = (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(SQL_Update, "FIBU") + + If konto = 2000 Then + Dim SQL_Update_2000 = "UPDATE [FIBU2].dbo.fibu_periodensaldodk SET + [FIBU2].dbo.fibu_periodensaldodk.dec_soll_" & periode & " = " & periodenSoll_DBl & ", + [FIBU2].dbo.fibu_periodensaldodk.dec_haben_" & periode & " = " & periodenHaben_DBl & ", + [FIBU2].dbo.fibu_periodensaldodk.eur_soll_" & periode & " = " & periodenSoll_DBl & ", + [FIBU2].dbo.fibu_periodensaldodk.eur_haben_" & periode & " = " & periodenHaben_DBl & " + WHERE [FIBU2].dbo.fibu_periodensaldodk.i_firm_refid = " & Mandant & " + And [FIBU2].dbo.fibu_periodensaldodk.si_jahr = " & Jahr & " + And [FIBU2].dbo.fibu_periodensaldodk.i_konto = " & konto + + Dim updated_2000 As Boolean = (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(SQL_Update_2000, "FIBU") + + End If + End If - Dim ZSBuchnr As String = VERAG_SQL.getValueTxtBySqlVarList("SELECT MAX([FIBU2].dbo.fibu_stapel.i_lfdnr)+1 FROM [FIBU2].dbo.fibu_stapel WHERE [FIBU2].dbo.fibu_stapel.i_firm_refid = " & mandant & " AND [FIBU2].dbo.fibu_stapel.i_stapel_refid = " & StapelAZK, "FIBU",, "0") + End Sub - If ZSBuchnr = "" Or ZSBuchnr = "0" Then - ZSBuchnr = "1" + Private Shared Sub getDEBDaten(Mandant As String, DebKonto As Integer, c_sprache As String, c_ustidnr As String, c_zahlziel As String, si_tage As Integer, dec_skonto As Integer, si_ntage As Integer, SkontoDatum As Date, Nettodatum As Date) + + Dim dtKontoinfo As DataTable = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql("SELECT c_sprache,c_ustidnr,c_zahlziel FROM [FIBU2].dbo.fibu_konto WHERE [FIBU2].dbo.fibu_konto.i_konto = " & DebKonto & " And [FIBU2].dbo.fibu_konto.i_firm_refid = " & Mandant, "FIBU") + + If dtKontoinfo.Rows.Count = 1 Then + c_sprache = IIf(IsDBNull(dtKontoinfo.Rows(0).Item("si_tage")), "DE", dtKontoinfo.Rows(0).Item("si_tage")) + c_ustidnr = IIf(IsDBNull(dtKontoinfo.Rows(0).Item("c_ustidnr")), "", dtKontoinfo.Rows(0).Item("c_ustidnr")) + c_zahlziel = IIf(IsDBNull(dtKontoinfo.Rows(0).Item("c_zahlziel")), "", dtKontoinfo.Rows(0).Item("c_zahlziel")) End If - Dim ProtokollID As String = "" + Dim dt_skontoInfo As DataTable = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql("Select si_tage, dec_skonto, si_ntage FROM [FIBU2].dbo.fibu_zahlziel WHERE [FIBU2].dbo.fibu_zahlziel.i_firm_refid = " & Mandant & " And [FIBU2].dbo.fibu_zahlziel.c_zahlziel '" & c_zahlziel & "'", "FIBU") - '(CAST(@StapelAZK AS VARCHAR(4)) + '-' + CAST(@ZSBuchnr AS VARCHAR(4)) + '-' + @C_Anno + '-' + REPLICATE('0', 2-LEN(@C_Monat)) + @C_Monat + '-' + REPLICATE('0', 2-LEN(@C_Tag)) + @C_Tag + ' ' + REPLICATE('0', 2-LEN(@C_Stunde)) + @C_Stunde + ':' + REPLICATE('0', 2-LEN(@C_Minute)) + @C_Minute + ':' + REPLICATE('0', 2-LEN(@C_Sekunde)) + @C_Sekunde) + If dt_skontoInfo.Rows.Count = 1 Then + si_tage = IIf(IsDBNull(dt_skontoInfo.Rows(0).Item("si_tage")), 0, CInt(dt_skontoInfo.Rows(0).Item("si_tage"))) + dec_skonto = IIf(IsDBNull(dt_skontoInfo.Rows(0).Item("dec_skonto")), 0, CInt(dt_skontoInfo.Rows(0).Item("dec_skonto"))) + si_ntage = IIf(IsDBNull(dt_skontoInfo.Rows(0).Item("si_ntage")), 0, CInt(dt_skontoInfo.Rows(0).Item("si_ntage"))) + End If - Dim pruef As Integer = 0 - Dim ZSzeilenr As Integer = 0 - Dim Belegart As Integer = 1 - Dim Splitart As Integer = 0 + SkontoDatum = SkontoDatum.AddDays(dec_skonto) 'SET @Skontodatum = DATEADD(DAY, @Skontotage, @gDatumKurz) + Nettodatum = Nettodatum.AddDays(si_tage) 'SET @Nettodatum = DATEADD(DAY, @Nettotage, @gDatumKurz) + + End Sub - '• Für alle dort enthaltenen Konten stellt es sicher, dass es im aktuellen Jahr Periodensalden in fibu_periodensaldo gibt (falls nicht, werden Null-EBs angelegt)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + Private Shared Sub Saldenaktualisierung(TYP As String, Betrag As Double, Beleg As EABeleg, dec_sollsumme As Double, dec_habensumme As Double, Mandant As String, Sollkonto2 As Integer, Forderungskonto As Integer, Bestandskonto As Integer, Sachkonto As Integer, ErloeskontoBeiAuszahlung As Integer, opvorgangsbetrag As Double) - For Each p As EABelegPositionen In beleg.POS + Dim dec_aktuellersaldo As Double = 0 + Dim eur_aktuellersaldo As Double = 0 - Dim dtBetraege = SQL.loadDgvBySql(" SELECT isnull(Sum(tblEABelegposition.Betrag),0) AS Nettobetrag, " & - " isnull(Sum(CASE WHEN [Steuerpflichtig]=1 THEN [Betrag] ELSE 0 END),0) AS SteuerpflichtigerBetrag, " & - " isnull(Sum(cast((CASE WHEN [Steuerpflichtig]=1 THEN [Betrag] ELSE 0 END)* [Steuersatz] as decimal(8,2))),0) AS SteuerBetrag, " & - " isnull(Sum(tblEABelegposition.Betrag+cast((CASE WHEN [Steuerpflichtig]=1 THEN [Betrag] ELSE 0 END)* [Steuersatz] as decimal(8,2))),0) AS Bruttobetrag " & - " FROM tblEABelegnummer INNER JOIN tblSteuersätze ON tblEABelegnummer.Steuerschlüssel = tblSteuersätze.Nr INNER JOIN tblEABelegposition INNER JOIN Leistungen ON tblEABelegposition.LeistungsNr = Leistungen.LeistungsNr ON tblEABelegnummer.Mandant = tblEABelegposition.Mandant AND tblEABelegnummer.Niederlassung = tblEABelegposition.Niederlassung AND tblEABelegnummer.Benutzer = tblEABelegposition.Benutzer AND tblEABelegnummer.BelegDat = tblEABelegposition.BelegDat AND tblEABelegnummer.BelegNr = tblEABelegposition.BelegNr " & - " WHERE tblEABelegposition.Mandant='" & beleg.Mandant & "' AND tblEABelegposition.Niederlassung='" & beleg.Niederlassung & "' AND tblEABelegposition.Benutzer='" & beleg.Benutzer & "' AND tblEABelegposition.BelegDat='" & beleg.BelegDat.ToShortDateString & "' AND tblEABelegposition.BelegNr='" & beleg.BelegNr & "'", "FMZOLL") + '----------FORDERUNGSKONTO------------------- - Dim Bruttobetrag As Double = dtBetraege.Rows(0)("Bruttobetrag") - Dim Nettobetrag As Double = dtBetraege.Rows(0)("Nettobetrag") - Dim SteuerBetrag As Double = dtBetraege.Rows(0)("SteuerBetrag") + Dim dt_SaldoInfo_Forderungskonto As DataTable = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql("(SELECT dec_aktuellersaldo,dec_sollsumme,dec_habensumme,eur_aktuellersaldo From [FIBU2].dbo.fibu_konto Where [FIBU2].dbo.fibu_konto.i_firm_refid = " & Mandant & " And [FIBU2].dbo.fibu_konto.i_konto =" & Forderungskonto, "FIBU") + If dt_SaldoInfo_Forderungskonto.Rows.Count = 1 Then + dec_aktuellersaldo = IIf(IsDBNull(dt_SaldoInfo_Forderungskonto.Rows(0).Item("dec_aktuellersaldo")), 0, CDbl(dt_SaldoInfo_Forderungskonto.Rows(0).Item("dec_aktuellersaldo"))) + eur_aktuellersaldo = IIf(IsDBNull(dt_SaldoInfo_Forderungskonto.Rows(0).Item("eur_aktuellersaldo")), 0, CDbl(dt_SaldoInfo_Forderungskonto.Rows(0).Item("eur_aktuellersaldo"))) + dec_sollsumme = IIf(IsDBNull(dt_SaldoInfo_Forderungskonto.Rows(0).Item("dec_sollsumme")), 0, CDbl(dt_SaldoInfo_Forderungskonto.Rows(0).Item("dec_sollsumme"))) + dec_habensumme = IIf(IsDBNull(dt_SaldoInfo_Forderungskonto.Rows(0).Item("dec_habensumme")), 0, CDbl(dt_SaldoInfo_Forderungskonto.Rows(0).Item("dec_habensumme"))) + End If - '• Einzahlung (@B_Bruttobetrag >= 0) - ' o Erste Zeile: Soll = Bestandskonto(KO), Betrag = @P_Bruttobetrag * (-1) (Vorzeichentricks wegen Gutschriftlogik), Haben leer. - '• Auszahlung (@B_Bruttobetrag < 0) - ' o Erste Zeile: Soll = Erlöskonto(KO), Betrag = @P_Bruttobetrag (positiv), Haben leer. - ' o Zweite Zeile (nur bei Auszahlung): Haben = Bestandskonto(KO), Betrag = @P_Bruttobetrag. + If TYP = "EINZAHLUNG" Then + + If Betrag > 0 Then + + dec_aktuellersaldo = (dec_aktuellersaldo - Betrag) + dec_sollsumme = (dec_sollsumme - 0) + dec_habensumme = (dec_habensumme + Betrag) + eur_aktuellersaldo = (eur_aktuellersaldo - Betrag) + End If - kontenzaehler += 1 + ElseIf TYP = "AUSZAHLUNG" Then - If Bruttobetrag >= 0 Then - Dim R_POS As DataRow = dt_Verbuchungskonten.NewRow - R_POS("Nr") = kontenzaehler - R_POS("Konto") = dtBetraege.Rows(0)("Gegenkonto") - R_POS("Soll") = 0 - R_POS("Haben") = 0 - dt_Verbuchungskonten.Rows.Add(R_POS) - Else - Dim R_POS As DataRow = dt_Verbuchungskonten.NewRow - R_POS("Nr") = kontenzaehler - R_POS("Konto") = dtBetraege.Rows(0)("Gegenkonto") - R_POS("Soll") = 0 - R_POS("Haben") = 0 - dt_Verbuchungskonten.Rows.Add(R_POS) + If Betrag > 0 Then + + dec_aktuellersaldo = (dec_aktuellersaldo - Betrag) + dec_sollsumme = (dec_sollsumme - Betrag) + dec_habensumme = (dec_habensumme + 0) + eur_aktuellersaldo = (eur_aktuellersaldo - Betrag) + + End If + + End If + + SQL.doSQL("UPDATE [FIBU2].dbo.fibu_konto SET d_lebudat ='" & Beleg.BelegDat.ToShortDateString & "', dec_aktuellersaldo = " & dec_aktuellersaldo & ", dec_sollsumme = " & dec_sollsumme & ", dec_habensumme = " & dec_sollsumme & ", eur_aktuellersaldo = " & eur_aktuellersaldo & " WHERE [FIBU2].dbo.fibu_konto.i_firm_refid = " & Mandant & " And [FIBU2].dbo.fibu_konto.i_konto =" & Forderungskonto, "FIBU") + + + '----------BESTANDSKONTO------------------- + + Dim dt_SaldoInfo_Bestandskonto As DataTable = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql("(SELECT dec_aktuellersaldo,dec_sollsumme,dec_habensumme,eur_aktuellersaldo From [FIBU2].dbo.fibu_konto Where [FIBU2].dbo.fibu_konto.i_firm_refid = " & Mandant & " And [FIBU2].dbo.fibu_konto.i_konto =" & Bestandskonto, "FIBU") + If dt_SaldoInfo_Bestandskonto.Rows.Count = 1 Then + dec_aktuellersaldo = IIf(IsDBNull(dt_SaldoInfo_Bestandskonto.Rows(0).Item("dec_aktuellersaldo")), 0, CDbl(dt_SaldoInfo_Bestandskonto.Rows(0).Item("dec_aktuellersaldo"))) + eur_aktuellersaldo = IIf(IsDBNull(dt_SaldoInfo_Bestandskonto.Rows(0).Item("eur_aktuellersaldo")), 0, CDbl(dt_SaldoInfo_Bestandskonto.Rows(0).Item("eur_aktuellersaldo"))) + dec_sollsumme = IIf(IsDBNull(dt_SaldoInfo_Bestandskonto.Rows(0).Item("dec_sollsumme")), 0, CDbl(dt_SaldoInfo_Bestandskonto.Rows(0).Item("dec_sollsumme"))) + dec_habensumme = IIf(IsDBNull(dt_SaldoInfo_Bestandskonto.Rows(0).Item("dec_habensumme")), 0, CDbl(dt_SaldoInfo_Bestandskonto.Rows(0).Item("dec_habensumme"))) + End If + + If TYP = "EINZAHLUNG" Then + + If Betrag <> 0 Then + + dec_aktuellersaldo = (dec_aktuellersaldo + Betrag) + dec_sollsumme = (dec_sollsumme + Betrag) + dec_habensumme = (dec_habensumme + 0) + eur_aktuellersaldo = (eur_aktuellersaldo + Betrag) End If - Next + + + ElseIf TYP = "AUSZAHLUNG" Then + + If Betrag <> 0 Then + + dec_aktuellersaldo = (dec_aktuellersaldo + Betrag) + dec_sollsumme = (dec_sollsumme - 0) + dec_habensumme = (dec_habensumme - Betrag) + eur_aktuellersaldo = (eur_aktuellersaldo + Betrag) + + + End If + + End If + + SQL.doSQL("UPDATE [FIBU2].dbo.fibu_konto SET d_lebudat ='" & Beleg.BelegDat.ToShortDateString & "', dec_aktuellersaldo = " & dec_aktuellersaldo & ", dec_sollsumme = " & dec_sollsumme & ", dec_habensumme = " & dec_sollsumme & ", eur_aktuellersaldo = " & eur_aktuellersaldo & " WHERE [FIBU2].dbo.fibu_konto.i_firm_refid = " & Mandant & " And [FIBU2].dbo.fibu_konto.i_konto =" & Bestandskonto, "FIBU") + + + '----------BESTANDSKONTO------------------- + + Dim dt_SaldoInfo_Sachkonto As DataTable = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql("(SELECT dec_aktuellersaldo,dec_sollsumme,dec_habensumme,eur_aktuellersaldo From [FIBU2].dbo.fibu_konto Where [FIBU2].dbo.fibu_konto.i_firm_refid = " & Mandant & " And [FIBU2].dbo.fibu_konto.i_konto =" & Sachkonto, "FIBU") + If dt_SaldoInfo_Sachkonto.Rows.Count = 1 Then + dec_aktuellersaldo = IIf(IsDBNull(dt_SaldoInfo_Sachkonto.Rows(0).Item("dec_aktuellersaldo")), 0, CDbl(dt_SaldoInfo_Sachkonto.Rows(0).Item("dec_aktuellersaldo"))) + eur_aktuellersaldo = IIf(IsDBNull(dt_SaldoInfo_Sachkonto.Rows(0).Item("eur_aktuellersaldo")), 0, CDbl(dt_SaldoInfo_Sachkonto.Rows(0).Item("eur_aktuellersaldo"))) + dec_sollsumme = IIf(IsDBNull(dt_SaldoInfo_Sachkonto.Rows(0).Item("dec_sollsumme")), 0, CDbl(dt_SaldoInfo_Sachkonto.Rows(0).Item("dec_sollsumme"))) + dec_habensumme = IIf(IsDBNull(dt_SaldoInfo_Sachkonto.Rows(0).Item("dec_habensumme")), 0, CDbl(dt_SaldoInfo_Sachkonto.Rows(0).Item("dec_habensumme"))) + End If + + + SQL.doSQL("UPDATE [FIBU2].dbo.fibu_konto SET d_lebudat ='" & Beleg.BelegDat.ToShortDateString & "', dec_aktuellersaldo = " & dec_aktuellersaldo & ", dec_sollsumme = " & dec_sollsumme & ", dec_habensumme = " & dec_sollsumme & ", eur_aktuellersaldo = " & eur_aktuellersaldo & " WHERE [FIBU2].dbo.fibu_konto.i_firm_refid = " & Mandant & " And [FIBU2].dbo.fibu_konto.i_konto =" & Sachkonto, "FIBU") + + + + If TYP = "AUSZAHLUNG" Then + + If Betrag <> 0 Then + + 'Erlöskonto bei Auszahlung + + Dim dt_SaldoInfo_ErloeskontoBeiAuszahlung As DataTable = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql("(SELECT dec_aktuellersaldo,dec_sollsumme,dec_habensumme,eur_aktuellersaldo From [FIBU2].dbo.fibu_konto Where [FIBU2].dbo.fibu_konto.i_firm_refid = " & Mandant & " And [FIBU2].dbo.fibu_konto.i_konto =" & ErloeskontoBeiAuszahlung, "FIBU") + If dt_SaldoInfo_ErloeskontoBeiAuszahlung.Rows.Count = 1 Then + dec_sollsumme = IIf(IsDBNull(dt_SaldoInfo_ErloeskontoBeiAuszahlung.Rows(0).Item("dec_sollsumme")), 0, CDbl(dt_SaldoInfo_ErloeskontoBeiAuszahlung.Rows(0).Item("dec_sollsumme"))) + dec_habensumme = IIf(IsDBNull(dt_SaldoInfo_ErloeskontoBeiAuszahlung.Rows(0).Item("dec_habensumme")), 0, CDbl(dt_SaldoInfo_ErloeskontoBeiAuszahlung.Rows(0).Item("dec_habensumme"))) + End If + + dec_sollsumme = (dec_sollsumme - Betrag) + dec_habensumme = (dec_habensumme - Betrag) + + SQL.doSQL("UPDATE [FIBU2].dbo.fibu_konto SET d_lebudat ='" & Beleg.BelegDat.ToShortDateString & "', dec_sollsumme = " & dec_sollsumme & ", dec_habensumme = " & dec_sollsumme & " WHERE [FIBU2].dbo.fibu_konto.i_firm_refid = " & Mandant & " And [FIBU2].dbo.fibu_konto.i_konto =" & ErloeskontoBeiAuszahlung, "FIBU") + + End If + + End If + + + + 'SET @updatekonto = CAST(@Kontonummer AS INTEGER) + + Dim dt_SaldoInfo_Kontonummer As DataTable = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql("(SELECT dec_aktuellersaldo,dec_sollsumme,dec_habensumme,eur_aktuellersaldo From [FIBU2].dbo.fibu_konto Where [FIBU2].dbo.fibu_konto.i_firm_refid = " & Mandant & " And [FIBU2].dbo.fibu_konto.i_konto =" & Sachkonto, "FIBU") + If dt_SaldoInfo_Kontonummer.Rows.Count = 1 Then + dec_aktuellersaldo = IIf(IsDBNull(dt_SaldoInfo_Kontonummer.Rows(0).Item("dec_aktuellersaldo")), 0, CDbl(dt_SaldoInfo_Kontonummer.Rows(0).Item("dec_aktuellersaldo"))) + eur_aktuellersaldo = IIf(IsDBNull(dt_SaldoInfo_Kontonummer.Rows(0).Item("eur_aktuellersaldo")), 0, CDbl(dt_SaldoInfo_Kontonummer.Rows(0).Item("eur_aktuellersaldo"))) + dec_sollsumme = IIf(IsDBNull(dt_SaldoInfo_Kontonummer.Rows(0).Item("dec_sollsumme")), 0, CDbl(dt_SaldoInfo_Kontonummer.Rows(0).Item("dec_sollsumme"))) + dec_habensumme = IIf(IsDBNull(dt_SaldoInfo_Kontonummer.Rows(0).Item("dec_habensumme")), 0, CDbl(dt_SaldoInfo_Kontonummer.Rows(0).Item("dec_habensumme"))) + End If + + + + If TYP = "EINZAHLUNG" Then + + If Betrag <> 0 Then + + + dec_aktuellersaldo = (dec_aktuellersaldo - Betrag) + dec_sollsumme = (dec_sollsumme + 0) + dec_habensumme = (dec_habensumme + Betrag) + eur_aktuellersaldo = (eur_aktuellersaldo - Betrag) + opvorgangsbetrag = Betrag * (-1) + + + End If - 'INSERT INTO OWNTABLE_Verbuchungskonten ( - 'OWNFIELD_Nr, - 'OWNFIELD_Konto, - 'OWNFIELD_Soll, - 'OWNFIELD_Haben) - 'VALUES ( - '@Kontenzähler, - '@BestandskontoInt, - '0, - '0) + ElseIf TYP = "AUSZAHLUNG" Then - 'SET @Kontenzähler = (@Kontenzähler + 1) + If Betrag <> 0 Then - 'INSERT INTO OWNTABLE_Verbuchungskonten ( - 'OWNFIELD_Nr, - 'OWNFIELD_Konto, - 'OWNFIELD_Soll, - 'OWNFIELD_Haben) - 'VALUES ( - '@Kontenzähler, - '@ErlöskontoInt, - '0, - '0) + dec_aktuellersaldo = (dec_aktuellersaldo - Betrag) + dec_sollsumme = (dec_sollsumme - Betrag) + dec_habensumme = (dec_habensumme - 0) + eur_aktuellersaldo = (eur_aktuellersaldo - Betrag) + opvorgangsbetrag = Betrag * (-1) / CDbl(2) + + End If + + End If + + SQL.doSQL("UPDATE [FIBU2].dbo.fibu_konto SET d_lebudat ='" & Beleg.BelegDat.ToShortDateString & "', dec_aktuellersaldo = " & dec_aktuellersaldo & ", dec_sollsumme = " & dec_sollsumme & ", dec_habensumme = " & dec_sollsumme & ", eur_aktuellersaldo = " & eur_aktuellersaldo & " WHERE [FIBU2].dbo.fibu_konto.i_firm_refid = " & Mandant & " And [FIBU2].dbo.fibu_konto.i_konto =" & Bestandskonto, "FIBU") - 'Cursor lc_ProjekteRec über alle Pos. (Typ 1, Barverkauf) mit Artikel-Konten: - 'o Fügt für jedes Bestandskonto und Erlöskonto je einen Eintrag in OWNTABLE_Verbuchungskonten hinzu. - 'o Cursor Schleifen1rec: Stellt sicher, dass in [FIBU2].dbo.fibu_periodensaldo (und ggf. …saldodk für 2000) Eröffnungszeilen existieren (bei Bedarf INSERT mit EB-Werten). + End Sub - '5 - 'Baut @Buchungstext_orig = KE_/KA_ + Pos-Nr + _LKW_AuszFirma_Fahrer_Passnr, split in - 'o @Buchungstext (48 Zeichen, in die Zeile), - 'o @BuchungstextBemerkung (restliche 28 Zeichen, in Bemerk). + Private Shared Sub createOP(mandant As Integer, Betrag As Double, BelegNrText As String, datumKurz As String, BelegNr As String, Buchungstext As String, Buchungsbetrag As Double, Waehrung As String, Personenkonto As Integer, Forderungskonto As Integer, i_op_refid As String, c_op_Typ As Char, Sprache As String, Zahlungsziel As String, Skonto As String, Skontodatum As String, Nettodatum As String, c_ustidnr As String) - 'Ermittelt Buchungsweg aus Benutzer.OWNFIELD_Buchungsweg: - '2 = Stapel, 3 = Direkt. - Boolean - 'Außerdem unterscheidet das Script zwei Fälle: - 'o Einzahlung (@Einzahlungsbetrag <> 0): Kasse/Bestand im Soll, Kunde im Haben. - 'o Auszahlung (@Auszahlungsbetrag <> 0): umgekehrte Logik, teils mit Vorzeichenwechseln. - '________________________________________ + 'OPs + Dim SQL_Insert_DEBITOR = "INSERT INTO [FIBU2].dbo.op_debitor (i_firm_refid, i_op_refid, c_urbelegid, i_personenkonto, i_forderungskonto, c_rechnungid, d_rechnung, d_valuta, c_typ, c_sprache, c_waehrung, dec_eigenbrutto, dec_fremdbrutto, eur_bruttobetrag, dec_skf_eigen, dec_skf_fremd, eur_skontierfaehig, dec_eigenzahlung, dec_fremdzahlung, eur_zahlung, c_zahlziel, dec_skonto, d_skonto, dec_skonto2, d_netto, si_mahnstufe, i_mahnlauf_refid, si_exportiert, i_stapel_refid, i_stapel_lfdnr, dec_stpl_ew_betrag, dec_stpl_ew_skonto, dec_stpl_fw_betrag, dec_stpl_fw_skonto, eur_stpl_betrag, eur_stpl_skonto, i_clearing, i_eigene_bank, si_bankeinzug, c_bemerkung, lc_anmerkungen, i_zessionstext, i_buchungskreis, c_ustidnr) + VALUES(" & mandant & "," & i_op_refid & ", " & BelegNrText & ", " & Personenkonto & ", " & Forderungskonto & ", " & BelegNrText & ", " & datumKurz & ", " & datumKurz & ", " & c_op_Typ & ", '" & Sprache & "', '" & Waehrung & "', " & Betrag & " * (-1), " & Betrag & " * (-1), " & Betrag & " * (-1), " & Betrag & " * (-1), " & Betrag & " * (-1), " & Betrag & " * (-1), 0, 0, 0, " & Zahlungsziel & ", '" & Skonto & "', '" & Skontodatum & "', 0,'" & Nettodatum & "', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '" & Buchungstext & "', '" & Buchungstext & "', 0, 1, '" & c_ustidnr & "');" + Dim insertedDEB As Boolean = (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(SQL_Insert_DEBITOR, "FIBU") + End Sub - 'If Stapelbuchung Then + Private Shared Sub createOPVorgang(mandant As Integer, TYP As String, Betrag As Double, Jahr As Integer, periode As Integer, beleg_ref_id As Integer, datumKurz As String, Buchungstext As String, Personenkonto As Integer, opvorgangsbetrag As Double, i_op_refid As String, dt_creation As String, Sachkonto As Integer, Benutzer As String) - ' If beleg.Beleg_TYP = "L" Then '=Leihgeld + 'OP-Vorgänge - ' Dim SQL_Insert As String = "INSERT INTO [FIBU2].dbo.fibu_stapel (i_firm_refid,i_stapel_refid,i_lfdnr,si_zeilenr,si_belegart,si_splitart,d_beleg,d_valuta,c_urbelegid,c_op_beleg,c_buchtext,si_jahr,si_periode,i_sollkonto,c_kennungsoll,i_kennungsoll,i_habenkonto,c_kennunghaben,i_kennunghaben,dec_betrag,c_waehrung,dec_eigenbetrag,eur_betrag,i_gegenkonto,i_steuerart_refid,i_steuer_refid,i_eg_gegenkonto,c_sollhabenkz,dec_steuer,dec_eigensteuer,eur_steuerbetrag,dec_steuerproz,i_auftragid,i_koart_refid,si_pruef,c_bemerk,i_buchungskreis,i_bank_flags,i_quelle_modul,c_quelle_maske,si_manipulation,dt_creation,c_protokoll_id) - ' VALUES( - ' '" & mandant & "', - ' @StapelAZK, - ' @ZSBuchnr, - ' @ZSzeilenr, - ' @Belegart, - ' @Splitart, - ' @belegdatum, - ' @belegdatum, - ' @belegnrtext, - ' @belegnrtext, - ' '" & Buchungstext & "', - ' @Jahr, - ' @Periode, - ' @Sollkonto2, - ' @ckennsoll2, - ' @kkennungsoll2, - ' @Habenkonto2, - ' @ckennhab2, - ' @kkennunghab2, - ' @Buchungsbetrag_P, - ' @Waehrung, - ' 0, - ' @Buchungsbetrag_P, - ' 0, - ' 0, - ' 0, - ' 0, - ' 'K', - ' 0, - ' 0, - ' 0, - ' @dec_steuerproz2, - ' 0, - ' 0, - ' @pruef, - ' " & BuchungstextBemerkung & ", - ' 1, - ' 0, - ' 21, - ' 'FlexImport', - ' 0, - ' '" & Now() & "', - ' @c_protokoll_id)" - - ' Else - - ' End If - - 'End If + Dim SQL_Insert_V_DEB = "INSERT INTO [FIBU2].dbo.op_vorgang_deb (i_firm_refid, i_personenkonto, i_op_refid, i_beleg_refid, c_vorgang, d_beleg, si_rel_periode, si_jahr, i_steuer_refid, dec_steuerproz, i_nne_az_konto, dec_nettobetrag, dec_steuerbetrag, eur_nettobetrag, eur_steuerbetrag, dec_fremdbetrag, si_skontierfaehig, si_zeilen_refid, c_bemerkung, dt_datum, c_benutzer, i_eg_konto, i_auftrag_refid, dec_naf_steuerbetr, eur_naf_steuerbetr) + VALUES (" & mandant & ", " & Personenkonto & ", " & i_op_refid & ", " & beleg_ref_id & ", 'P', " & datumKurz & ", " & periode & ", " & Jahr & ", 0, 0, " & Sachkonto & ", " & opvorgangsbetrag & ", 0, " & opvorgangsbetrag & ", 0, " & opvorgangsbetrag & ", 1, 1, '" & Buchungstext & "', '" & dt_creation & "', '" & Benutzer & "', 0, 0, 0, 0);" + Dim insertedV_DEB As Boolean = (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(SQL_Insert_V_DEB, "FIBU") + If TYP = "AUSZAHLUNG" Then + + If Betrag <> 0 Then + + 'if auszahlungsbetrag <> 0 THen + Dim SQL_Insert_V_DEB2 = "INSERT INTO [FIBU2].dbo.op_vorgang_deb (i_firm_refid, i_personenkonto, i_op_refid, i_beleg_refid, c_vorgang, d_beleg, si_rel_periode, si_jahr, i_steuer_refid, dec_steuerproz, i_nne_az_konto, dec_nettobetrag, dec_steuerbetrag, eur_nettobetrag, eur_steuerbetrag, dec_fremdbetrag, si_skontierfaehig, si_zeilen_refid, c_bemerkung, dt_datum, c_benutzer, i_eg_konto, i_auftrag_refid, dec_naf_steuerbetr, eur_naf_steuerbetr) + VALUES (" & mandant & ", " & Personenkonto & ", " & i_op_refid & ", " & beleg_ref_id & ", 'P', " & datumKurz & ", " & periode & ", " & Jahr & ", 0, 0, " & Sachkonto & ", " & opvorgangsbetrag & ", 0, " & opvorgangsbetrag & ", 0, " & opvorgangsbetrag & ", 1, 5, '" & Buchungstext & "', '" & dt_creation & "', '" & Benutzer & "', 0, 0, 0, 0);" + + Dim insertedV_DEB2 As Boolean = (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(SQL_Insert_V_DEB2, "FIBU") + + End If + End If + + End Sub + + Private Shared Function checkifgebucht(mandant As Integer, belegnrtext As String, PosText As String) As Boolean + + Dim checkDS As String = "Select Case COUNT(fbz.i_beleg_refid) From [FIBU2].dbo.fibu_belegzeile AS fbz Where fbz.i_firm_refid = " & mandant & " And fbz.c_urbelegid Like '" & belegnrtext & "' And fbz.c_buchtext Like ('%'" & PosText & "'%')" + + If checkDS <> "" AndAlso IsNumeric(checkDS) AndAlso CInt(checkDS) >= 3 Then + Return True + Else + Return False + + End If End Function End Class diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 87b3523b..9e2036ff 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -352,6 +352,7 @@ Public Class cFakturierung Select Case RECHNUNG.RechnungSprache Case "EN" : strZahlbar = "Terms of Payment: " & ZZTage & " days as of document date" Case "RO" : strZahlbar = "Termen de plata: " & ZZTage & " zile de la data emiterii facturii" + Case "TR" : strZahlbar = "ödeme tarihi: " & ZZTage & " gün fatura tarihinden itibaren" Case Else : strZahlbar = "Zahlungsziel: " & ZZTage & " Tage ab Rechnungsdatum" 'Case "EN" : strZahlbar = "Payable within " & ZZTage & " days from date of invoice." 'Case Else : strZahlbar = "Zahlbar innerhalb " & ZZTage & " Tagen ab Rechnungsdatum." @@ -2327,34 +2328,26 @@ Public Class cFakturierung rpt.lblLeistungUeberschrift.Alignment = GrapeCity.ActiveReports.Document.Section.TextAlignment.Left Select Case RECHNUNG.RechnungSprache - ' Case "EN" - ' rpt.lblLeistungUeberschrift.Text = "Inv. No." - ' rpt.lblAnzahlUeberschrift.Text = "OD days" - ' rpt.lblSteuerpflichtigUeberschrift.Text = "Payment Amount" - ' rpt.lblSteuerfreiUeberschrift.Text = "Default Interest" - ' 'rpt.lbl_onlyZR_ZinsenUeberschrift.Text = "Interest p.a." + Case "EN" - ' Case "TR" + rpt.txtSendungsdaten.Text = rpt.txtSendungsdaten.Text.Replace("NACHBERECHNUNG VON VERZUGSZINSEN", "CHARGING OF DEFAULT INTEREST") + rpt.txtSendungsdaten.Text = rpt.txtSendungsdaten.Text.Replace("Zahlungen von", "Payments from") - ' rpt.lblLeistungUeberschrift.Text = "Belge" - ' rpt.lblAnzahlUeberschrift.Text = "Günler" - ' rpt.lblSteuerpflichtigUeberschrift.Text = "Ödeme tutarı" - ' rpt.lblSteuerfreiUeberschrift.Text = "Geç ödeme faizi" - ' ' rpt.lbl_onlyZR_ZinsenUeberschrift.Text = "Zinsen p.a." + Case "TR" - ' Case "RO" + rpt.txtSendungsdaten.Text = rpt.txtSendungsdaten.Text.Replace("NACHBERECHNUNG VON VERZUGSZINSEN", "TEMERRÃœT FAÄ°ZÄ°NÄ°N YENÄ°DEN HESAPLANMASI") + rpt.txtSendungsdaten.Text = rpt.txtSendungsdaten.Text.Replace("Zahlungen von", "tarihleri ​​arasında yapılan ödemeler") - ' rpt.lblLeistungUeberschrift.Text = "Nr. fact." - ' rpt.lblAnzahlUeberschrift.Text = "Nr. zile" - ' rpt.lblSteuerpflichtigUeberschrift.Text = "Suma de plata" - ' rpt.lblSteuerfreiUeberschrift.Text = "Penalitati" - ' 'rpt.lbl_onlyZR_ZinsenUeberschrift.Text = "Dobândă p.a." + Case "RO" + + rpt.txtSendungsdaten.Text = rpt.txtSendungsdaten.Text.Replace("NACHBERECHNUNG VON VERZUGSZINSEN", "CALCUL MAJORARI PENTRU INTARZIERE LA PLATA") + rpt.txtSendungsdaten.Text = rpt.txtSendungsdaten.Text.Replace("Zahlungen von", "Perioda") Case Else rpt.lblLeistungUeberschrift.Text = "RENR" rpt.lblAnzahlUeberschrift.Text = "VZ Tage" - rpt.lblSteuerpflichtigUeberschrift.Text = "Zahlungsbetrag" + rpt.lblSteuerpflichtigUeberschrift.Text = "Zahlungsbetrag" rpt.lblSteuerfreiUeberschrift.Text = "Verzugszinsen" 'rpt.lbl_onlyZR_ZinsenUeberschrift.Text = "Zinsen p.a." End Select @@ -2363,13 +2356,11 @@ Public Class cFakturierung rpt.lblSteuerpflichtigUeberschrift.Alignment = GrapeCity.ActiveReports.Document.Section.TextAlignment.Center rpt.lblSteuerfreiUeberschrift.Alignment = GrapeCity.ActiveReports.Document.Section.TextAlignment.Right - - rpt.lbl_onlyZR_ZinsenUeberschrift.Alignment = GrapeCity.ActiveReports.Document.Section.TextAlignment.Left + rpt.lbl_onlyZR_ZinsenUeberschrift.Alignment = GrapeCity.ActiveReports.Document.Section.TextAlignment.Center rpt.lbl_onlyZR_ReDatUeberschrift.Visible = True rpt.lbl_onlyZR_FaelligUeberschrift.Visible = True rpt.lbl_onlyZR_ZinsenUeberschrift.Visible = True rpt.lbl_onlyZR_ZahlungsDatUeberschrift.Visible = True - rpt.txtLeistung.Visible = False Else @@ -4101,7 +4092,7 @@ Public Class cFakturierung Public Shared Function GET_SR_SQLDT(Firma_ID As Integer, SammelrechungArt As Integer, DatumBis As Date, Optional whereKdNr As String = "", Optional SB As String = "", Optional AvisoIds As List(Of Integer) = Nothing, Optional FakturierungsGruppe As String = "", Optional Abfertigungsart As String = "", Optional AUTOMailversand As String = "") As DataTable If whereKdNr <> "" Then whereKdNr = " AND RechnungsKundenNr IN(" & whereKdNr & ") " Dim whereAbfArt = "" - If Abfertigungsart <> "" Then whereAbfArt = " AND (SELECT TOP 1 Abfertigungsart FROM Speditionsbuch WHERE Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.SpeditionsbuchUnterNr)='" & Abfertigungsart & "' " + If Abfertigungsart <> "" Then whereAbfArt = " AND (SELECT TOP 1 Abfertigungsart FROM Speditionsbuch WHERE Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.SpeditionsbuchUnterNr) IN (" & Abfertigungsart & ") " Dim whereAutoMailversand = "" If AUTOMailversand <> "" Then whereAutoMailversand = " AND isnull(Rechnungsausgang.Automailversand,0) = 1 " @@ -4120,7 +4111,6 @@ Public Class cFakturierung Return dt End Function - Public Shared Function CHECK_SR_SQLDT(dt As DataTable) As Boolean For Each r In dt.Rows If r("Rechnungsart") <> "RU" Then 'Sofern es sich nicht um eine unvollständige RG handelt, muss der Steuerpflichtige Gesamtbetrag <> 0 sein. diff --git a/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb b/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb index c13a2666..e168f871 100644 --- a/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb +++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmFaktSammelRgDrucken Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmFaktSammelRgDrucken '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. - _ + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFaktSammelRgDrucken)) @@ -32,15 +32,10 @@ Partial Class frmFaktSammelRgDrucken Me.RadioButton2 = New System.Windows.Forms.RadioButton() Me.RadioButton1 = New System.Windows.Forms.RadioButton() Me.RadioButton = New System.Windows.Forms.RadioButton() - Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lbl = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() - Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtRechnungsdatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtZeitraumBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.btn = New System.Windows.Forms.Button() Me.Button9 = New System.Windows.Forms.Button() Me.Button8 = New System.Windows.Forms.Button() @@ -48,18 +43,16 @@ Partial Class frmFaktSammelRgDrucken Me.cbxSammelbericht = New System.Windows.Forms.CheckBox() Me.lkl = New System.Windows.Forms.LinkLabel() Me.cbxZusammenfassen = New System.Windows.Forms.CheckBox() - Me.cboSB = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblSB = New System.Windows.Forms.Label() Me.cbxEVOLOG = New System.Windows.Forms.CheckBox() Me.Label4 = New System.Windows.Forms.Label() Me.Button1 = New System.Windows.Forms.Button() Me.cbxTransFerry = New System.Windows.Forms.CheckBox() Me.Label5 = New System.Windows.Forms.Label() - Me.cboFaktGrp = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.Label6 = New System.Windows.Forms.Label() - Me.cboAbfertigungsart = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button2 = New System.Windows.Forms.Button() Me.cbxMWST = New System.Windows.Forms.CheckBox() + Me.cbxAUTOMail = New System.Windows.Forms.CheckBox() + Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.pnlAUTOMailversand = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) Me.cbxMailoeffnen = New System.Windows.Forms.CheckBox() Me.Button7 = New System.Windows.Forms.Button() @@ -68,11 +61,21 @@ Partial Class frmFaktSammelRgDrucken Me.Label7 = New System.Windows.Forms.Label() Me.Button4 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() - Me.cbxAUTOMail = New System.Windows.Forms.CheckBox() - Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.cboFaktGrp = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboSB = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.txtZeitraumBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtRechnungsdatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.btnNurImport = New System.Windows.Forms.Button() + Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox() + Me.btnKeine = New System.Windows.Forms.Button() + Me.lblAbfertigungsarten = New System.Windows.Forms.Label() + Me.btnNurExport = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() - CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlAUTOMailversand.SuspendLayout() + CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnl @@ -176,19 +179,6 @@ Partial Class frmFaktSammelRgDrucken Me.RadioButton.Text = "1 täglich" Me.RadioButton.UseVisualStyleBackColor = True ' - 'cboFirma - ' - Me.cboFirma._allowedValuesFreiText = Nothing - Me.cboFirma._allowFreiText = False - Me.cboFirma._value = "" - Me.cboFirma.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cboFirma.FormattingEnabled = True - Me.cboFirma.Location = New System.Drawing.Point(252, 17) - Me.cboFirma.Name = "cboFirma" - Me.cboFirma.Size = New System.Drawing.Size(183, 21) - Me.cboFirma.TabIndex = 2 - ' 'lbl ' Me.lbl.AutoSize = True @@ -225,87 +215,6 @@ Partial Class frmFaktSammelRgDrucken Me.Label3.TabIndex = 10 Me.Label3.Text = "Kunden:" ' - 'cboPrinter - ' - Me.cboPrinter._allowedValuesFreiText = Nothing - Me.cboPrinter._allowFreiText = False - Me.cboPrinter._value = "" - Me.cboPrinter.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.cboPrinter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboPrinter.FormattingEnabled = True - Me.cboPrinter.Location = New System.Drawing.Point(12, 443) - Me.cboPrinter.Name = "cboPrinter" - Me.cboPrinter.Size = New System.Drawing.Size(118, 21) - Me.cboPrinter.TabIndex = 17 - ' - 'txtRechnungsdatum - ' - Me.txtRechnungsdatum._DateTimeOnly = False - Me.txtRechnungsdatum._numbersOnly = False - Me.txtRechnungsdatum._numbersOnlyKommastellen = "" - Me.txtRechnungsdatum._numbersOnlyTrennzeichen = True - Me.txtRechnungsdatum._Prozent = False - Me.txtRechnungsdatum._ShortDateNew = True - Me.txtRechnungsdatum._ShortDateOnly = False - Me.txtRechnungsdatum._TimeOnly = False - Me.txtRechnungsdatum._TimeOnly_Seconds = False - Me.txtRechnungsdatum._value = "" - Me.txtRechnungsdatum._Waehrung = False - Me.txtRechnungsdatum._WaehrungZeichen = True - Me.txtRechnungsdatum.ForeColor = System.Drawing.Color.Black - Me.txtRechnungsdatum.Location = New System.Drawing.Point(252, 42) - Me.txtRechnungsdatum.MaxLength = 10 - Me.txtRechnungsdatum.MaxLineLength = -1 - Me.txtRechnungsdatum.MaxLines_Warning = "" - Me.txtRechnungsdatum.MaxLines_Warning_Label = Nothing - Me.txtRechnungsdatum.Name = "txtRechnungsdatum" - Me.txtRechnungsdatum.Size = New System.Drawing.Size(100, 20) - Me.txtRechnungsdatum.TabIndex = 4 - ' - 'txtZeitraumBis - ' - Me.txtZeitraumBis._DateTimeOnly = False - Me.txtZeitraumBis._numbersOnly = False - Me.txtZeitraumBis._numbersOnlyKommastellen = "" - Me.txtZeitraumBis._numbersOnlyTrennzeichen = True - Me.txtZeitraumBis._Prozent = False - Me.txtZeitraumBis._ShortDateNew = True - Me.txtZeitraumBis._ShortDateOnly = False - Me.txtZeitraumBis._TimeOnly = False - Me.txtZeitraumBis._TimeOnly_Seconds = False - Me.txtZeitraumBis._value = "" - Me.txtZeitraumBis._Waehrung = False - Me.txtZeitraumBis._WaehrungZeichen = True - Me.txtZeitraumBis.ForeColor = System.Drawing.Color.Black - Me.txtZeitraumBis.Location = New System.Drawing.Point(252, 64) - Me.txtZeitraumBis.MaxLength = 10 - Me.txtZeitraumBis.MaxLineLength = -1 - Me.txtZeitraumBis.MaxLines_Warning = "" - Me.txtZeitraumBis.MaxLines_Warning_Label = Nothing - Me.txtZeitraumBis.Name = "txtZeitraumBis" - Me.txtZeitraumBis.Size = New System.Drawing.Size(100, 20) - Me.txtZeitraumBis.TabIndex = 8 - ' - 'MyDatagridview1 - ' - Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1 - Me.MyDatagridview1.AllowUserToAddRows = False - Me.MyDatagridview1.AllowUserToDeleteRows = False - Me.MyDatagridview1.AllowUserToResizeColumns = False - Me.MyDatagridview1.AllowUserToResizeRows = False - Me.MyDatagridview1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.MyDatagridview1.BackgroundColor = System.Drawing.Color.White - Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.MyDatagridview1.Location = New System.Drawing.Point(252, 91) - Me.MyDatagridview1.Name = "MyDatagridview1" - Me.MyDatagridview1.ReadOnly = True - Me.MyDatagridview1.RowHeadersVisible = False - Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.MyDatagridview1.Size = New System.Drawing.Size(547, 373) - Me.MyDatagridview1.TabIndex = 18 - ' 'btn ' Me.btn.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) @@ -376,10 +285,9 @@ Partial Class frmFaktSammelRgDrucken ' 'lkl ' - Me.lkl.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lkl.AutoSize = True Me.lkl.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.lkl.Location = New System.Drawing.Point(704, 72) + Me.lkl.Location = New System.Drawing.Point(706, 72) Me.lkl.Name = "lkl" Me.lkl.Size = New System.Drawing.Size(95, 13) Me.lkl.TabIndex = 9 @@ -397,20 +305,6 @@ Partial Class frmFaktSammelRgDrucken Me.cbxZusammenfassen.Text = "zusammenfassen" Me.cbxZusammenfassen.UseVisualStyleBackColor = True ' - 'cboSB - ' - Me.cboSB._allowedValuesFreiText = Nothing - Me.cboSB._allowFreiText = False - Me.cboSB._value = "" - Me.cboSB.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cboSB.FormattingEnabled = True - Me.cboSB.Location = New System.Drawing.Point(532, 19) - Me.cboSB.Name = "cboSB" - Me.cboSB.Size = New System.Drawing.Size(267, 21) - Me.cboSB.TabIndex = 6 - Me.cboSB.Visible = False - ' 'lblSB ' Me.lblSB.AutoSize = True @@ -475,40 +369,6 @@ Partial Class frmFaktSammelRgDrucken Me.Label5.TabIndex = 23 Me.Label5.Text = "Fakt.Gruppe:" ' - 'cboFaktGrp - ' - Me.cboFaktGrp._allowedValuesFreiText = Nothing - Me.cboFaktGrp._allowFreiText = False - Me.cboFaktGrp._value = "" - Me.cboFaktGrp.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cboFaktGrp.FormattingEnabled = True - Me.cboFaktGrp.Location = New System.Drawing.Point(532, 42) - Me.cboFaktGrp.Name = "cboFaktGrp" - Me.cboFaktGrp.Size = New System.Drawing.Size(166, 21) - Me.cboFaktGrp.TabIndex = 24 - ' - 'Label6 - ' - Me.Label6.Location = New System.Drawing.Point(444, 68) - Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(82, 17) - Me.Label6.TabIndex = 25 - Me.Label6.Text = "Abfertigungsart:" - ' - 'cboAbfertigungsart - ' - Me.cboAbfertigungsart._allowedValuesFreiText = Nothing - Me.cboAbfertigungsart._allowFreiText = False - Me.cboAbfertigungsart._value = "" - Me.cboAbfertigungsart.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cboAbfertigungsart.FormattingEnabled = True - Me.cboAbfertigungsart.Location = New System.Drawing.Point(532, 64) - Me.cboAbfertigungsart.Name = "cboAbfertigungsart" - Me.cboAbfertigungsart.Size = New System.Drawing.Size(166, 21) - Me.cboAbfertigungsart.TabIndex = 26 - ' 'Button2 ' Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) @@ -527,11 +387,10 @@ Partial Class frmFaktSammelRgDrucken ' 'cbxMWST ' - Me.cbxMWST.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.cbxMWST.AutoSize = True Me.cbxMWST.Checked = True Me.cbxMWST.CheckState = System.Windows.Forms.CheckState.Indeterminate - Me.cbxMWST.Location = New System.Drawing.Point(707, 46) + Me.cbxMWST.Location = New System.Drawing.Point(712, 46) Me.cbxMWST.Name = "cbxMWST" Me.cbxMWST.Size = New System.Drawing.Size(94, 17) Me.cbxMWST.TabIndex = 28 @@ -539,6 +398,22 @@ Partial Class frmFaktSammelRgDrucken Me.cbxMWST.ThreeState = True Me.cbxMWST.UseVisualStyleBackColor = True ' + 'cbxAUTOMail + ' + Me.cbxAUTOMail.AutoSize = True + Me.cbxAUTOMail.Location = New System.Drawing.Point(555, 44) + Me.cbxAUTOMail.Name = "cbxAUTOMail" + Me.cbxAUTOMail.Size = New System.Drawing.Size(116, 17) + Me.cbxAUTOMail.TabIndex = 30 + Me.cbxAUTOMail.Text = "AUTO Mailversand" + Me.cbxAUTOMail.UseVisualStyleBackColor = True + Me.cbxAUTOMail.Visible = False + ' + 'ContextMenuStrip1 + ' + Me.ContextMenuStrip1.Name = "ContextMenuStrip1" + Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4) + ' 'pnlAUTOMailversand ' Me.pnlAUTOMailversand.BackColor = System.Drawing.Color.AliceBlue @@ -647,35 +522,189 @@ Partial Class frmFaktSammelRgDrucken Me.Button3.Text = "aktivieren" Me.Button3.UseVisualStyleBackColor = True ' - 'cbxAUTOMail + 'cboFaktGrp ' - Me.cbxAUTOMail.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cbxAUTOMail.AutoSize = True - Me.cbxAUTOMail.Location = New System.Drawing.Point(550, 44) - Me.cbxAUTOMail.Name = "cbxAUTOMail" - Me.cbxAUTOMail.Size = New System.Drawing.Size(116, 17) - Me.cbxAUTOMail.TabIndex = 30 - Me.cbxAUTOMail.Text = "AUTO Mailversand" - Me.cbxAUTOMail.UseVisualStyleBackColor = True - Me.cbxAUTOMail.Visible = False + Me.cboFaktGrp._allowedValuesFreiText = Nothing + Me.cboFaktGrp._allowFreiText = False + Me.cboFaktGrp._value = "" + Me.cboFaktGrp.FormattingEnabled = True + Me.cboFaktGrp.Location = New System.Drawing.Point(532, 42) + Me.cboFaktGrp.Name = "cboFaktGrp" + Me.cboFaktGrp.Size = New System.Drawing.Size(171, 21) + Me.cboFaktGrp.TabIndex = 24 ' - 'ContextMenuStrip1 + 'cboSB ' - Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(181, 26) + Me.cboSB._allowedValuesFreiText = Nothing + Me.cboSB._allowFreiText = False + Me.cboSB._value = "" + Me.cboSB.FormattingEnabled = True + Me.cboSB.Location = New System.Drawing.Point(532, 19) + Me.cboSB.Name = "cboSB" + Me.cboSB.Size = New System.Drawing.Size(272, 21) + Me.cboSB.TabIndex = 6 + Me.cboSB.Visible = False + ' + 'MyDatagridview1 + ' + Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1 + Me.MyDatagridview1.AllowUserToAddRows = False + Me.MyDatagridview1.AllowUserToDeleteRows = False + Me.MyDatagridview1.AllowUserToResizeColumns = False + Me.MyDatagridview1.AllowUserToResizeRows = False + Me.MyDatagridview1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.MyDatagridview1.BackgroundColor = System.Drawing.Color.White + Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.MyDatagridview1.Location = New System.Drawing.Point(252, 91) + Me.MyDatagridview1.Name = "MyDatagridview1" + Me.MyDatagridview1.ReadOnly = True + Me.MyDatagridview1.RowHeadersVisible = False + Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.MyDatagridview1.Size = New System.Drawing.Size(574, 373) + Me.MyDatagridview1.TabIndex = 18 + ' + 'txtZeitraumBis + ' + Me.txtZeitraumBis._DateTimeOnly = False + Me.txtZeitraumBis._numbersOnly = False + Me.txtZeitraumBis._numbersOnlyKommastellen = "" + Me.txtZeitraumBis._numbersOnlyTrennzeichen = True + Me.txtZeitraumBis._Prozent = False + Me.txtZeitraumBis._ShortDateNew = True + Me.txtZeitraumBis._ShortDateOnly = False + Me.txtZeitraumBis._TimeOnly = False + Me.txtZeitraumBis._TimeOnly_Seconds = False + Me.txtZeitraumBis._value = "" + Me.txtZeitraumBis._Waehrung = False + Me.txtZeitraumBis._WaehrungZeichen = True + Me.txtZeitraumBis.ForeColor = System.Drawing.Color.Black + Me.txtZeitraumBis.Location = New System.Drawing.Point(252, 64) + Me.txtZeitraumBis.MaxLength = 10 + Me.txtZeitraumBis.MaxLineLength = -1 + Me.txtZeitraumBis.MaxLines_Warning = "" + Me.txtZeitraumBis.MaxLines_Warning_Label = Nothing + Me.txtZeitraumBis.Name = "txtZeitraumBis" + Me.txtZeitraumBis.Size = New System.Drawing.Size(100, 20) + Me.txtZeitraumBis.TabIndex = 8 + ' + 'txtRechnungsdatum + ' + Me.txtRechnungsdatum._DateTimeOnly = False + Me.txtRechnungsdatum._numbersOnly = False + Me.txtRechnungsdatum._numbersOnlyKommastellen = "" + Me.txtRechnungsdatum._numbersOnlyTrennzeichen = True + Me.txtRechnungsdatum._Prozent = False + Me.txtRechnungsdatum._ShortDateNew = True + Me.txtRechnungsdatum._ShortDateOnly = False + Me.txtRechnungsdatum._TimeOnly = False + Me.txtRechnungsdatum._TimeOnly_Seconds = False + Me.txtRechnungsdatum._value = "" + Me.txtRechnungsdatum._Waehrung = False + Me.txtRechnungsdatum._WaehrungZeichen = True + Me.txtRechnungsdatum.ForeColor = System.Drawing.Color.Black + Me.txtRechnungsdatum.Location = New System.Drawing.Point(252, 42) + Me.txtRechnungsdatum.MaxLength = 10 + Me.txtRechnungsdatum.MaxLineLength = -1 + Me.txtRechnungsdatum.MaxLines_Warning = "" + Me.txtRechnungsdatum.MaxLines_Warning_Label = Nothing + Me.txtRechnungsdatum.Name = "txtRechnungsdatum" + Me.txtRechnungsdatum.Size = New System.Drawing.Size(100, 20) + Me.txtRechnungsdatum.TabIndex = 4 + ' + 'cboPrinter + ' + Me.cboPrinter._allowedValuesFreiText = Nothing + Me.cboPrinter._allowFreiText = False + Me.cboPrinter._value = "" + Me.cboPrinter.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.cboPrinter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboPrinter.FormattingEnabled = True + Me.cboPrinter.Location = New System.Drawing.Point(12, 443) + Me.cboPrinter.Name = "cboPrinter" + Me.cboPrinter.Size = New System.Drawing.Size(118, 21) + Me.cboPrinter.TabIndex = 17 + ' + 'cboFirma + ' + Me.cboFirma._allowedValuesFreiText = Nothing + Me.cboFirma._allowFreiText = False + Me.cboFirma._value = "" + Me.cboFirma.FormattingEnabled = True + Me.cboFirma.Location = New System.Drawing.Point(252, 17) + Me.cboFirma.Name = "cboFirma" + Me.cboFirma.Size = New System.Drawing.Size(183, 21) + Me.cboFirma.TabIndex = 2 + ' + 'btnNurImport + ' + Me.btnNurImport.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnNurImport.Location = New System.Drawing.Point(836, 437) + Me.btnNurImport.Margin = New System.Windows.Forms.Padding(0) + Me.btnNurImport.Name = "btnNurImport" + Me.btnNurImport.Size = New System.Drawing.Size(75, 26) + Me.btnNurImport.TabIndex = 47 + Me.btnNurImport.Text = "Import" + Me.btnNurImport.UseVisualStyleBackColor = True + ' + 'MyListBox1 + ' + Me.MyListBox1._value = "" + Me.MyListBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.MyListBox1.FormattingEnabled = True + Me.MyListBox1.Location = New System.Drawing.Point(836, 93) + Me.MyListBox1.Name = "MyListBox1" + Me.MyListBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple + Me.MyListBox1.Size = New System.Drawing.Size(225, 342) + Me.MyListBox1.TabIndex = 44 + ' + 'btnKeine + ' + Me.btnKeine.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnKeine.Location = New System.Drawing.Point(985, 437) + Me.btnKeine.Margin = New System.Windows.Forms.Padding(0) + Me.btnKeine.Name = "btnKeine" + Me.btnKeine.Size = New System.Drawing.Size(75, 26) + Me.btnKeine.TabIndex = 45 + Me.btnKeine.Text = "Keine" + Me.btnKeine.UseVisualStyleBackColor = True + ' + 'lblAbfertigungsarten + ' + Me.lblAbfertigungsarten.AutoSize = True + Me.lblAbfertigungsarten.Location = New System.Drawing.Point(833, 77) + Me.lblAbfertigungsarten.Name = "lblAbfertigungsarten" + Me.lblAbfertigungsarten.Size = New System.Drawing.Size(93, 13) + Me.lblAbfertigungsarten.TabIndex = 43 + Me.lblAbfertigungsarten.Text = "Abfertigungsarten:" + ' + 'btnNurExport + ' + Me.btnNurExport.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnNurExport.Location = New System.Drawing.Point(911, 437) + Me.btnNurExport.Margin = New System.Windows.Forms.Padding(0) + Me.btnNurExport.Name = "btnNurExport" + Me.btnNurExport.Size = New System.Drawing.Size(75, 26) + Me.btnNurExport.TabIndex = 48 + Me.btnNurExport.Text = "Export" + Me.btnNurExport.UseVisualStyleBackColor = True ' 'frmFaktSammelRgDrucken ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(811, 472) + Me.ClientSize = New System.Drawing.Size(1069, 472) + Me.Controls.Add(Me.btnNurExport) + Me.Controls.Add(Me.btnNurImport) + Me.Controls.Add(Me.MyListBox1) + Me.Controls.Add(Me.btnKeine) + Me.Controls.Add(Me.lblAbfertigungsarten) Me.Controls.Add(Me.cbxAUTOMail) Me.Controls.Add(Me.pnlAUTOMailversand) Me.Controls.Add(Me.cbxMWST) Me.Controls.Add(Me.Button2) - Me.Controls.Add(Me.Label6) - Me.Controls.Add(Me.cboAbfertigungsart) Me.Controls.Add(Me.Label5) Me.Controls.Add(Me.cboFaktGrp) Me.Controls.Add(Me.Button1) @@ -707,9 +736,9 @@ Partial Class frmFaktSammelRgDrucken Me.Text = "Sammelrechnungen drucken" Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() - CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit() Me.pnlAUTOMailversand.ResumeLayout(False) Me.pnlAUTOMailversand.PerformLayout() + CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -746,8 +775,6 @@ Partial Class frmFaktSammelRgDrucken Friend WithEvents cbxTransFerry As CheckBox Friend WithEvents Label5 As Label Friend WithEvents cboFaktGrp As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents Label6 As Label - Friend WithEvents cboAbfertigungsart As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Button2 As Button Friend WithEvents RadioButton5 As RadioButton Friend WithEvents cbxMWST As CheckBox @@ -761,4 +788,9 @@ Partial Class frmFaktSammelRgDrucken Friend WithEvents Button7 As Button Friend WithEvents cbxMailoeffnen As CheckBox Friend WithEvents ContextMenuStrip1 As ContextMenuStrip + Friend WithEvents btnNurImport As Button + Friend WithEvents MyListBox1 As VERAG_PROG_ALLGEMEIN.MyListBox + Friend WithEvents btnKeine As Button + Friend WithEvents lblAbfertigungsarten As Label + Friend WithEvents btnNurExport As Button End Class diff --git a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb index 6ab76c76..eff14f35 100644 --- a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb +++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb @@ -1,4 +1,6 @@ Imports com.sun.tools.javadoc +Imports GrapeCity.ActiveReports.ReportsCore.Tools +Imports GrapeCity.Viewer.Common.Model Imports Microsoft.Office.Interop Imports VERAG_PROG_ALLGEMEIN @@ -28,7 +30,7 @@ Public Class frmFaktSammelRgDrucken End Sub Private Sub RadioButton_CheckedChanged(sender As Object, e As EventArgs) Handles RadioButton.CheckedChanged, RadioButton1.CheckedChanged, RadioButton2.CheckedChanged, RadioButton3.CheckedChanged, RadioButton4.CheckedChanged, RadioButton6.CheckedChanged, RadioButton5.CheckedChanged - lblSB.Visible = False : cboSB.Visible = False : btn.Enabled = True : Button9.Enabled = True : Button8.Enabled = True : cbxMWST.Visible = False : pnlAUTOMailversand.Visible = False : cbxAUTOMail.Visible = False + lblSB.Visible = False : cboSB.Visible = False : btn.Enabled = True : Button9.Enabled = True : Button8.Enabled = True : cbxMWST.Visible = False : pnlAUTOMailversand.Visible = False : cbxAUTOMail.Visible = False : MyListBox1.Enabled = True : btnNurExport.Enabled = True : btnNurImport.Enabled = True : btnKeine.Enabled = True cboSB.changeItem("") If DirectCast(sender, RadioButton).Checked Then Sammelrechung = sender.tag @@ -54,6 +56,8 @@ Public Class frmFaktSammelRgDrucken Case 6 : txtZeitraumBis.Text = Now.AddDays(-1).ToShortDateString : lblSB.Visible = True : cboSB.Visible = True cboSB.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) : btn.Enabled = False : Button9.Enabled = False : Button2.Enabled = False cbxMWST.Visible = True : pnlAUTOMailversand.Visible = True : cbxAUTOMail.Visible = True : Label5.Visible = False : cboFaktGrp.Visible = False + MyListBox1.Enabled = False : btnNurExport.Enabled = False : btnNurImport.Enabled = False : btnKeine.Enabled = False + Case 7 : txtZeitraumBis.Text = Now.ToShortDateString : lblSB.Visible = True : cboSB.Visible = True : cboSB.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) End Select @@ -67,7 +71,11 @@ Public Class frmFaktSammelRgDrucken With MyDatagridview1 Dim whereAbfArt = "" Dim whereMWST = "" - If cboAbfertigungsart._value <> "" AndAlso Sammelrechung <> 6 Then whereAbfArt = " AND (SELECT Abfertigungsart FROM Speditionsbuch WHERE Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.SpeditionsbuchUnterNr)='" & cboAbfertigungsart._value & "' " + Dim abfertigungsarten = getValues() + + If Sammelrechung <> 6 AndAlso abfertigungsarten <> "" Then + whereAbfArt = " AND (SELECT Abfertigungsart FROM Speditionsbuch WHERE Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.SpeditionsbuchUnterNr) IN (" & abfertigungsarten & ") " + End If If cbxMWST.CheckState.Indeterminate Then whereMWST = "" Else @@ -160,11 +168,21 @@ Public Class frmFaktSammelRgDrucken End With End Sub + Function getValues() As String + Dim s As String = "" + For Each i In MyListBox1.SelectedItems + s += DirectCast(i, VERAG_PROG_ALLGEMEIN.MyListItem).Value & ", " + Next + If s.EndsWith(", ") Then + s = s.Substring(0, s.Length - 2) + End If + Return s + End Function + Private Sub frmFaktSammelRgDrucken_Load(sender As Object, e As EventArgs) Handles Me.Load txtZeitraumBis.Text = Now.ToShortDateString txtRechnungsdatum.Text = Now.ToShortDateString - - cboAbfertigungsart.fillWithSQL("SELECT Abfertigungsart,[Abfertigungsbezeichnung] FROM [Abfertigungsarten] ORDER BY Abfertigungsart ", True, "FMZOLL", True) + MyListBox1.fillWithSQL(" SELECT [Abfertigungsart],[Abfertigungsbezeichnung] FROM [Abfertigungsarten] ORDER BY Abfertigungsart ", , "FMZOLL") Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then @@ -177,7 +195,7 @@ Public Class frmFaktSammelRgDrucken If Not IsDBNull(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firmaFMZoll) AndAlso (CInt(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firmaFMZoll) = 19 Or VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username = "ADMIN" Or VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username = "DANIEL") Then FirmaTmp = "VERAG360" RadioButton5.Enabled = True - cboAbfertigungsart.changeItem("10") + MyListBox1.SetSelected(10, True) Else RadioButton5.Enabled = False @@ -355,8 +373,8 @@ Public Class frmFaktSammelRgDrucken End If - - Dim f As New frmFaktEmail(cboFirma._value, Sammelrechung, CDate(txtZeitraumBis.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, RG_DRUCK, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr_Simple, -1, Nothing, cboSB._value,, getAvisoIds, cbxEVOLOG.Checked, cbxTransFerry.Checked, cboFaktGrp._value, cboAbfertigungsart._value, MDMKopiedrucken) + Dim abfertigungsarten = getValues() + Dim f As New frmFaktEmail(cboFirma._value, Sammelrechung, CDate(txtZeitraumBis.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, RG_DRUCK, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr_Simple, -1, Nothing, cboSB._value,, getAvisoIds, cbxEVOLOG.Checked, cbxTransFerry.Checked, cboFaktGrp._value, abfertigungsarten, MDMKopiedrucken) f.ShowDialog(Me) MyDatagridview1.GetOrder() initDGV() @@ -391,7 +409,10 @@ Public Class frmFaktSammelRgDrucken Dim listPDFs As New List(Of String) Dim SonstAnlagen As New List(Of String) Dim RechnungsNrisSet As Boolean = False - RechnungsNrisSet = cFakturierung.doSAMMELRechnungsDruck(cboFirma._value, Sammelrechung, CDate(txtZeitraumBis.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr, If(ausgabeArt = 1, -1, 4), listPDFs, cboSB._value,,, getAvisoIds, cbxEVOLOG.Checked, SonstAnlagen, vorschau, cbxTransFerry.Checked, cboFaktGrp._value, cboAbfertigungsart._value) + + Dim abfertigungsarten = getValues() + + RechnungsNrisSet = cFakturierung.doSAMMELRechnungsDruck(cboFirma._value, Sammelrechung, CDate(txtZeitraumBis.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr, If(ausgabeArt = 1, -1, 4), listPDFs, cboSB._value,,, getAvisoIds, cbxEVOLOG.Checked, SonstAnlagen, vorschau, cbxTransFerry.Checked, cboFaktGrp._value, abfertigungsarten) '-------------- für PDF-Sammel-Rechnung -------------- @@ -531,7 +552,7 @@ Public Class frmFaktSammelRgDrucken initDGV() End Sub - Private Sub cboAbfertigungsart_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboAbfertigungsart.SelectedIndexChanged + Private Sub cboAbfertigungsart_SelectedIndexChanged(sender As Object, e As EventArgs) initDGV() End Sub @@ -694,20 +715,49 @@ Public Class frmFaktSammelRgDrucken Private Sub mnuItem_Clicked(sender As Object, e As EventArgs) - ContextMenuStrip1.Hide() - Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem) - If item IsNot Nothing Then + End Sub - If item.Name <> "" AndAlso IsNumeric(item.Name) Then + Private Sub btnNurAbf_Click(sender As Object, e As EventArgs) Handles btnNurImport.Click, btnNurExport.Click - Dim f As New SDL.frmAbrechnungsMaskeEinzeln(item.Name) - f.Show(Me) + Dim where As String = "" + Select Case sender.Name + Case "btnNurImport" : where = "Typ = 'I'" + Case Else : where = "Typ = 'E'" + End Select - End If + Dim dt = (New SQL).loadDgvBySql("SELECT Abfertigungsart FROM [Abfertigungsarten] where 1 = 1 AND " & where, "FMZOLL") + MyListBox1.ClearSelected() + If dt IsNot Nothing Then + For Each r In dt.Rows + For i = 0 To MyListBox1.Items.Count - 1 + If DirectCast(MyListBox1.Items(i), VERAG_PROG_ALLGEMEIN.MyListItem).Value = r("Abfertigungsart") Then + MyListBox1.SetSelected(i, True) + End If + Next + Next + + initDGV() End If + + End Sub + + Private Sub btnAlle_Click(sender As Object, e As EventArgs) + For i = 0 To MyListBox1.Items.Count - 1 + MyListBox1.SetSelected(i, True) + Next + initDGV() + + End Sub + + Private Sub btnKeine_Click(sender As Object, e As EventArgs) Handles btnKeine.Click + For i = 0 To MyListBox1.Items.Count - 1 + MyListBox1.SetSelected(i, False) + Next + initDGV() + End Sub End Class \ No newline at end of file diff --git a/SDL/Fakturierung/rptRechnungDruck_MDM.Designer.vb b/SDL/Fakturierung/rptRechnungDruck_MDM.Designer.vb index 325cdf32..bfd93eb6 100644 --- a/SDL/Fakturierung/rptRechnungDruck_MDM.Designer.vb +++ b/SDL/Fakturierung/rptRechnungDruck_MDM.Designer.vb @@ -126,11 +126,11 @@ Partial Public Class rptRechnungDruck_MDM Me.Line13 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.Line16 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.Line18 = New GrapeCity.ActiveReports.SectionReportModel.Line() - Me.GroupFooter4 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter() Me.lblAbsenderUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.lblEmpfaengerUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.txtAbsender = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtEmpfaenger = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.GroupFooter4 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter() CType(Me.lblLeistungNr, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblAnzahl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblSteuerfrei, System.ComponentModel.ISupportInitialize).BeginInit() @@ -230,7 +230,7 @@ Partial Public Class rptRechnungDruck_MDM ' Me.Detail.CanShrink = True Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblLeistungNr, Me.lblAnzahl, Me.lblSteuerfrei, Me.lblSteuerpflichtig, Me.txtLeistung, Me.Line10, Me.Line11, Me.SubReport}) - Me.Detail.Height = 0.3901193! + Me.Detail.Height = 0.213036! Me.Detail.KeepTogether = True Me.Detail.Name = "Detail" ' @@ -250,13 +250,13 @@ Partial Public Class rptRechnungDruck_MDM ' Me.lblAnzahl.Height = 0.1574803! Me.lblAnzahl.HyperLink = Nothing - Me.lblAnzahl.Left = 3.380315! + Me.lblAnzahl.Left = 3.883465! Me.lblAnzahl.Name = "lblAnzahl" Me.lblAnzahl.Style = "font-size: 9pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" & "har-set: 1" Me.lblAnzahl.Text = "999" Me.lblAnzahl.Top = 0! - Me.lblAnzahl.Width = 0.5492127! + Me.lblAnzahl.Width = 0.4472442! ' 'lblSteuerfrei ' @@ -273,12 +273,12 @@ Partial Public Class rptRechnungDruck_MDM ' Me.lblSteuerpflichtig.Height = 0.1574803! Me.lblSteuerpflichtig.HyperLink = Nothing - Me.lblSteuerpflichtig.Left = 3.957481! + Me.lblSteuerpflichtig.Left = 4.330709! Me.lblSteuerpflichtig.Name = "lblSteuerpflichtig" Me.lblSteuerpflichtig.Style = "font-size: 9pt; font-weight: normal; text-align: right; ddo-char-set: 1" Me.lblSteuerpflichtig.Text = "999.999,99" Me.lblSteuerpflichtig.Top = 0! - Me.lblSteuerpflichtig.Width = 1.554331! + Me.lblSteuerpflichtig.Width = 1.181103! ' 'txtLeistung ' @@ -289,7 +289,7 @@ Partial Public Class rptRechnungDruck_MDM "ar-set: 1" Me.txtLeistung.Text = "Verzollung inkl. 5 Tarifnummern" Me.txtLeistung.Top = 0! - Me.txtLeistung.Width = 2.974803! + Me.txtLeistung.Width = 3.477953! ' 'Line10 ' @@ -1231,7 +1231,7 @@ Partial Public Class rptRechnungDruck_MDM ' Me.lblLeistungUeberschrift.Height = 0.1511808! Me.lblLeistungUeberschrift.HyperLink = Nothing - Me.lblLeistungUeberschrift.Left = 0.01417323! + Me.lblLeistungUeberschrift.Left = 0.003937008! Me.lblLeistungUeberschrift.Name = "lblLeistungUeberschrift" Me.lblLeistungUeberschrift.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.lblLeistungUeberschrift.Style = "font-size: 8pt; font-weight: bold; text-align: left; text-justify: auto; ddo-char" & @@ -1267,21 +1267,21 @@ Partial Public Class rptRechnungDruck_MDM ' Me.lbl_onlyZR_ZahlungsDatUeberschrift.Height = 0.1511808! Me.lbl_onlyZR_ZahlungsDatUeberschrift.HyperLink = Nothing - Me.lbl_onlyZR_ZahlungsDatUeberschrift.Left = 2.492528! + Me.lbl_onlyZR_ZahlungsDatUeberschrift.Left = 2.629921! Me.lbl_onlyZR_ZahlungsDatUeberschrift.Name = "lbl_onlyZR_ZahlungsDatUeberschrift" Me.lbl_onlyZR_ZahlungsDatUeberschrift.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.lbl_onlyZR_ZahlungsDatUeberschrift.Style = "font-size: 8pt; font-weight: bold; text-align: left; text-justify: auto; ddo-char" & "-set: 1" Me.lbl_onlyZR_ZahlungsDatUeberschrift.Text = "Zahlung" - Me.lbl_onlyZR_ZahlungsDatUeberschrift.Top = 1.079378! + Me.lbl_onlyZR_ZahlungsDatUeberschrift.Top = 1.079528! Me.lbl_onlyZR_ZahlungsDatUeberschrift.Visible = False Me.lbl_onlyZR_ZahlungsDatUeberschrift.Width = 0.9661421! ' 'lbl_onlyZR_FaelligUeberschrift ' - Me.lbl_onlyZR_FaelligUeberschrift.Height = 0.1511808! + Me.lbl_onlyZR_FaelligUeberschrift.Height = 0.1511809! Me.lbl_onlyZR_FaelligUeberschrift.HyperLink = Nothing - Me.lbl_onlyZR_FaelligUeberschrift.Left = 2.001584! + Me.lbl_onlyZR_FaelligUeberschrift.Left = 1.907874! Me.lbl_onlyZR_FaelligUeberschrift.Name = "lbl_onlyZR_FaelligUeberschrift" Me.lbl_onlyZR_FaelligUeberschrift.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.lbl_onlyZR_FaelligUeberschrift.Style = "font-size: 8pt; font-weight: bold; text-align: left; text-justify: auto; ddo-char" & @@ -1289,11 +1289,11 @@ Partial Public Class rptRechnungDruck_MDM Me.lbl_onlyZR_FaelligUeberschrift.Text = "Fällig" Me.lbl_onlyZR_FaelligUeberschrift.Top = 1.079378! Me.lbl_onlyZR_FaelligUeberschrift.Visible = False - Me.lbl_onlyZR_FaelligUeberschrift.Width = 0.490945! + Me.lbl_onlyZR_FaelligUeberschrift.Width = 0.7220475! ' 'lbl_onlyZR_ReDatUeberschrift ' - Me.lbl_onlyZR_ReDatUeberschrift.Height = 0.1511807! + Me.lbl_onlyZR_ReDatUeberschrift.Height = 0.1511811! Me.lbl_onlyZR_ReDatUeberschrift.HyperLink = Nothing Me.lbl_onlyZR_ReDatUeberschrift.Left = 0.9362291! Me.lbl_onlyZR_ReDatUeberschrift.Name = "lbl_onlyZR_ReDatUeberschrift" @@ -1303,31 +1303,31 @@ Partial Public Class rptRechnungDruck_MDM Me.lbl_onlyZR_ReDatUeberschrift.Text = "Datum" Me.lbl_onlyZR_ReDatUeberschrift.Top = 1.080166! Me.lbl_onlyZR_ReDatUeberschrift.Visible = False - Me.lbl_onlyZR_ReDatUeberschrift.Width = 1.065354! + Me.lbl_onlyZR_ReDatUeberschrift.Width = 0.984252! ' 'lblSteuerpflichtigUeberschrift ' - Me.lblSteuerpflichtigUeberschrift.Height = 0.1511808! + Me.lblSteuerpflichtigUeberschrift.Height = 0.1511811! Me.lblSteuerpflichtigUeberschrift.HyperLink = Nothing - Me.lblSteuerpflichtigUeberschrift.Left = 3.957482! + Me.lblSteuerpflichtigUeberschrift.Left = 4.330709! Me.lblSteuerpflichtigUeberschrift.Name = "lblSteuerpflichtigUeberschrift" Me.lblSteuerpflichtigUeberschrift.Style = "font-size: 8pt; font-weight: bold; text-align: right; text-justify: auto; ddo-cha" & "r-set: 1" Me.lblSteuerpflichtigUeberschrift.Text = "Steuerpflichtig" Me.lblSteuerpflichtigUeberschrift.Top = 1.079528! - Me.lblSteuerpflichtigUeberschrift.Width = 1.554331! + Me.lblSteuerpflichtigUeberschrift.Width = 1.181102! ' 'lblAnzahlUeberschrift ' - Me.lblAnzahlUeberschrift.Height = 0.1511807! + Me.lblAnzahlUeberschrift.Height = 0.1511811! Me.lblAnzahlUeberschrift.HyperLink = Nothing - Me.lblAnzahlUeberschrift.Left = 3.45867! + Me.lblAnzahlUeberschrift.Left = 3.596063! Me.lblAnzahlUeberschrift.Name = "lblAnzahlUeberschrift" Me.lblAnzahlUeberschrift.Style = "font-size: 8pt; font-weight: bold; text-align: right; text-justify: auto; ddo-cha" & "r-set: 1" Me.lblAnzahlUeberschrift.Text = "Anzahl" Me.lblAnzahlUeberschrift.Top = 1.079528! - Me.lblAnzahlUeberschrift.Width = 0.4988112! + Me.lblAnzahlUeberschrift.Width = 0.7346457! ' 'Line4 ' @@ -1336,7 +1336,7 @@ Partial Public Class rptRechnungDruck_MDM Me.Line4.LineWeight = 1.0! Me.Line4.Name = "Line4" Me.Line4.Top = 1.230709! - Me.Line4.Width = 7.475194! + Me.Line4.Width = 7.475193! Me.Line4.X1 = 0.005118821! Me.Line4.X2 = 7.480312! Me.Line4.Y1 = 1.230709! @@ -1472,7 +1472,7 @@ Partial Public Class rptRechnungDruck_MDM ' 'Line13 ' - Me.Line13.Height = 0.2043307! + Me.Line13.Height = 0.20433! Me.Line13.Left = 7.476378! Me.Line13.LineWeight = 1.0! Me.Line13.Name = "Line13" @@ -1498,7 +1498,7 @@ Partial Public Class rptRechnungDruck_MDM ' 'Line18 ' - Me.Line18.Height = 0.2043306! + Me.Line18.Height = 0.204331! Me.Line18.Left = 0.005118111! Me.Line18.LineWeight = 1.0! Me.Line18.Name = "Line18" @@ -1509,11 +1509,6 @@ Partial Public Class rptRechnungDruck_MDM Me.Line18.Y1 = 1.080315! Me.Line18.Y2 = 1.284646! ' - 'GroupFooter4 - ' - Me.GroupFooter4.Height = 0! - Me.GroupFooter4.Name = "GroupFooter4" - ' 'lblAbsenderUeberschrift ' Me.lblAbsenderUeberschrift.Height = 0.1574803! @@ -1560,6 +1555,11 @@ Partial Public Class rptRechnungDruck_MDM Me.txtEmpfaenger.Top = 0! Me.txtEmpfaenger.Width = 2.659449! ' + 'GroupFooter4 + ' + Me.GroupFooter4.Height = 0! + Me.GroupFooter4.Name = "GroupFooter4" + ' 'rptRechnungDruck_MDM ' Me.MasterReport = False diff --git a/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.Designer.vb b/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.Designer.vb index 17eb644a..0b25f531 100644 --- a/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.Designer.vb +++ b/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.Designer.vb @@ -19,6 +19,7 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung Dim resources As System.Resources.ResourceManager = New System.Resources.ResourceManager(GetType(rptRechnungMDM_AnlagenDruck_Zinsennachberechnung)) Me.PageHeader = New GrapeCity.ActiveReports.SectionReportModel.PageHeader() Me.Detail = New GrapeCity.ActiveReports.SectionReportModel.Detail() + Me.txt_Anmerkung = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtREnr = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtReDat = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtZE = New GrapeCity.ActiveReports.SectionReportModel.TextBox() @@ -39,7 +40,7 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung Me.Label1 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.GroupFooter4 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter() Me.Line18 = New GrapeCity.ActiveReports.SectionReportModel.Line() - Me.txt_Anmerkung = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + CType(Me.txt_Anmerkung, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtREnr, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtReDat, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtZE, System.ComponentModel.ISupportInitialize).BeginInit() @@ -56,7 +57,6 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung CType(Me.lblZinsen, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblVZ, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txt_Anmerkung, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() ' 'PageHeader @@ -72,34 +72,47 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung Me.Detail.KeepTogether = True Me.Detail.Name = "Detail" ' + 'txt_Anmerkung + ' + Me.txt_Anmerkung.Height = 0.1338583! + Me.txt_Anmerkung.Left = 1.893307! + Me.txt_Anmerkung.Name = "txt_Anmerkung" + Me.txt_Anmerkung.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) + Me.txt_Anmerkung.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: center; ddo-ch" & + "ar-set: 0" + Me.txt_Anmerkung.Text = "-" + Me.txt_Anmerkung.Top = 0! + Me.txt_Anmerkung.Visible = False + Me.txt_Anmerkung.Width = 3.620866! + ' 'txtREnr ' Me.txtREnr.Height = 0.1338583! - Me.txtREnr.Left = 0.005119062! + Me.txtREnr.Left = 0.003937008! Me.txtREnr.Name = "txtREnr" Me.txtREnr.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) - Me.txtREnr.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: center; ddo-ch" & - "ar-set: 0" + Me.txtREnr.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: left; ddo-char" & + "-set: 0" Me.txtREnr.Text = "-" Me.txtREnr.Top = 0! - Me.txtREnr.Width = 0.8244095! + Me.txtREnr.Width = 0.9220473! ' 'txtReDat ' Me.txtReDat.Height = 0.1338583! - Me.txtReDat.Left = 0.9232284! + Me.txtReDat.Left = 0.9259843! Me.txtReDat.Name = "txtReDat" Me.txtReDat.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.txtReDat.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: center; ddo-ch" & "ar-set: 0" Me.txtReDat.Text = "-" Me.txtReDat.Top = 0! - Me.txtReDat.Width = 0.8657481! + Me.txtReDat.Width = 0.984252! ' 'txtZE ' Me.txtZE.Height = 0.1338583! - Me.txtZE.Left = 2.405118! + Me.txtZE.Left = 2.632284! Me.txtZE.Name = "txtZE" Me.txtZE.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.txtZE.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: center; ddo-ch" & @@ -111,26 +124,26 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung 'txtReBetrag ' Me.txtReBetrag.Height = 0.1338583! - Me.txtReBetrag.Left = 3.948426! + Me.txtReBetrag.Left = 4.333071! Me.txtReBetrag.Name = "txtReBetrag" Me.txtReBetrag.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.txtReBetrag.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: right; ddo-cha" & "r-set: 0" Me.txtReBetrag.Text = "-" Me.txtReBetrag.Top = 0! - Me.txtReBetrag.Width = 0.9708654! + Me.txtReBetrag.Width = 0.8267719! ' 'txtTage ' Me.txtTage.Height = 0.1338583! - Me.txtTage.Left = 3.37126! + Me.txtTage.Left = 3.598425! Me.txtTage.Name = "txtTage" Me.txtTage.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.txtTage.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: right; ddo-cha" & "r-set: 0" Me.txtTage.Text = "-" Me.txtTage.Top = 0! - Me.txtTage.Width = 0.5771654! + Me.txtTage.Width = 0.6618112! ' 'txtZinsen ' @@ -147,7 +160,7 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung 'txtVZ ' Me.txtVZ.Height = 0.1338583! - Me.txtVZ.Left = 5.502756! + Me.txtVZ.Left = 5.514174! Me.txtVZ.Name = "txtVZ" Me.txtVZ.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.txtVZ.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: center; ddo-ch" & @@ -159,14 +172,14 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung 'txtFaellig ' Me.txtFaellig.Height = 0.1338583! - Me.txtFaellig.Left = 1.788977! + Me.txtFaellig.Left = 1.910236! Me.txtFaellig.Name = "txtFaellig" Me.txtFaellig.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.txtFaellig.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: center; ddo-ch" & "ar-set: 0" Me.txtFaellig.Text = "-" Me.txtFaellig.Top = 0! - Me.txtFaellig.Width = 0.6161416! + Me.txtFaellig.Width = 0.7220473! ' 'PageFooter ' @@ -185,46 +198,46 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung ' Me.lblReNr.Height = 0.1433071! Me.lblReNr.HyperLink = Nothing - Me.lblReNr.Left = 0.005118132! + Me.lblReNr.Left = 0.003937008! Me.lblReNr.Name = "lblReNr" Me.lblReNr.Style = "font-size: 6.75pt; font-weight: bold; text-align: left; text-justify: auto; ddo-c" & "har-set: 0" Me.lblReNr.Text = "RechnungsNr" Me.lblReNr.Top = 0! Me.lblReNr.Visible = False - Me.lblReNr.Width = 0.8244095! + Me.lblReNr.Width = 0.9220473! ' 'lblReDat ' Me.lblReDat.Height = 0.1433071! Me.lblReDat.HyperLink = Nothing - Me.lblReDat.Left = 0.8295276! + Me.lblReDat.Left = 0.9259843! Me.lblReDat.Name = "lblReDat" Me.lblReDat.Style = "font-size: 6.75pt; font-weight: bold; text-align: left; text-justify: auto; ddo-c" & "har-set: 0" Me.lblReDat.Text = "Rechnungsdatum" Me.lblReDat.Top = 0! Me.lblReDat.Visible = False - Me.lblReDat.Width = 1.084646! + Me.lblReDat.Width = 0.984252! ' 'lblReBetrag ' Me.lblReBetrag.Height = 0.1433071! Me.lblReBetrag.HyperLink = Nothing - Me.lblReBetrag.Left = 3.948426! + Me.lblReBetrag.Left = 4.333071! Me.lblReBetrag.Name = "lblReBetrag" Me.lblReBetrag.Style = "font-size: 6.75pt; font-weight: bold; text-align: left; text-justify: auto; ddo-c" & "har-set: 0" Me.lblReBetrag.Text = "Zahlungsbetrag" Me.lblReBetrag.Top = 0! Me.lblReBetrag.Visible = False - Me.lblReBetrag.Width = 1.554331! + Me.lblReBetrag.Width = 1.181102! ' 'lblZahlungsdat ' Me.lblZahlungsdat.Height = 0.1433071! Me.lblZahlungsdat.HyperLink = Nothing - Me.lblZahlungsdat.Left = 2.405118! + Me.lblZahlungsdat.Left = 2.632284! Me.lblZahlungsdat.Name = "lblZahlungsdat" Me.lblZahlungsdat.Style = "font-size: 6.75pt; font-weight: bold; text-align: left; text-justify: auto; ddo-c" & "har-set: 0" @@ -237,14 +250,14 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung ' Me.lblTage.Height = 0.1433071! Me.lblTage.HyperLink = Nothing - Me.lblTage.Left = 3.37126! + Me.lblTage.Left = 3.598425! Me.lblTage.Name = "lblTage" Me.lblTage.Style = "font-size: 6.75pt; font-weight: bold; text-align: left; text-justify: auto; ddo-c" & "har-set: 0" Me.lblTage.Text = "Tage" Me.lblTage.Top = 0! Me.lblTage.Visible = False - Me.lblTage.Width = 0.5771654! + Me.lblTage.Width = 0.7346457! ' 'lblZinsen ' @@ -276,14 +289,14 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung ' Me.Label1.Height = 0.1433071! Me.Label1.HyperLink = Nothing - Me.Label1.Left = 1.914173! + Me.Label1.Left = 1.910236! Me.Label1.Name = "Label1" Me.Label1.Style = "font-size: 6.75pt; font-weight: bold; text-align: left; text-justify: auto; ddo-c" & "har-set: 0" Me.Label1.Text = "Fällig" Me.Label1.Top = 0! Me.Label1.Visible = False - Me.Label1.Width = 0.4909448! + Me.Label1.Width = 0.7220473! ' 'GroupFooter4 ' @@ -293,31 +306,18 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung ' 'Line18 ' - Me.Line18.Height = 0.00004923344! - Me.Line18.Left = 0.03444719! + Me.Line18.Height = 0! + Me.Line18.Left = 0.0976378! Me.Line18.LineColor = System.Drawing.Color.FromArgb(CType(CType(169, Byte), Integer), CType(CType(169, Byte), Integer), CType(CType(169, Byte), Integer)) Me.Line18.LineWeight = 1.0! Me.Line18.Name = "Line18" Me.Line18.Top = 0.0937008! - Me.Line18.Width = 7.323034! - Me.Line18.X1 = 0.03444719! - Me.Line18.X2 = 7.357481! - Me.Line18.Y1 = 0.09375003! + Me.Line18.Width = 6.968504! + Me.Line18.X1 = 0.0976378! + Me.Line18.X2 = 7.066142! + Me.Line18.Y1 = 0.0937008! Me.Line18.Y2 = 0.0937008! ' - 'txt_Anmerkung - ' - Me.txt_Anmerkung.Height = 0.1338583! - Me.txt_Anmerkung.Left = 1.788977! - Me.txt_Anmerkung.Name = "txt_Anmerkung" - Me.txt_Anmerkung.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) - Me.txt_Anmerkung.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: center; ddo-ch" & - "ar-set: 0" - Me.txt_Anmerkung.Text = "-" - Me.txt_Anmerkung.Top = 0.02083332! - Me.txt_Anmerkung.Visible = False - Me.txt_Anmerkung.Width = 3.713779! - ' 'rptRechnungMDM_AnlagenDruck_Zinsennachberechnung ' Me.MasterReport = False @@ -327,7 +327,7 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung Me.PageSettings.Margins.Top = 0.3937008! Me.PageSettings.PaperHeight = 11.0! Me.PageSettings.PaperWidth = 8.5! - Me.PrintWidth = 7.452378! + Me.PrintWidth = 7.103184! Me.Sections.Add(Me.PageHeader) Me.Sections.Add(Me.GroupHeader4) Me.Sections.Add(Me.Detail) @@ -339,6 +339,7 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung 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.txt_Anmerkung, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtREnr, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtReDat, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtZE, System.ComponentModel.ISupportInitialize).EndInit() @@ -355,7 +356,6 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung CType(Me.lblZinsen, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblVZ, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txt_Anmerkung, System.ComponentModel.ISupportInitialize).EndInit() CType(Me, System.ComponentModel.ISupportInitialize).EndInit() End Sub diff --git a/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.vb b/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.vb index 7217261a..34e041ee 100644 --- a/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.vb +++ b/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.vb @@ -60,7 +60,7 @@ End If If Me.Fields.Item("clmnTage") IsNot Nothing AndAlso Me.Fields.Item("clmnTage").Value IsNot Nothing Then txtTage.Text &= Me.Fields.Item("clmnTage").Value.ToString If Me.Fields.Item("clmnZinsen") IsNot Nothing AndAlso Me.Fields.Item("clmnZinsen").Value IsNot Nothing AndAlso IsNumeric(Me.Fields.Item("clmnZinsen").Value) AndAlso CDbl(Me.Fields.Item("clmnZinsen").Value) <> 0 Then txtZinsen.Text &= CDbl(Me.Fields.Item("clmnZinsen").Value).ToString("N2") - If Me.Fields.Item("clmnVZ") IsNot Nothing AndAlso Me.Fields.Item("clmnVZ").Value IsNot Nothing AndAlso IsNumeric(Me.Fields.Item("clmnVZ").Value) Then txtVZ.Text &= Me.Fields.Item("clmnVZ").Value.ToString() & " %" + If Me.Fields.Item("clmnVZ") IsNot Nothing AndAlso Me.Fields.Item("clmnVZ").Value IsNot Nothing AndAlso IsNumeric(Me.Fields.Item("clmnVZ").Value) Then txtVZ.Text &= Me.Fields.Item("clmnVZ").Value.ToString() & "%" End If End Sub diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index 0370b656..19ccb54a 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -4430,18 +4430,26 @@ Nächste_Textzeile_lesen: End Sub Private Sub cboRechnungSprache_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboRechnungSprache.SelectedIndexChanged - txtTextZZ.Text = cFakturierung.przRechnungstextZZ(RECHNUNG) - txtText.Text = cFakturierung.przRechnungstextTXT(RECHNUNG, SPEDBUCH) - If RECHNUNG IsNot Nothing Then - If RECHNUNG.Firma_ID = 19 AndAlso RECHNUNG.Anlage_1 <> "" AndAlso RECHNUNG.Anlage_2 <> "" AndAlso RECHNUNG.Anlage_3 <> "" Then - Select Case cboRechnungSprache._value - Case "DE" : cboAnlage1.Text = "Rechnung" : cboAnlage2.Text = "Lief.-Rechn." : cboAnlage3.Text = "POS-Liste" - Case "EN" : cboAnlage1.Text = "Invoice" : cboAnlage2.Text = "Supplier Invoice(s)" : cboAnlage3.Text = "Item List" - Case "RO" : cboAnlage1.Text = "Factura" : cboAnlage2.Text = "Factura furnizor" : cboAnlage3.Text = "Lista articole" - End Select + If cboRechnungSprache._value <> "" Then + If RECHNUNG IsNot Nothing Then + RECHNUNG.RechnungSprache = cboRechnungSprache._value + + txtTextZZ.Text = cFakturierung.przRechnungstextZZ(RECHNUNG) + txtText.Text = cFakturierung.przRechnungstextTXT(RECHNUNG, SPEDBUCH) + + + If RECHNUNG.Firma_ID = 19 AndAlso RECHNUNG.Anlage_1 <> "" AndAlso RECHNUNG.Anlage_2 <> "" AndAlso RECHNUNG.Anlage_3 <> "" Then + Select Case RECHNUNG.RechnungSprache + Case "DE" : cboAnlage1.Text = "Rechnung" : cboAnlage2.Text = "Lief.-Rechn." : cboAnlage3.Text = "POS-Liste" + Case "EN" : cboAnlage1.Text = "Invoice" : cboAnlage2.Text = "Supplier Invoice(s)" : cboAnlage3.Text = "Item List" + Case "RO" : cboAnlage1.Text = "Factura" : cboAnlage2.Text = "Factura furnizor" : cboAnlage3.Text = "Lista articole" + End Select + + End If End If + End If diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index dc854ac9..1ee5c388 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/USTV/frmUSTVoffeneAntraege.vb b/SDL/USTV/frmUSTVoffeneAntraege.vb index cc395cdf..9caae6c6 100644 --- a/SDL/USTV/frmUSTVoffeneAntraege.vb +++ b/SDL/USTV/frmUSTVoffeneAntraege.vb @@ -195,7 +195,7 @@ Public Class frmUSTVoffeneAntraege 'Exit Sub 'MsgBox(.sql) Dim sqlstring = "Select " & top & " [rmc_kdNr], [rmc_kdName], [rmc_landKZ], [rmc_reDatum], [rmc_reNr], [rmc_waehrung], [rmc_betragMWST],rmc_daid as daId FROM [tblRMCImport] - INNER JOIN Adressen on WölflKundenNr=[rmc_kdNr] + INNER JOIN Adressen on WölflKundenNr=[rmc_kdNr] or weitereWölflKundenNr=[rmc_kdNr] where cast(rmc_reDatum As Date) between '" & dat_Sum_Von.Value & "' And '" & dat_Sum_Bis.Value & "' And rmc_archiv <> 1 " & sqlwhere & "group by rmc_reDatum, rmc_kdNr,[rmc_kdName], [rmc_landKZ],[rmc_reNr], [rmc_waehrung], [rmc_betragMWST], rmc_daid having [rmc_betragMWST] <> 0" @@ -758,7 +758,7 @@ Public Class frmUSTVoffeneAntraege [rmc_reDatum] AS Rechnungsdatum, [rmc_betragMWST] as MWST FROM [tblRMCImport] - INNER JOIN Adressen on WölflKundenNr= [rmc_kdNr] + INNER JOIN Adressen on WölflKundenNr= [rmc_kdNr] or weitereWölflKundenNr=[rmc_kdNr] where cast(rmc_reDatum As Date) between '" & dat_Sum_Von.Value & "' And '" & dat_Sum_Bis.Value & "' And UStVAn_ID is null " & sqlwhereRMC & " group by Adressen.AdressenNr,Adressen.[Name 1],Adressen.LandKz, [rmc_landKZ],[rmc_reNr], rmc_reDatum, [rmc_betragMWST] @@ -1093,7 +1093,7 @@ Public Class frmUSTVoffeneAntraege Dim SQLQuery As String = "" Select Case LIEFERANT.ToString.ToLower Case "plose" : SQLQuery = "select [plInv_SupplierRechnungsNr] as RechnungsNr,plInv_SupplierRechnungsDatum as Rechnungsdatum,Adressen.AdressenNr,Adressen.[Name 1] as Kunde from [tblPLOSE_Inv_Data] INNER JOIN Adressen on [plInv_PLOSEKundennummer]=Adressen.PLOSEKundenNr where [plInv_daId] is null and cast([plInv_SupplierRechnungsDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by plInv_SupplierRechnungsNr, Adressen.AdressenNr, Adressen.[Name 1], plInv_SupplierRechnungsDatum" - Case "rmc" : SQLQuery = "select rmc_reNr as RechnungsNr,rmc_reDatum AS Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from [tblRMCImport] INNER JOIN Adressen on WölflKundenNr= [rmc_kdNr] where rmc_daId is null and cast([rmc_reDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by rmc_reNr, Adressen.AdressenNr, Adressen.[Name 1],rmc_reDatum " + Case "rmc" : SQLQuery = "select rmc_reNr as RechnungsNr,rmc_reDatum AS Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from [tblRMCImport] INNER JOIN Adressen on WölflKundenNr=[rmc_kdNr] or weitereWölflKundenNr=[rmc_kdNr] where rmc_daId is null and cast([rmc_reDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by rmc_reNr, Adressen.AdressenNr, Adressen.[Name 1],rmc_reDatum " Case "mse" : SQLQuery = "select invoice_id as RechnungsNr,[invoice_date] as Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from tblMSEInvoices inner join [tblMSECustomers] on [customer_number] = [customer_id] INNER JOIN Adressen on Adressen.MSEKundenNr = [customer_number] where daId is null and cast(invoice_date as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by invoice_id, Adressen.AdressenNr, Adressen.[Name 1], invoice_date" Case "uta" : SQLQuery = "select tblUTAImportNew.Abrechnungsnummer as RechnungNr,[Rechnungsdatum] AS Rechnungsdatum ,Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from tblUTAImportNew INNER JOIN Adressen on Adressen.UTAKundenNr = tblUTAImportNew.Kundennummer where daId is null and cast([Rechnungsdatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' and Lieferland <> 'ROM' and Steuerliches_Lieferland <> 'ROM' group by tblUTAImportNew.Abrechnungsnummer, Rechnungsdatum,Adressen.AdressenNr, Adressen.[Name 1] " Case "ids" : SQLQuery = "select Invoicenumber as RechnungsNr,YearMonthDay as Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from tblIDSInvoicesNew Inner join [tbl_IDS_Kunden] on [tbl_IDS_Kunden].CustomerCode =tblIDSInvoicesNew.CustomerCode and isnull([tbl_IDS_Kunden].KdNrAlt, 1) = 0 Inner join Adressen on Adressen.AdressenNr = [tbl_IDS_Kunden].KdNrVERAG where DocumentName is null and cast(YearMonthDay as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by Invoicenumber, Adressen.AdressenNr, Adressen.[Name 1], YearMonthDay" diff --git a/SDL/USTV/usrCntlUSTV.Designer.vb b/SDL/USTV/usrCntlUSTV.Designer.vb index 8db4f257..a1bf802b 100644 --- a/SDL/USTV/usrCntlUSTV.Designer.vb +++ b/SDL/USTV/usrCntlUSTV.Designer.vb @@ -292,25 +292,27 @@ Partial Class usrCntlUSTV Me.txtRisiko._Waehrung = True Me.txtRisiko._WaehrungZeichen = True Me.txtRisiko.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtRisiko.BackColor = System.Drawing.Color.IndianRed + Me.txtRisiko.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtRisiko.ForeColor = System.Drawing.Color.Black - Me.txtRisiko.Location = New System.Drawing.Point(1161, 28) + Me.txtRisiko.Location = New System.Drawing.Point(1015, 29) Me.txtRisiko.MaxLineLength = -1 Me.txtRisiko.MaxLines_Warning = "" Me.txtRisiko.MaxLines_Warning_Label = Nothing Me.txtRisiko.Name = "txtRisiko" Me.txtRisiko.ReadOnly = True - Me.txtRisiko.Size = New System.Drawing.Size(107, 20) + Me.txtRisiko.Size = New System.Drawing.Size(96, 20) Me.txtRisiko.TabIndex = 56 ' 'Label10 ' Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(1116, 31) + Me.Label10.Location = New System.Drawing.Point(957, 32) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(45, 13) + Me.Label10.Size = New System.Drawing.Size(36, 13) Me.Label10.TabIndex = 55 - Me.Label10.Text = "= Risiko" + Me.Label10.Text = "Risiko" ' 'txtOPSaldo ' @@ -327,21 +329,23 @@ Partial Class usrCntlUSTV Me.txtOPSaldo._Waehrung = True Me.txtOPSaldo._WaehrungZeichen = True Me.txtOPSaldo.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtOPSaldo.BackColor = System.Drawing.Color.IndianRed + Me.txtOPSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtOPSaldo.ForeColor = System.Drawing.Color.Black - Me.txtOPSaldo.Location = New System.Drawing.Point(999, 0) + Me.txtOPSaldo.Location = New System.Drawing.Point(1015, 6) Me.txtOPSaldo.MaxLineLength = -1 Me.txtOPSaldo.MaxLines_Warning = "" Me.txtOPSaldo.MaxLines_Warning_Label = Nothing Me.txtOPSaldo.Name = "txtOPSaldo" Me.txtOPSaldo.ReadOnly = True - Me.txtOPSaldo.Size = New System.Drawing.Size(91, 20) + Me.txtOPSaldo.Size = New System.Drawing.Size(96, 20) Me.txtOPSaldo.TabIndex = 54 ' 'Label11 ' Me.Label11.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label11.AutoSize = True - Me.Label11.Location = New System.Drawing.Point(941, 6) + Me.Label11.Location = New System.Drawing.Point(957, 12) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(52, 13) Me.Label11.TabIndex = 53 @@ -373,13 +377,13 @@ Partial Class usrCntlUSTV Me.txtSumDiff._WaehrungZeichen = True Me.txtSumDiff.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtSumDiff.ForeColor = System.Drawing.Color.Black - Me.txtSumDiff.Location = New System.Drawing.Point(999, 19) + Me.txtSumDiff.Location = New System.Drawing.Point(1396, 49) Me.txtSumDiff.MaxLineLength = -1 Me.txtSumDiff.MaxLines_Warning = "" Me.txtSumDiff.MaxLines_Warning_Label = Nothing Me.txtSumDiff.Name = "txtSumDiff" Me.txtSumDiff.ReadOnly = True - Me.txtSumDiff.Size = New System.Drawing.Size(91, 20) + Me.txtSumDiff.Size = New System.Drawing.Size(92, 20) Me.txtSumDiff.TabIndex = 32 ' 'btnKundendatenaktualisieren @@ -412,13 +416,13 @@ Partial Class usrCntlUSTV Me.txtSumErst._WaehrungZeichen = True Me.txtSumErst.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtSumErst.ForeColor = System.Drawing.Color.Black - Me.txtSumErst.Location = New System.Drawing.Point(1381, 25) + Me.txtSumErst.Location = New System.Drawing.Point(1396, 25) Me.txtSumErst.MaxLineLength = -1 Me.txtSumErst.MaxLines_Warning = "" Me.txtSumErst.MaxLines_Warning_Label = Nothing Me.txtSumErst.Name = "txtSumErst" Me.txtSumErst.ReadOnly = True - Me.txtSumErst.Size = New System.Drawing.Size(107, 20) + Me.txtSumErst.Size = New System.Drawing.Size(92, 20) Me.txtSumErst.TabIndex = 31 ' 'txtSumUst @@ -437,13 +441,13 @@ Partial Class usrCntlUSTV Me.txtSumUst._WaehrungZeichen = True Me.txtSumUst.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtSumUst.ForeColor = System.Drawing.Color.Black - Me.txtSumUst.Location = New System.Drawing.Point(1381, 5) + Me.txtSumUst.Location = New System.Drawing.Point(1396, 5) Me.txtSumUst.MaxLineLength = -1 Me.txtSumUst.MaxLines_Warning = "" Me.txtSumUst.MaxLines_Warning_Label = Nothing Me.txtSumUst.Name = "txtSumUst" Me.txtSumUst.ReadOnly = True - Me.txtSumUst.Size = New System.Drawing.Size(107, 20) + Me.txtSumUst.Size = New System.Drawing.Size(92, 20) Me.txtSumUst.TabIndex = 30 ' 'txtVZBetrag @@ -462,40 +466,40 @@ Partial Class usrCntlUSTV Me.txtVZBetrag._WaehrungZeichen = True Me.txtVZBetrag.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtVZBetrag.ForeColor = System.Drawing.Color.Black - Me.txtVZBetrag.Location = New System.Drawing.Point(1161, 5) + Me.txtVZBetrag.Location = New System.Drawing.Point(1204, 5) Me.txtVZBetrag.MaxLineLength = -1 Me.txtVZBetrag.MaxLines_Warning = "" Me.txtVZBetrag.MaxLines_Warning_Label = Nothing Me.txtVZBetrag.Name = "txtVZBetrag" Me.txtVZBetrag.ReadOnly = True - Me.txtVZBetrag.Size = New System.Drawing.Size(107, 20) + Me.txtVZBetrag.Size = New System.Drawing.Size(92, 20) Me.txtVZBetrag.TabIndex = 51 ' 'Label5 ' Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(914, 27) + Me.Label5.Location = New System.Drawing.Point(1302, 51) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(85, 13) + Me.Label5.Size = New System.Drawing.Size(79, 13) Me.Label5.TabIndex = 29 - Me.Label5.Text = "- Differenzbetrag" + Me.Label5.Text = "Differenzbetrag" ' 'Label8 ' Me.Label8.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(1100, 8) + Me.Label8.Location = New System.Drawing.Point(1117, 13) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(64, 13) + Me.Label8.Size = New System.Drawing.Size(55, 13) Me.Label8.TabIndex = 50 - Me.Label8.Text = "+ VZ-Betrag" + Me.Label8.Text = "VZ-Betrag" ' 'Label4 ' Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(1276, 28) + Me.Label4.Location = New System.Drawing.Point(1302, 27) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(90, 13) Me.Label4.TabIndex = 28 @@ -516,21 +520,23 @@ Partial Class usrCntlUSTV Me.txt3470Betrag._Waehrung = True Me.txt3470Betrag._WaehrungZeichen = True Me.txt3470Betrag.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txt3470Betrag.BackColor = System.Drawing.Color.LightGreen + Me.txt3470Betrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txt3470Betrag.ForeColor = System.Drawing.Color.Black - Me.txt3470Betrag.Location = New System.Drawing.Point(999, 40) + Me.txt3470Betrag.Location = New System.Drawing.Point(848, 8) Me.txt3470Betrag.MaxLineLength = -1 Me.txt3470Betrag.MaxLines_Warning = "" Me.txt3470Betrag.MaxLines_Warning_Label = Nothing Me.txt3470Betrag.Name = "txt3470Betrag" Me.txt3470Betrag.ReadOnly = True - Me.txt3470Betrag.Size = New System.Drawing.Size(91, 20) + Me.txt3470Betrag.Size = New System.Drawing.Size(103, 20) Me.txt3470Betrag.TabIndex = 49 ' 'Label3 ' Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(1276, 7) + Me.Label3.Location = New System.Drawing.Point(1302, 6) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(59, 13) Me.Label3.TabIndex = 27 @@ -540,11 +546,11 @@ Partial Class usrCntlUSTV ' Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(956, 43) + Me.Label7.Location = New System.Drawing.Point(811, 12) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(37, 13) + Me.Label7.Size = New System.Drawing.Size(31, 13) Me.Label7.TabIndex = 48 - Me.Label7.Text = "- 3470" + Me.Label7.Text = "3470" ' 'txtVorschaubetrGes ' @@ -562,7 +568,7 @@ Partial Class usrCntlUSTV Me.txtVorschaubetrGes._WaehrungZeichen = True Me.txtVorschaubetrGes.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtVorschaubetrGes.ForeColor = System.Drawing.Color.Black - Me.txtVorschaubetrGes.Location = New System.Drawing.Point(999, 60) + Me.txtVorschaubetrGes.Location = New System.Drawing.Point(1205, 28) Me.txtVorschaubetrGes.MaxLineLength = -1 Me.txtVorschaubetrGes.MaxLines_Warning = "" Me.txtVorschaubetrGes.MaxLines_Warning_Label = Nothing @@ -575,11 +581,11 @@ Partial Class usrCntlUSTV ' Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(872, 63) + Me.Label6.Location = New System.Drawing.Point(1117, 35) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(127, 13) + Me.Label6.Size = New System.Drawing.Size(82, 13) Me.Label6.TabIndex = 33 - Me.Label6.Text = "- Vorschaubetrag-Gesamt" + Me.Label6.Text = "Vorschaubetrag" ' 'cbxDifferenzbetrag ' diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 167470f7..fd4a5da4 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -1,7 +1,4 @@ Imports System.ComponentModel -Imports com.sun.org.apache.bcel.internal.generic -Imports com.sun.xml.internal.rngom -Imports DocumentFormat.OpenXml.Drawing Imports Microsoft.Office.Interop Imports VERAG_PROG_ALLGEMEIN @@ -47,10 +44,17 @@ Public Class usrCntlUSTV End If End If - .SET_SQL("SELECT " & topMax & " [tblUStVAntrag].[UStVAn_ID],UStVAn_AntragArt,[UStVAn_KuNr],[UStVAn_Name],[UStVAn_LandKz],LandKz as Land_Antrag , UStVAn_BezugsNr, [UStVAn_ReDatVon], [UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_VZBetrag],[UStVAn_VZDatum],[UStVAn_3470] ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],([UStVAn_USteuerbetrag] - [UStVAn_Erstattungsbetrag]) as UStVAn_Differenzbetrag,[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],([UStVAn_USteuerbetragEUR] - [UStVAn_ErstattungsbetragEUR]) as UStVAn_DifferenzbetragEUR,UStVAn_VZoffen ,[UStVAn_Sachbearbeiter] + Dim sql_query As String = "SELECT " & topMax & " [tblUStVAntrag].[UStVAn_ID],UStVAn_AntragArt,[UStVAn_KuNr],[UStVAn_Name],[UStVAn_LandKz],LandKz as Land_Antrag , UStVAn_BezugsNr, [UStVAn_ReDatVon], [UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_VZBetrag],[UStVAn_VZDatum],[UStVAn_3470],STUFF(( + SELECT ', ' + CAST(e.GutschriftsNr AS VARCHAR(50)) + From tblUStVErstattung e + Where e.UStVAn_ID = [tblUStVAntrag].[UStVAn_ID] + FOR XML PATH(''), TYPE + ).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS 'GutschriftsNr' ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],([UStVAn_USteuerbetrag] - [UStVAn_Erstattungsbetrag]) as UStVAn_Differenzbetrag,[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],([UStVAn_USteuerbetragEUR] - [UStVAn_ErstattungsbetragEUR]) as UStVAn_DifferenzbetragEUR,UStVAn_VZoffen ,[UStVAn_Sachbearbeiter] FROM [tblUStVAntrag] inner join [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr where 1=1 " & getWhere(, ID, AntragsLand) & " - order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LandKz,[UStVAn_ReDatVon] desc", "FMZOLL") + order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LandKz,[UStVAn_ReDatVon] desc" + + .SET_SQL(sql_query, "FMZOLL") .LOAD() loaded = True @@ -62,41 +66,38 @@ Public Class usrCntlUSTV btnKundendatenaktualisieren.Enabled = KdSearchBox1.KdNr > 0 'AndAlso .RowCount > 0 - - If .Columns.Count > 0 Then Dim DataGridViewCellStyleDate = New DataGridViewCellStyle() DataGridViewCellStyleDate.Format = "MM/yyyy" - - ' .Columns("UStVAn_ID").Visible = False - .Columns("UStVAn_ID").Width = 70 + .Columns("UStVAn_ID").Width = 60 .Columns("UStVAn_ID").HeaderText = "ID" '.Columns("UStVAn_ID").Frozen = True .Columns("UStVAn_AntragArt").HeaderText = "Art" - .Columns("UStVAn_AntragArt").MinimumWidth = 50 + .Columns("UStVAn_AntragArt").Width = 50 '.Columns("UStVAn_AntragArt").Frozen = True .Columns("UStVAn_KuNr").HeaderText = "KundenNr" - .Columns("UStVAn_Name").MinimumWidth = 70 + .Columns("UStVAn_KuNr").Width = 70 '.Columns("UStVAn_KuNr").Frozen = True .Columns("UStVAn_Name").HeaderText = "Firma" - .Columns("UStVAn_Name").Width = 200 + .Columns("UStVAn_Name").MinimumWidth = 150 + .Columns("UStVAn_Name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill '.Columns("UStVAn_Name").Frozen = True ' .Columns("UStVAn_Name").MinimumWidth = 150 ' .Columns("UStVAn_Name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("UStVAn_LandKz").HeaderText = "Land" - .Columns("UStVAn_LandKz").Width = 60 + .Columns("UStVAn_LandKz").Width = 50 '.Columns("UStVAn_LandKz").Frozen = True .Columns("Land_Antrag").HeaderText = "Antrag Land" - .Columns("Land_Antrag").Width = 60 + .Columns("Land_Antrag").Width = 50 '.Columns("Land_Antrag").Frozen = True .Columns("UStVAn_ReDatVon").HeaderText = "Von" @@ -108,7 +109,7 @@ Public Class usrCntlUSTV .Columns("UStVAn_ReDatBis").Width = 75 .Columns("UStVAn_BezugsNr").HeaderText = "BezugsNr" - .Columns("UStVAn_BezugsNr").Width = 70 + .Columns("UStVAn_BezugsNr").Width = 60 .Columns("UStVAn_AntragEingereichtAm").HeaderText = "Eingereicht Datum" .Columns("UStVAn_AntragEingereichtAm").Width = 80 @@ -123,7 +124,7 @@ Public Class usrCntlUSTV .Columns("UStVAn_3470").HeaderText = "3470" - .Columns("UStVAn_3470").Width = 100 + .Columns("UStVAn_3470").Width = 80 .Columns("UStVAn_3470").DefaultCellStyle.Format = "N2" .Columns("UStVAn_3470").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight @@ -161,14 +162,16 @@ Public Class usrCntlUSTV .Columns("UStVAn_DifferenzbetragEUR").DefaultCellStyle.Format = "N2" .Columns("UStVAn_DifferenzbetragEUR").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight - .Columns("UStVAn_VZoffen").HeaderText = "VZ nicht abgerechnet" .Columns("UStVAn_VZoffen").Width = 80 .Columns("UStVAn_VZoffen").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + .Columns("GutschriftsNr").HeaderText = "GutschriftsNr" + .Columns("GutschriftsNr").Width = 180 + .Columns("GutschriftsNr").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + .Columns("UStVAn_Sachbearbeiter").HeaderText = "Sachbearbeiter" - .Columns("UStVAn_Sachbearbeiter").MinimumWidth = 150 - .Columns("UStVAn_Sachbearbeiter").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("UStVAn_Sachbearbeiter").MinimumWidth = 60 End If Dim GesamtUSteuer As Double = 0 @@ -594,7 +597,7 @@ Public Class usrCntlUSTV - Private Sub btn2_Click(sender As Object, e As EventArgs) Handles btn3470.Click + Private Sub btn2_Click(sender As Object, e As EventArgs) Handles Button2.Click If Not ContextMenuStrip3.Items.ContainsKey("dgv") Then @@ -1653,11 +1656,11 @@ Public Class usrCntlUSTV - Dim sqlQery = "SELECT dbo.tblUStVAntrag.UStVAn_ID, dbo.tblUStVAntrag.UStVAn_KuNr, dbo.tblUStVAntrag.UStVAn_ReDatVon, - dbo.tblUStVAntrag.UStVAn_ReDatBis, - dbo.tblUStVAntrag.UStVAn_Ausstellungsdatum, - (SELECT LandKz from [Länderverzeichnis für die Außenhandelsstatistik] where LandNr = dbo.tblUStVAntrag.UStVAn_LandNr) as AntragsLand, - dbo.tblUStVAntrag.UStVAn_VZDatum, dbo.tblUStVAntrag.UStVAn_VZBetrag, dbo.tblUStVAntrag.UStVAn_RZBetragVZ, dbo.Adressen.Ordnungsbegriff, dbo.Adressen.LandKz, ISNULL + Dim sqlQery = "SELECT dbo.tblUStVAntrag.UStVAn_KuNr as KDNR, dbo.Adressen.Ordnungsbegriff as Name, dbo.Adressen.LandKz,dbo.tblUStVAntrag.UStVAn_ID as ID, + (SELECT LandKz from [Länderverzeichnis für die Außenhandelsstatistik] where LandNr = dbo.tblUStVAntrag.UStVAn_LandNr) as Antrag_LKZ, + dbo.tblUStVAntrag.UStVAn_ReDatVon as ReDatVon, dbo.tblUStVAntrag.UStVAn_ReDatBis as ReDatBis, + dbo.tblUStVAntrag.UStVAn_Ausstellungsdatum as Ausstellungsdatum , dbo.tblUStVAntrag.UStVAn_VZDatum as VZDat, dbo.tblUStVAntrag.UStVAn_VZBetrag as VZBetrag, dbo.tblUStVAntrag.UStVAn_RZBetragVZ as RZBetragVZ, + ISNULL ((SELECT SUM(UStVEr_USteuerbetragEUR) AS Expr1 FROM dbo.tblUStVErstattung WHERE (UStVAn_ID = dbo.tblUStVAntrag.UStVAn_ID)), 0) AS Erstattungsbetrag, CASE WHEN ([UStVAn_VZBetrag] - ISNULL([UStVAn_RZBetragVZ], 0) - ISNULL @@ -1666,7 +1669,7 @@ Public Class usrCntlUSTV WHERE dbo.tblUStVErstattung.UStVAn_ID = dbo.tblUStVAntrag.UStVAn_ID), 0)) > 0 THEN [UStVAn_VZBetrag] - ISNULL([UStVAn_RZBetragVZ], 0) - ISNULL ((SELECT SUM(dbo.tblUStVErstattung.UStVEr_USteuerbetragEUR) FROM dbo.tblUStVErstattung - WHERE dbo.tblUStVErstattung.UStVAn_ID = dbo.tblUStVAntrag.UStVAn_ID), 0) ELSE 0 END AS UStVAn_VZBetragAktuell + WHERE dbo.tblUStVErstattung.UStVAn_ID = dbo.tblUStVAntrag.UStVAn_ID), 0) ELSE 0 END AS VZBetragAktuell FROM dbo.tblUStVAntrag INNER JOIN dbo.Adressen ON dbo.tblUStVAntrag.UStVAn_KuNr = dbo.Adressen.AdressenNr WHERE (dbo.tblUStVAntrag.UStVAn_VZBetrag IS NOT NULL)" & sqlKunde & whereStr @@ -1679,13 +1682,6 @@ Public Class usrCntlUSTV MsgBox("keine Daten!") Exit Sub Else - For Each col In dtVorauszahlung.Columns - - Dim colName = col.ColumnName.Replace("UStVAn_", "") - - If Not col.ColumnName.Contains(colName) Then col.ColumnName = col.ColumnName.Replace("UStVAn_", "") - - Next End If diff --git a/SDL/buchhaltung/usrCntlBH.Designer.vb b/SDL/buchhaltung/usrCntlBH.Designer.vb index 6eb3df5d..2cbae264 100644 --- a/SDL/buchhaltung/usrCntlBH.Designer.vb +++ b/SDL/buchhaltung/usrCntlBH.Designer.vb @@ -25,6 +25,7 @@ Partial Class usrCntlBH Me.Label6 = New System.Windows.Forms.Label() Me.pnl = New System.Windows.Forms.Panel() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.btn_fehlendeUID = New System.Windows.Forms.Button() Me.lblUID_zupruefen = New System.Windows.Forms.Label() Me.Label53 = New System.Windows.Forms.Label() Me.GroupBox12 = New System.Windows.Forms.GroupBox() @@ -36,29 +37,6 @@ Partial Class usrCntlBH Me.Label54 = New System.Windows.Forms.Label() Me.cbxFirmaUID = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button14 = New System.Windows.Forms.Button() - Me.GroupBox11 = New System.Windows.Forms.GroupBox() - Me.btnDel_ = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.btnWikiStatusmails = New System.Windows.Forms.Button() - Me.txtAbBetragAbrechnen = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label52 = New System.Windows.Forms.Label() - Me.btnZNBverrechnen = New System.Windows.Forms.Button() - Me.Label51 = New System.Windows.Forms.Label() - Me.txtnichtabrechneteKunden = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label49 = New System.Windows.Forms.Label() - Me.btnZinsbelastung = New System.Windows.Forms.Button() - Me.Button13 = New System.Windows.Forms.Button() - Me.txtZinssatz = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.lblnichtabgerechneteZNB = New System.Windows.Forms.Label() - Me.Label45 = New System.Windows.Forms.Label() - Me.Label48 = New System.Windows.Forms.Label() - Me.txtKdNrvon = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label46 = New System.Windows.Forms.Label() - Me.txtKdNrbis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtTolInTagen = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label47 = New System.Windows.Forms.Label() - Me.Label44 = New System.Windows.Forms.Label() - Me.txtZRvon = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtZRbis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label42 = New System.Windows.Forms.Label() Me.GroupBox10 = New System.Windows.Forms.GroupBox() Me.Label43 = New System.Windows.Forms.Label() @@ -161,11 +139,34 @@ Partial Class usrCntlBH Me.Label30 = New System.Windows.Forms.Label() Me.Label29 = New System.Windows.Forms.Label() Me.Button7 = New System.Windows.Forms.Button() - Me.btn_fehlendeUID = New System.Windows.Forms.Button() + Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.GroupBox11 = New System.Windows.Forms.GroupBox() + Me.Label57 = New System.Windows.Forms.Label() + Me.btnDel_ = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.btnWikiStatusmails = New System.Windows.Forms.Button() + Me.txtAbBetragAbrechnen = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label52 = New System.Windows.Forms.Label() + Me.btnZNBverrechnen = New System.Windows.Forms.Button() + Me.txtnichtabrechneteKunden = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label49 = New System.Windows.Forms.Label() + Me.btnZinsbelastung = New System.Windows.Forms.Button() + Me.Button13 = New System.Windows.Forms.Button() + Me.txtZinssatz = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.lblnichtabgerechneteZNB = New System.Windows.Forms.Label() + Me.Label45 = New System.Windows.Forms.Label() + Me.Label48 = New System.Windows.Forms.Label() + Me.txtKdNrvon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label46 = New System.Windows.Forms.Label() + Me.txtKdNrbis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtTolInTagen = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label47 = New System.Windows.Forms.Label() + Me.Label44 = New System.Windows.Forms.Label() + Me.txtZRvon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtZRbis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label51 = New System.Windows.Forms.Label() Me.pnl.SuspendLayout() Me.TabPage1.SuspendLayout() Me.GroupBox12.SuspendLayout() - Me.GroupBox11.SuspendLayout() Me.GroupBox10.SuspendLayout() Me.GroupBox8.SuspendLayout() Me.GroupBox7.SuspendLayout() @@ -181,6 +182,8 @@ Partial Class usrCntlBH Me.TabPage5.SuspendLayout() Me.GroupBox9.SuspendLayout() Me.GroupBox6.SuspendLayout() + Me.TabPage2.SuspendLayout() + Me.GroupBox11.SuspendLayout() Me.SuspendLayout() ' 'Label6 @@ -210,7 +213,6 @@ Partial Class usrCntlBH Me.TabPage1.Controls.Add(Me.lblUID_zupruefen) Me.TabPage1.Controls.Add(Me.Label53) Me.TabPage1.Controls.Add(Me.GroupBox12) - Me.TabPage1.Controls.Add(Me.GroupBox11) Me.TabPage1.Controls.Add(Me.Label42) Me.TabPage1.Controls.Add(Me.GroupBox10) Me.TabPage1.Controls.Add(Me.Label34) @@ -229,11 +231,24 @@ Partial Class usrCntlBH Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(956, 968) + Me.TabPage1.Size = New System.Drawing.Size(956, 879) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Allgemein" Me.TabPage1.UseVisualStyleBackColor = True ' + 'btn_fehlendeUID + ' + Me.btn_fehlendeUID.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btn_fehlendeUID.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.btn_fehlendeUID.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.btn_fehlendeUID.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btn_fehlendeUID.Location = New System.Drawing.Point(810, 102) + Me.btn_fehlendeUID.Name = "btn_fehlendeUID" + Me.btn_fehlendeUID.Size = New System.Drawing.Size(43, 20) + Me.btn_fehlendeUID.TabIndex = 35 + Me.btn_fehlendeUID.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btn_fehlendeUID.UseVisualStyleBackColor = True + ' 'lblUID_zupruefen ' Me.lblUID_zupruefen.AutoSize = True @@ -382,380 +397,6 @@ Partial Class usrCntlBH Me.Button14.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button14.UseVisualStyleBackColor = True ' - 'GroupBox11 - ' - Me.GroupBox11.Controls.Add(Me.btnDel_) - Me.GroupBox11.Controls.Add(Me.btnWikiStatusmails) - Me.GroupBox11.Controls.Add(Me.txtAbBetragAbrechnen) - Me.GroupBox11.Controls.Add(Me.Label52) - Me.GroupBox11.Controls.Add(Me.btnZNBverrechnen) - Me.GroupBox11.Controls.Add(Me.Label51) - Me.GroupBox11.Controls.Add(Me.txtnichtabrechneteKunden) - Me.GroupBox11.Controls.Add(Me.Label49) - Me.GroupBox11.Controls.Add(Me.btnZinsbelastung) - Me.GroupBox11.Controls.Add(Me.Button13) - Me.GroupBox11.Controls.Add(Me.txtZinssatz) - Me.GroupBox11.Controls.Add(Me.lblnichtabgerechneteZNB) - Me.GroupBox11.Controls.Add(Me.Label45) - Me.GroupBox11.Controls.Add(Me.Label48) - Me.GroupBox11.Controls.Add(Me.txtKdNrvon) - Me.GroupBox11.Controls.Add(Me.Label46) - Me.GroupBox11.Controls.Add(Me.txtKdNrbis) - Me.GroupBox11.Controls.Add(Me.txtTolInTagen) - Me.GroupBox11.Controls.Add(Me.Label47) - Me.GroupBox11.Controls.Add(Me.Label44) - Me.GroupBox11.Controls.Add(Me.txtZRvon) - Me.GroupBox11.Controls.Add(Me.txtZRbis) - Me.GroupBox11.Location = New System.Drawing.Point(5, 874) - Me.GroupBox11.Name = "GroupBox11" - Me.GroupBox11.Size = New System.Drawing.Size(847, 69) - Me.GroupBox11.TabIndex = 35 - Me.GroupBox11.TabStop = False - ' - 'btnDel_ - ' - Me.btnDel_.allowBorder = False - Me.btnDel_.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnDel_.BackgroundImage = Global.SDL.My.Resources.Resources.del - Me.btnDel_.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnDel_.FlatAppearance.BorderSize = 0 - Me.btnDel_.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnDel_.ForeColor = System.Drawing.Color.Black - Me.btnDel_.Location = New System.Drawing.Point(814, 42) - Me.btnDel_.Name = "btnDel_" - Me.btnDel_.Size = New System.Drawing.Size(20, 20) - Me.btnDel_.TabIndex = 74 - Me.btnDel_.UseVisualStyleBackColor = True - Me.btnDel_.Visible = False - ' - 'btnWikiStatusmails - ' - Me.btnWikiStatusmails.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen - Me.btnWikiStatusmails.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnWikiStatusmails.FlatAppearance.BorderSize = 0 - Me.btnWikiStatusmails.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnWikiStatusmails.Location = New System.Drawing.Point(814, 10) - Me.btnWikiStatusmails.Name = "btnWikiStatusmails" - Me.btnWikiStatusmails.Size = New System.Drawing.Size(25, 20) - Me.btnWikiStatusmails.TabIndex = 73 - Me.btnWikiStatusmails.UseVisualStyleBackColor = True - ' - 'txtAbBetragAbrechnen - ' - Me.txtAbBetragAbrechnen._DateTimeOnly = False - Me.txtAbBetragAbrechnen._numbersOnly = True - Me.txtAbBetragAbrechnen._numbersOnlyKommastellen = "" - Me.txtAbBetragAbrechnen._numbersOnlyTrennzeichen = True - Me.txtAbBetragAbrechnen._Prozent = False - Me.txtAbBetragAbrechnen._ShortDateNew = False - Me.txtAbBetragAbrechnen._ShortDateOnly = False - Me.txtAbBetragAbrechnen._TimeOnly = False - Me.txtAbBetragAbrechnen._TimeOnly_Seconds = False - Me.txtAbBetragAbrechnen._value = "0" - Me.txtAbBetragAbrechnen._Waehrung = False - Me.txtAbBetragAbrechnen._WaehrungZeichen = False - Me.txtAbBetragAbrechnen.ForeColor = System.Drawing.Color.Black - Me.txtAbBetragAbrechnen.Location = New System.Drawing.Point(665, 43) - Me.txtAbBetragAbrechnen.MaxLineLength = -1 - Me.txtAbBetragAbrechnen.MaxLines_Warning = "" - Me.txtAbBetragAbrechnen.MaxLines_Warning_Label = Nothing - Me.txtAbBetragAbrechnen.Name = "txtAbBetragAbrechnen" - Me.txtAbBetragAbrechnen.Size = New System.Drawing.Size(34, 20) - Me.txtAbBetragAbrechnen.TabIndex = 42 - Me.txtAbBetragAbrechnen.Text = "20" - Me.txtAbBetragAbrechnen.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'Label52 - ' - Me.Label52.AutoSize = True - Me.Label52.Location = New System.Drawing.Point(521, 46) - Me.Label52.Name = "Label52" - Me.Label52.Size = New System.Drawing.Size(138, 13) - Me.Label52.TabIndex = 41 - Me.Label52.Text = "*wenn nicht im Kd hinterlegt" - ' - 'btnZNBverrechnen - ' - Me.btnZNBverrechnen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center - Me.btnZNBverrechnen.Enabled = False - Me.btnZNBverrechnen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnZNBverrechnen.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.btnZNBverrechnen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnZNBverrechnen.Location = New System.Drawing.Point(710, 39) - Me.btnZNBverrechnen.Name = "btnZNBverrechnen" - Me.btnZNBverrechnen.Size = New System.Drawing.Size(98, 26) - Me.btnZNBverrechnen.TabIndex = 40 - Me.btnZNBverrechnen.Text = "verrechnen" - Me.btnZNBverrechnen.UseVisualStyleBackColor = True - ' - 'Label51 - ' - Me.Label51.AutoSize = True - Me.Label51.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label51.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label51.Location = New System.Drawing.Point(2, -4) - Me.Label51.Name = "Label51" - Me.Label51.Size = New System.Drawing.Size(160, 17) - Me.Label51.TabIndex = 36 - Me.Label51.Text = "Zinsnachberechnung" - ' - 'txtnichtabrechneteKunden - ' - Me.txtnichtabrechneteKunden._DateTimeOnly = False - Me.txtnichtabrechneteKunden._numbersOnly = False - Me.txtnichtabrechneteKunden._numbersOnlyKommastellen = "" - Me.txtnichtabrechneteKunden._numbersOnlyTrennzeichen = True - Me.txtnichtabrechneteKunden._Prozent = False - Me.txtnichtabrechneteKunden._ShortDateNew = False - Me.txtnichtabrechneteKunden._ShortDateOnly = False - Me.txtnichtabrechneteKunden._TimeOnly = False - Me.txtnichtabrechneteKunden._TimeOnly_Seconds = False - Me.txtnichtabrechneteKunden._value = "0" - Me.txtnichtabrechneteKunden._Waehrung = False - Me.txtnichtabrechneteKunden._WaehrungZeichen = True - Me.txtnichtabrechneteKunden.ForeColor = System.Drawing.Color.Black - Me.txtnichtabrechneteKunden.Location = New System.Drawing.Point(665, 16) - Me.txtnichtabrechneteKunden.MaxLineLength = -1 - Me.txtnichtabrechneteKunden.MaxLines_Warning = "" - Me.txtnichtabrechneteKunden.MaxLines_Warning_Label = Nothing - Me.txtnichtabrechneteKunden.Name = "txtnichtabrechneteKunden" - Me.txtnichtabrechneteKunden.ReadOnly = True - Me.txtnichtabrechneteKunden.Size = New System.Drawing.Size(34, 20) - Me.txtnichtabrechneteKunden.TabIndex = 39 - Me.txtnichtabrechneteKunden.Text = "0" - Me.txtnichtabrechneteKunden.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'Label49 - ' - Me.Label49.AutoSize = True - Me.Label49.Location = New System.Drawing.Point(123, 45) - Me.Label49.Name = "Label49" - Me.Label49.Size = New System.Drawing.Size(53, 13) - Me.Label49.TabIndex = 33 - Me.Label49.Text = "Zinssatz*:" - ' - 'btnZinsbelastung - ' - Me.btnZinsbelastung.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center - Me.btnZinsbelastung.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnZinsbelastung.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.btnZinsbelastung.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnZinsbelastung.Location = New System.Drawing.Point(5, 19) - Me.btnZinsbelastung.Name = "btnZinsbelastung" - Me.btnZinsbelastung.Size = New System.Drawing.Size(98, 44) - Me.btnZinsbelastung.TabIndex = 8 - Me.btnZinsbelastung.Text = "Zinsbelastung erstellen" - Me.btnZinsbelastung.UseVisualStyleBackColor = True - ' - 'Button13 - ' - Me.Button13.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center - Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button13.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button13.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button13.Location = New System.Drawing.Point(710, 10) - Me.Button13.Name = "Button13" - Me.Button13.Size = New System.Drawing.Size(98, 26) - Me.Button13.TabIndex = 38 - Me.Button13.Text = "Ãœbersicht" - Me.Button13.UseVisualStyleBackColor = True - ' - 'txtZinssatz - ' - Me.txtZinssatz._DateTimeOnly = False - Me.txtZinssatz._numbersOnly = False - Me.txtZinssatz._numbersOnlyKommastellen = "" - Me.txtZinssatz._numbersOnlyTrennzeichen = True - Me.txtZinssatz._Prozent = False - Me.txtZinssatz._ShortDateNew = False - Me.txtZinssatz._ShortDateOnly = False - Me.txtZinssatz._TimeOnly = False - Me.txtZinssatz._TimeOnly_Seconds = False - Me.txtZinssatz._value = "9.5" - Me.txtZinssatz._Waehrung = False - Me.txtZinssatz._WaehrungZeichen = True - Me.txtZinssatz.ForeColor = System.Drawing.Color.Black - Me.txtZinssatz.Location = New System.Drawing.Point(194, 40) - Me.txtZinssatz.MaxLineLength = -1 - Me.txtZinssatz.MaxLines_Warning = "" - Me.txtZinssatz.MaxLines_Warning_Label = Nothing - Me.txtZinssatz.Name = "txtZinssatz" - Me.txtZinssatz.Size = New System.Drawing.Size(34, 20) - Me.txtZinssatz.TabIndex = 31 - Me.txtZinssatz.Text = "9.5" - ' - 'lblnichtabgerechneteZNB - ' - Me.lblnichtabgerechneteZNB.AutoSize = True - Me.lblnichtabgerechneteZNB.Location = New System.Drawing.Point(521, 19) - Me.lblnichtabgerechneteZNB.Name = "lblnichtabgerechneteZNB" - Me.lblnichtabgerechneteZNB.Size = New System.Drawing.Size(144, 13) - Me.lblnichtabgerechneteZNB.TabIndex = 37 - Me.lblnichtabgerechneteZNB.Text = "Nicht abgerechnete Kunden:" - ' - 'Label45 - ' - Me.Label45.AutoSize = True - Me.Label45.Location = New System.Drawing.Point(252, 19) - Me.Label45.Name = "Label45" - Me.Label45.Size = New System.Drawing.Size(82, 13) - Me.Label45.TabIndex = 29 - Me.Label45.Text = "Kunden-Nr von:" - ' - 'Label48 - ' - Me.Label48.AutoSize = True - Me.Label48.Location = New System.Drawing.Point(123, 21) - Me.Label48.Name = "Label48" - Me.Label48.Size = New System.Drawing.Size(67, 13) - Me.Label48.TabIndex = 29 - Me.Label48.Text = "Tol inTagen:" - ' - 'txtKdNrvon - ' - Me.txtKdNrvon._DateTimeOnly = False - Me.txtKdNrvon._numbersOnly = False - Me.txtKdNrvon._numbersOnlyKommastellen = "" - Me.txtKdNrvon._numbersOnlyTrennzeichen = True - Me.txtKdNrvon._Prozent = False - Me.txtKdNrvon._ShortDateNew = False - Me.txtKdNrvon._ShortDateOnly = False - Me.txtKdNrvon._TimeOnly = False - Me.txtKdNrvon._TimeOnly_Seconds = False - Me.txtKdNrvon._value = Nothing - Me.txtKdNrvon._Waehrung = False - Me.txtKdNrvon._WaehrungZeichen = True - Me.txtKdNrvon.ForeColor = System.Drawing.Color.Black - Me.txtKdNrvon.Location = New System.Drawing.Point(337, 16) - Me.txtKdNrvon.MaxLineLength = -1 - Me.txtKdNrvon.MaxLines_Warning = "" - Me.txtKdNrvon.MaxLines_Warning_Label = Nothing - Me.txtKdNrvon.Name = "txtKdNrvon" - Me.txtKdNrvon.Size = New System.Drawing.Size(70, 20) - Me.txtKdNrvon.TabIndex = 32 - ' - 'Label46 - ' - Me.Label46.AutoSize = True - Me.Label46.Location = New System.Drawing.Point(418, 43) - Me.Label46.Name = "Label46" - Me.Label46.Size = New System.Drawing.Size(23, 13) - Me.Label46.TabIndex = 22 - Me.Label46.Text = "bis:" - ' - 'txtKdNrbis - ' - Me.txtKdNrbis._DateTimeOnly = False - Me.txtKdNrbis._numbersOnly = False - Me.txtKdNrbis._numbersOnlyKommastellen = "" - Me.txtKdNrbis._numbersOnlyTrennzeichen = True - Me.txtKdNrbis._Prozent = False - Me.txtKdNrbis._ShortDateNew = False - Me.txtKdNrbis._ShortDateOnly = False - Me.txtKdNrbis._TimeOnly = False - Me.txtKdNrbis._TimeOnly_Seconds = False - Me.txtKdNrbis._value = Nothing - Me.txtKdNrbis._Waehrung = False - Me.txtKdNrbis._WaehrungZeichen = True - Me.txtKdNrbis.ForeColor = System.Drawing.Color.Black - Me.txtKdNrbis.Location = New System.Drawing.Point(445, 16) - Me.txtKdNrbis.MaxLineLength = -1 - Me.txtKdNrbis.MaxLines_Warning = "" - Me.txtKdNrbis.MaxLines_Warning_Label = Nothing - Me.txtKdNrbis.Name = "txtKdNrbis" - Me.txtKdNrbis.Size = New System.Drawing.Size(70, 20) - Me.txtKdNrbis.TabIndex = 33 - ' - 'txtTolInTagen - ' - Me.txtTolInTagen._DateTimeOnly = False - Me.txtTolInTagen._numbersOnly = False - Me.txtTolInTagen._numbersOnlyKommastellen = "" - Me.txtTolInTagen._numbersOnlyTrennzeichen = True - Me.txtTolInTagen._Prozent = False - Me.txtTolInTagen._ShortDateNew = False - Me.txtTolInTagen._ShortDateOnly = False - Me.txtTolInTagen._TimeOnly = False - Me.txtTolInTagen._TimeOnly_Seconds = False - Me.txtTolInTagen._value = "0" - Me.txtTolInTagen._Waehrung = False - Me.txtTolInTagen._WaehrungZeichen = True - Me.txtTolInTagen.ForeColor = System.Drawing.Color.Black - Me.txtTolInTagen.Location = New System.Drawing.Point(194, 16) - Me.txtTolInTagen.MaxLineLength = -1 - Me.txtTolInTagen.MaxLines_Warning = "" - Me.txtTolInTagen.MaxLines_Warning_Label = Nothing - Me.txtTolInTagen.Name = "txtTolInTagen" - Me.txtTolInTagen.Size = New System.Drawing.Size(34, 20) - Me.txtTolInTagen.TabIndex = 30 - Me.txtTolInTagen.Text = "0" - ' - 'Label47 - ' - Me.Label47.AutoSize = True - Me.Label47.Location = New System.Drawing.Point(252, 43) - Me.Label47.Name = "Label47" - Me.Label47.Size = New System.Drawing.Size(82, 13) - Me.Label47.TabIndex = 23 - Me.Label47.Text = "Zahlungen von:" - ' - 'Label44 - ' - Me.Label44.AutoSize = True - Me.Label44.Location = New System.Drawing.Point(416, 19) - Me.Label44.Name = "Label44" - Me.Label44.Size = New System.Drawing.Size(23, 13) - Me.Label44.TabIndex = 31 - Me.Label44.Text = "bis:" - ' - 'txtZRvon - ' - Me.txtZRvon._DateTimeOnly = False - Me.txtZRvon._numbersOnly = False - Me.txtZRvon._numbersOnlyKommastellen = "" - Me.txtZRvon._numbersOnlyTrennzeichen = True - Me.txtZRvon._Prozent = False - Me.txtZRvon._ShortDateNew = True - Me.txtZRvon._ShortDateOnly = False - Me.txtZRvon._TimeOnly = False - Me.txtZRvon._TimeOnly_Seconds = False - Me.txtZRvon._value = "" - Me.txtZRvon._Waehrung = False - Me.txtZRvon._WaehrungZeichen = True - Me.txtZRvon.ForeColor = System.Drawing.Color.Black - Me.txtZRvon.Location = New System.Drawing.Point(337, 40) - Me.txtZRvon.MaxLength = 10 - Me.txtZRvon.MaxLineLength = -1 - Me.txtZRvon.MaxLines_Warning = "" - Me.txtZRvon.MaxLines_Warning_Label = Nothing - Me.txtZRvon.Name = "txtZRvon" - Me.txtZRvon.Size = New System.Drawing.Size(70, 20) - Me.txtZRvon.TabIndex = 34 - ' - 'txtZRbis - ' - Me.txtZRbis._DateTimeOnly = False - Me.txtZRbis._numbersOnly = False - Me.txtZRbis._numbersOnlyKommastellen = "" - Me.txtZRbis._numbersOnlyTrennzeichen = True - Me.txtZRbis._Prozent = False - Me.txtZRbis._ShortDateNew = True - Me.txtZRbis._ShortDateOnly = False - Me.txtZRbis._TimeOnly = False - Me.txtZRbis._TimeOnly_Seconds = False - Me.txtZRbis._value = "" - Me.txtZRbis._Waehrung = False - Me.txtZRbis._WaehrungZeichen = True - Me.txtZRbis.ForeColor = System.Drawing.Color.Black - Me.txtZRbis.Location = New System.Drawing.Point(445, 40) - Me.txtZRbis.MaxLength = 10 - Me.txtZRbis.MaxLineLength = -1 - Me.txtZRbis.MaxLines_Warning = "" - Me.txtZRbis.MaxLines_Warning_Label = Nothing - Me.txtZRbis.Name = "txtZRbis" - Me.txtZRbis.Size = New System.Drawing.Size(70, 20) - Me.txtZRbis.TabIndex = 35 - ' 'Label42 ' Me.Label42.AutoSize = True @@ -1833,11 +1474,12 @@ Partial Class usrCntlBH ' Me.tbcntr.Controls.Add(Me.TabPage1) Me.tbcntr.Controls.Add(Me.TabPage5) + Me.tbcntr.Controls.Add(Me.TabPage2) Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Fill Me.tbcntr.Location = New System.Drawing.Point(0, 52) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(964, 994) + Me.tbcntr.Size = New System.Drawing.Size(964, 905) Me.tbcntr.TabIndex = 25 ' 'TabPage5 @@ -1848,7 +1490,7 @@ Partial Class usrCntlBH Me.TabPage5.Controls.Add(Me.GroupBox6) Me.TabPage5.Location = New System.Drawing.Point(4, 22) Me.TabPage5.Name = "TabPage5" - Me.TabPage5.Size = New System.Drawing.Size(956, 968) + Me.TabPage5.Size = New System.Drawing.Size(956, 879) Me.TabPage5.TabIndex = 1 Me.TabPage5.Text = "IMEX" Me.TabPage5.UseVisualStyleBackColor = True @@ -2054,18 +1696,399 @@ Partial Class usrCntlBH Me.Button7.Text = "Importieren" Me.Button7.UseVisualStyleBackColor = True ' - 'btn_fehlendeUID + 'TabPage2 ' - Me.btn_fehlendeUID.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btn_fehlendeUID.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.btn_fehlendeUID.Image = Global.SDL.My.Resources.Resources.Excel_logo - Me.btn_fehlendeUID.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btn_fehlendeUID.Location = New System.Drawing.Point(810, 102) - Me.btn_fehlendeUID.Name = "btn_fehlendeUID" - Me.btn_fehlendeUID.Size = New System.Drawing.Size(43, 20) - Me.btn_fehlendeUID.TabIndex = 35 - Me.btn_fehlendeUID.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btn_fehlendeUID.UseVisualStyleBackColor = True + Me.TabPage2.Controls.Add(Me.GroupBox11) + Me.TabPage2.Controls.Add(Me.Label51) + Me.TabPage2.Location = New System.Drawing.Point(4, 22) + Me.TabPage2.Name = "TabPage2" + Me.TabPage2.Size = New System.Drawing.Size(956, 879) + Me.TabPage2.TabIndex = 2 + Me.TabPage2.Text = "MDM" + Me.TabPage2.UseVisualStyleBackColor = True + ' + 'GroupBox11 + ' + Me.GroupBox11.Controls.Add(Me.Label57) + Me.GroupBox11.Controls.Add(Me.btnDel_) + Me.GroupBox11.Controls.Add(Me.btnWikiStatusmails) + Me.GroupBox11.Controls.Add(Me.txtAbBetragAbrechnen) + Me.GroupBox11.Controls.Add(Me.Label52) + Me.GroupBox11.Controls.Add(Me.btnZNBverrechnen) + Me.GroupBox11.Controls.Add(Me.txtnichtabrechneteKunden) + Me.GroupBox11.Controls.Add(Me.Label49) + Me.GroupBox11.Controls.Add(Me.btnZinsbelastung) + Me.GroupBox11.Controls.Add(Me.Button13) + Me.GroupBox11.Controls.Add(Me.txtZinssatz) + Me.GroupBox11.Controls.Add(Me.lblnichtabgerechneteZNB) + Me.GroupBox11.Controls.Add(Me.Label45) + Me.GroupBox11.Controls.Add(Me.Label48) + Me.GroupBox11.Controls.Add(Me.txtKdNrvon) + Me.GroupBox11.Controls.Add(Me.Label46) + Me.GroupBox11.Controls.Add(Me.txtKdNrbis) + Me.GroupBox11.Controls.Add(Me.txtTolInTagen) + Me.GroupBox11.Controls.Add(Me.Label47) + Me.GroupBox11.Controls.Add(Me.Label44) + Me.GroupBox11.Controls.Add(Me.txtZRvon) + Me.GroupBox11.Controls.Add(Me.txtZRbis) + Me.GroupBox11.Location = New System.Drawing.Point(14, 30) + Me.GroupBox11.Name = "GroupBox11" + Me.GroupBox11.Size = New System.Drawing.Size(847, 88) + Me.GroupBox11.TabIndex = 36 + Me.GroupBox11.TabStop = False + ' + 'Label57 + ' + Me.Label57.AutoSize = True + Me.Label57.Location = New System.Drawing.Point(553, 47) + Me.Label57.Name = "Label57" + Me.Label57.Size = New System.Drawing.Size(109, 13) + Me.Label57.TabIndex = 75 + Me.Label57.Text = "Rechnung ab Betrag:" + ' + 'btnDel_ + ' + Me.btnDel_.allowBorder = False + Me.btnDel_.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnDel_.BackgroundImage = Global.SDL.My.Resources.Resources.del + Me.btnDel_.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnDel_.FlatAppearance.BorderSize = 0 + Me.btnDel_.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnDel_.ForeColor = System.Drawing.Color.Black + Me.btnDel_.Location = New System.Drawing.Point(814, 42) + Me.btnDel_.Name = "btnDel_" + Me.btnDel_.Size = New System.Drawing.Size(20, 20) + Me.btnDel_.TabIndex = 74 + Me.btnDel_.UseVisualStyleBackColor = True + Me.btnDel_.Visible = False + ' + 'btnWikiStatusmails + ' + Me.btnWikiStatusmails.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen + Me.btnWikiStatusmails.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnWikiStatusmails.FlatAppearance.BorderSize = 0 + Me.btnWikiStatusmails.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnWikiStatusmails.Location = New System.Drawing.Point(814, 10) + Me.btnWikiStatusmails.Name = "btnWikiStatusmails" + Me.btnWikiStatusmails.Size = New System.Drawing.Size(25, 20) + Me.btnWikiStatusmails.TabIndex = 73 + Me.btnWikiStatusmails.UseVisualStyleBackColor = True + ' + 'txtAbBetragAbrechnen + ' + Me.txtAbBetragAbrechnen._DateTimeOnly = False + Me.txtAbBetragAbrechnen._numbersOnly = True + Me.txtAbBetragAbrechnen._numbersOnlyKommastellen = "" + Me.txtAbBetragAbrechnen._numbersOnlyTrennzeichen = True + Me.txtAbBetragAbrechnen._Prozent = False + Me.txtAbBetragAbrechnen._ShortDateNew = False + Me.txtAbBetragAbrechnen._ShortDateOnly = False + Me.txtAbBetragAbrechnen._TimeOnly = False + Me.txtAbBetragAbrechnen._TimeOnly_Seconds = False + Me.txtAbBetragAbrechnen._value = "0" + Me.txtAbBetragAbrechnen._Waehrung = False + Me.txtAbBetragAbrechnen._WaehrungZeichen = False + Me.txtAbBetragAbrechnen.ForeColor = System.Drawing.Color.Black + Me.txtAbBetragAbrechnen.Location = New System.Drawing.Point(665, 43) + Me.txtAbBetragAbrechnen.MaxLineLength = -1 + Me.txtAbBetragAbrechnen.MaxLines_Warning = "" + Me.txtAbBetragAbrechnen.MaxLines_Warning_Label = Nothing + Me.txtAbBetragAbrechnen.Name = "txtAbBetragAbrechnen" + Me.txtAbBetragAbrechnen.Size = New System.Drawing.Size(34, 20) + Me.txtAbBetragAbrechnen.TabIndex = 42 + Me.txtAbBetragAbrechnen.Text = "20" + Me.txtAbBetragAbrechnen.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label52 + ' + Me.Label52.AutoSize = True + Me.Label52.Location = New System.Drawing.Point(123, 63) + Me.Label52.Name = "Label52" + Me.Label52.Size = New System.Drawing.Size(138, 13) + Me.Label52.TabIndex = 41 + Me.Label52.Text = "*wenn nicht im Kd hinterlegt" + ' + 'btnZNBverrechnen + ' + Me.btnZNBverrechnen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.btnZNBverrechnen.Enabled = False + Me.btnZNBverrechnen.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnZNBverrechnen.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.btnZNBverrechnen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnZNBverrechnen.Location = New System.Drawing.Point(710, 39) + Me.btnZNBverrechnen.Name = "btnZNBverrechnen" + Me.btnZNBverrechnen.Size = New System.Drawing.Size(98, 26) + Me.btnZNBverrechnen.TabIndex = 40 + Me.btnZNBverrechnen.Text = "verrechnen" + Me.btnZNBverrechnen.UseVisualStyleBackColor = True + ' + 'txtnichtabrechneteKunden + ' + Me.txtnichtabrechneteKunden._DateTimeOnly = False + Me.txtnichtabrechneteKunden._numbersOnly = False + Me.txtnichtabrechneteKunden._numbersOnlyKommastellen = "" + Me.txtnichtabrechneteKunden._numbersOnlyTrennzeichen = True + Me.txtnichtabrechneteKunden._Prozent = False + Me.txtnichtabrechneteKunden._ShortDateNew = False + Me.txtnichtabrechneteKunden._ShortDateOnly = False + Me.txtnichtabrechneteKunden._TimeOnly = False + Me.txtnichtabrechneteKunden._TimeOnly_Seconds = False + Me.txtnichtabrechneteKunden._value = "0" + Me.txtnichtabrechneteKunden._Waehrung = False + Me.txtnichtabrechneteKunden._WaehrungZeichen = True + Me.txtnichtabrechneteKunden.ForeColor = System.Drawing.Color.Black + Me.txtnichtabrechneteKunden.Location = New System.Drawing.Point(665, 16) + Me.txtnichtabrechneteKunden.MaxLineLength = -1 + Me.txtnichtabrechneteKunden.MaxLines_Warning = "" + Me.txtnichtabrechneteKunden.MaxLines_Warning_Label = Nothing + Me.txtnichtabrechneteKunden.Name = "txtnichtabrechneteKunden" + Me.txtnichtabrechneteKunden.ReadOnly = True + Me.txtnichtabrechneteKunden.Size = New System.Drawing.Size(34, 20) + Me.txtnichtabrechneteKunden.TabIndex = 39 + Me.txtnichtabrechneteKunden.Text = "0" + Me.txtnichtabrechneteKunden.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label49 + ' + Me.Label49.AutoSize = True + Me.Label49.Location = New System.Drawing.Point(123, 45) + Me.Label49.Name = "Label49" + Me.Label49.Size = New System.Drawing.Size(53, 13) + Me.Label49.TabIndex = 33 + Me.Label49.Text = "Zinssatz*:" + ' + 'btnZinsbelastung + ' + Me.btnZinsbelastung.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.btnZinsbelastung.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnZinsbelastung.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.btnZinsbelastung.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnZinsbelastung.Location = New System.Drawing.Point(6, 18) + Me.btnZinsbelastung.Name = "btnZinsbelastung" + Me.btnZinsbelastung.Size = New System.Drawing.Size(98, 44) + Me.btnZinsbelastung.TabIndex = 8 + Me.btnZinsbelastung.Text = "Zinsbelastung erstellen" + Me.btnZinsbelastung.UseVisualStyleBackColor = True + ' + 'Button13 + ' + Me.Button13.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button13.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button13.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button13.Location = New System.Drawing.Point(710, 10) + Me.Button13.Name = "Button13" + Me.Button13.Size = New System.Drawing.Size(98, 26) + Me.Button13.TabIndex = 38 + Me.Button13.Text = "Ãœbersicht" + Me.Button13.UseVisualStyleBackColor = True + ' + 'txtZinssatz + ' + Me.txtZinssatz._DateTimeOnly = False + Me.txtZinssatz._numbersOnly = False + Me.txtZinssatz._numbersOnlyKommastellen = "" + Me.txtZinssatz._numbersOnlyTrennzeichen = True + Me.txtZinssatz._Prozent = False + Me.txtZinssatz._ShortDateNew = False + Me.txtZinssatz._ShortDateOnly = False + Me.txtZinssatz._TimeOnly = False + Me.txtZinssatz._TimeOnly_Seconds = False + Me.txtZinssatz._value = "9.5" + Me.txtZinssatz._Waehrung = False + Me.txtZinssatz._WaehrungZeichen = True + Me.txtZinssatz.ForeColor = System.Drawing.Color.Black + Me.txtZinssatz.Location = New System.Drawing.Point(194, 40) + Me.txtZinssatz.MaxLineLength = -1 + Me.txtZinssatz.MaxLines_Warning = "" + Me.txtZinssatz.MaxLines_Warning_Label = Nothing + Me.txtZinssatz.Name = "txtZinssatz" + Me.txtZinssatz.Size = New System.Drawing.Size(34, 20) + Me.txtZinssatz.TabIndex = 31 + Me.txtZinssatz.Text = "9.5" + ' + 'lblnichtabgerechneteZNB + ' + Me.lblnichtabgerechneteZNB.AutoSize = True + Me.lblnichtabgerechneteZNB.Location = New System.Drawing.Point(521, 19) + Me.lblnichtabgerechneteZNB.Name = "lblnichtabgerechneteZNB" + Me.lblnichtabgerechneteZNB.Size = New System.Drawing.Size(144, 13) + Me.lblnichtabgerechneteZNB.TabIndex = 37 + Me.lblnichtabgerechneteZNB.Text = "Nicht abgerechnete Kunden:" + ' + 'Label45 + ' + Me.Label45.AutoSize = True + Me.Label45.Location = New System.Drawing.Point(252, 19) + Me.Label45.Name = "Label45" + Me.Label45.Size = New System.Drawing.Size(82, 13) + Me.Label45.TabIndex = 29 + Me.Label45.Text = "Kunden-Nr von:" + ' + 'Label48 + ' + Me.Label48.AutoSize = True + Me.Label48.Location = New System.Drawing.Point(123, 21) + Me.Label48.Name = "Label48" + Me.Label48.Size = New System.Drawing.Size(67, 13) + Me.Label48.TabIndex = 29 + Me.Label48.Text = "Tol inTagen:" + ' + 'txtKdNrvon + ' + Me.txtKdNrvon._DateTimeOnly = False + Me.txtKdNrvon._numbersOnly = False + Me.txtKdNrvon._numbersOnlyKommastellen = "" + Me.txtKdNrvon._numbersOnlyTrennzeichen = True + Me.txtKdNrvon._Prozent = False + Me.txtKdNrvon._ShortDateNew = False + Me.txtKdNrvon._ShortDateOnly = False + Me.txtKdNrvon._TimeOnly = False + Me.txtKdNrvon._TimeOnly_Seconds = False + Me.txtKdNrvon._value = Nothing + Me.txtKdNrvon._Waehrung = False + Me.txtKdNrvon._WaehrungZeichen = True + Me.txtKdNrvon.ForeColor = System.Drawing.Color.Black + Me.txtKdNrvon.Location = New System.Drawing.Point(337, 16) + Me.txtKdNrvon.MaxLineLength = -1 + Me.txtKdNrvon.MaxLines_Warning = "" + Me.txtKdNrvon.MaxLines_Warning_Label = Nothing + Me.txtKdNrvon.Name = "txtKdNrvon" + Me.txtKdNrvon.Size = New System.Drawing.Size(70, 20) + Me.txtKdNrvon.TabIndex = 32 + ' + 'Label46 + ' + Me.Label46.AutoSize = True + Me.Label46.Location = New System.Drawing.Point(418, 43) + Me.Label46.Name = "Label46" + Me.Label46.Size = New System.Drawing.Size(23, 13) + Me.Label46.TabIndex = 22 + Me.Label46.Text = "bis:" + ' + 'txtKdNrbis + ' + Me.txtKdNrbis._DateTimeOnly = False + Me.txtKdNrbis._numbersOnly = False + Me.txtKdNrbis._numbersOnlyKommastellen = "" + Me.txtKdNrbis._numbersOnlyTrennzeichen = True + Me.txtKdNrbis._Prozent = False + Me.txtKdNrbis._ShortDateNew = False + Me.txtKdNrbis._ShortDateOnly = False + Me.txtKdNrbis._TimeOnly = False + Me.txtKdNrbis._TimeOnly_Seconds = False + Me.txtKdNrbis._value = Nothing + Me.txtKdNrbis._Waehrung = False + Me.txtKdNrbis._WaehrungZeichen = True + Me.txtKdNrbis.ForeColor = System.Drawing.Color.Black + Me.txtKdNrbis.Location = New System.Drawing.Point(445, 16) + Me.txtKdNrbis.MaxLineLength = -1 + Me.txtKdNrbis.MaxLines_Warning = "" + Me.txtKdNrbis.MaxLines_Warning_Label = Nothing + Me.txtKdNrbis.Name = "txtKdNrbis" + Me.txtKdNrbis.Size = New System.Drawing.Size(70, 20) + Me.txtKdNrbis.TabIndex = 33 + ' + 'txtTolInTagen + ' + Me.txtTolInTagen._DateTimeOnly = False + Me.txtTolInTagen._numbersOnly = False + Me.txtTolInTagen._numbersOnlyKommastellen = "" + Me.txtTolInTagen._numbersOnlyTrennzeichen = True + Me.txtTolInTagen._Prozent = False + Me.txtTolInTagen._ShortDateNew = False + Me.txtTolInTagen._ShortDateOnly = False + Me.txtTolInTagen._TimeOnly = False + Me.txtTolInTagen._TimeOnly_Seconds = False + Me.txtTolInTagen._value = "0" + Me.txtTolInTagen._Waehrung = False + Me.txtTolInTagen._WaehrungZeichen = True + Me.txtTolInTagen.ForeColor = System.Drawing.Color.Black + Me.txtTolInTagen.Location = New System.Drawing.Point(194, 16) + Me.txtTolInTagen.MaxLineLength = -1 + Me.txtTolInTagen.MaxLines_Warning = "" + Me.txtTolInTagen.MaxLines_Warning_Label = Nothing + Me.txtTolInTagen.Name = "txtTolInTagen" + Me.txtTolInTagen.Size = New System.Drawing.Size(34, 20) + Me.txtTolInTagen.TabIndex = 30 + Me.txtTolInTagen.Text = "0" + ' + 'Label47 + ' + Me.Label47.AutoSize = True + Me.Label47.Location = New System.Drawing.Point(252, 43) + Me.Label47.Name = "Label47" + Me.Label47.Size = New System.Drawing.Size(82, 13) + Me.Label47.TabIndex = 23 + Me.Label47.Text = "Zahlungen von:" + ' + 'Label44 + ' + Me.Label44.AutoSize = True + Me.Label44.Location = New System.Drawing.Point(416, 19) + Me.Label44.Name = "Label44" + Me.Label44.Size = New System.Drawing.Size(23, 13) + Me.Label44.TabIndex = 31 + Me.Label44.Text = "bis:" + ' + 'txtZRvon + ' + Me.txtZRvon._DateTimeOnly = False + Me.txtZRvon._numbersOnly = False + Me.txtZRvon._numbersOnlyKommastellen = "" + Me.txtZRvon._numbersOnlyTrennzeichen = True + Me.txtZRvon._Prozent = False + Me.txtZRvon._ShortDateNew = True + Me.txtZRvon._ShortDateOnly = False + Me.txtZRvon._TimeOnly = False + Me.txtZRvon._TimeOnly_Seconds = False + Me.txtZRvon._value = "" + Me.txtZRvon._Waehrung = False + Me.txtZRvon._WaehrungZeichen = True + Me.txtZRvon.ForeColor = System.Drawing.Color.Black + Me.txtZRvon.Location = New System.Drawing.Point(337, 40) + Me.txtZRvon.MaxLength = 10 + Me.txtZRvon.MaxLineLength = -1 + Me.txtZRvon.MaxLines_Warning = "" + Me.txtZRvon.MaxLines_Warning_Label = Nothing + Me.txtZRvon.Name = "txtZRvon" + Me.txtZRvon.Size = New System.Drawing.Size(70, 20) + Me.txtZRvon.TabIndex = 34 + ' + 'txtZRbis + ' + Me.txtZRbis._DateTimeOnly = False + Me.txtZRbis._numbersOnly = False + Me.txtZRbis._numbersOnlyKommastellen = "" + Me.txtZRbis._numbersOnlyTrennzeichen = True + Me.txtZRbis._Prozent = False + Me.txtZRbis._ShortDateNew = True + Me.txtZRbis._ShortDateOnly = False + Me.txtZRbis._TimeOnly = False + Me.txtZRbis._TimeOnly_Seconds = False + Me.txtZRbis._value = "" + Me.txtZRbis._Waehrung = False + Me.txtZRbis._WaehrungZeichen = True + Me.txtZRbis.ForeColor = System.Drawing.Color.Black + Me.txtZRbis.Location = New System.Drawing.Point(445, 40) + Me.txtZRbis.MaxLength = 10 + Me.txtZRbis.MaxLineLength = -1 + Me.txtZRbis.MaxLines_Warning = "" + Me.txtZRbis.MaxLines_Warning_Label = Nothing + Me.txtZRbis.Name = "txtZRbis" + Me.txtZRbis.Size = New System.Drawing.Size(70, 20) + Me.txtZRbis.TabIndex = 35 + ' + 'Label51 + ' + Me.Label51.AutoSize = True + Me.Label51.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label51.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label51.Location = New System.Drawing.Point(11, 10) + Me.Label51.Name = "Label51" + Me.Label51.Size = New System.Drawing.Size(160, 17) + Me.Label51.TabIndex = 36 + Me.Label51.Text = "Zinsnachberechnung" ' 'usrCntlBH ' @@ -2075,15 +2098,13 @@ Partial Class usrCntlBH Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.pnl) Me.Name = "usrCntlBH" - Me.Size = New System.Drawing.Size(964, 1046) + Me.Size = New System.Drawing.Size(964, 957) Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() Me.TabPage1.ResumeLayout(False) Me.TabPage1.PerformLayout() Me.GroupBox12.ResumeLayout(False) Me.GroupBox12.PerformLayout() - Me.GroupBox11.ResumeLayout(False) - Me.GroupBox11.PerformLayout() Me.GroupBox10.ResumeLayout(False) Me.GroupBox10.PerformLayout() Me.GroupBox8.ResumeLayout(False) @@ -2112,6 +2133,10 @@ Partial Class usrCntlBH Me.GroupBox9.PerformLayout() Me.GroupBox6.ResumeLayout(False) Me.GroupBox6.PerformLayout() + Me.TabPage2.ResumeLayout(False) + Me.TabPage2.PerformLayout() + Me.GroupBox11.ResumeLayout(False) + Me.GroupBox11.PerformLayout() Me.ResumeLayout(False) End Sub @@ -2209,20 +2234,6 @@ Partial Class usrCntlBH Friend WithEvents GroupBox10 As GroupBox Friend WithEvents Label43 As Label Friend WithEvents Button12 As Button - Friend WithEvents btnZinsbelastung As Button - Friend WithEvents Label46 As Label - Friend WithEvents Label44 As Label - Friend WithEvents txtZRbis As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents txtZRvon As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label47 As Label - Friend WithEvents txtKdNrbis As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents txtKdNrvon As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label45 As Label - Friend WithEvents Label49 As Label - Friend WithEvents txtZinssatz As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label48 As Label - Friend WithEvents txtTolInTagen As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents GroupBox11 As GroupBox Friend WithEvents Label37 As Label Friend WithEvents GroupBox9 As GroupBox Friend WithEvents Label41 As Label @@ -2233,13 +2244,7 @@ Partial Class usrCntlBH Friend WithEvents Label39 As Label Friend WithEvents Label38 As Label Friend WithEvents Button9 As Button - Friend WithEvents Button13 As Button - Friend WithEvents lblnichtabgerechneteZNB As Label - Friend WithEvents Label51 As Label Friend WithEvents Label50 As Label - Friend WithEvents txtnichtabrechneteKunden As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents btnZNBverrechnen As Button - Friend WithEvents Label52 As Label Friend WithEvents Label53 As Label Friend WithEvents GroupBox12 As GroupBox Friend WithEvents txtUID_Jahr As VERAG_PROG_ALLGEMEIN.MyTextBox @@ -2251,8 +2256,30 @@ Partial Class usrCntlBH Friend WithEvents Button14 As Button Friend WithEvents cbx_nur_ungueltige As CheckBox Friend WithEvents lblUID_zupruefen As Label - Friend WithEvents txtAbBetragAbrechnen As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents btnWikiStatusmails As Button - Friend WithEvents btnDel_ As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents btn_fehlendeUID As Button + Friend WithEvents TabPage2 As TabPage + Friend WithEvents GroupBox11 As GroupBox + Friend WithEvents Label57 As Label + Friend WithEvents btnDel_ As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents btnWikiStatusmails As Button + Friend WithEvents txtAbBetragAbrechnen As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label52 As Label + Friend WithEvents btnZNBverrechnen As Button + Friend WithEvents txtnichtabrechneteKunden As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label49 As Label + Friend WithEvents btnZinsbelastung As Button + Friend WithEvents Button13 As Button + Friend WithEvents txtZinssatz As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents lblnichtabgerechneteZNB As Label + Friend WithEvents Label45 As Label + Friend WithEvents Label48 As Label + Friend WithEvents txtKdNrvon As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label46 As Label + Friend WithEvents txtKdNrbis As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtTolInTagen As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label47 As Label + Friend WithEvents Label44 As Label + Friend WithEvents txtZRvon As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtZRbis As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label51 As Label End Class diff --git a/SDL/buchhaltung/usrCntlBH.vb b/SDL/buchhaltung/usrCntlBH.vb index d09ede23..e373715d 100644 --- a/SDL/buchhaltung/usrCntlBH.vb +++ b/SDL/buchhaltung/usrCntlBH.vb @@ -1,10 +1,5 @@ Imports System.Globalization Imports System.Text -Imports System.Windows.Media.Animation -Imports com.sun.crypto.provider -Imports com.sun.xml.internal.rngom -Imports GrapeCity.ActiveReports.ReportsCore.Tools -Imports jdk.nashorn.internal.objects.annotations Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlBH @@ -31,7 +26,7 @@ Public Class usrCntlBH Private Sub usrCntlBH_Load(sender As Object, e As EventArgs) Handles Me.Load 'MyComboBox1.fillWithSQL(" SELECT tblUStVAntrag.UStVAn_LandKz,tblUStVAntrag.UStVAn_LandKz FROM tblUStVAntrag GROUP BY tblUStVAntrag.UStVAn_LandKz HAVING (((tblUStVAntrag.UStVAn_LandKz) Is Not Null)) ", False, "FMZOLL", True) - cboAbfVerbFirma.fillWithSQL(" SELECT distinct([Firma]) FROM [VERAG].[dbo].[Filialen] order by [Firma]", False, "FMZOLL", True) + cboAbfVerbFirma.fillWithSQL("SELECT distinct([Firma]) FROM [VERAG].[dbo].[Filialen] order by [Firma]", False, "FMZOLL", True) cboAbfVerbFirma.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) cbxFirmaUID.Items.Add(New MyListItem("AMBAR", "AMBAR")) @@ -84,8 +79,6 @@ Public Class usrCntlBH Next End Select - ' If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung = "MDM" Then CheckBox1.Checked = True : cbxSDLLeistungenSperre.Checked = True 'VERALTET - 'txtOPRisikoBetragVon._value = "" txtOPUmsatzVon.Text = "01.01." & (Now.Year - 1) txtOPUmsatzBis.Text = "31.12." & (Now.Year - 1) txtBagatellgrenzeBei._value = 800 @@ -797,7 +790,7 @@ Public Class usrCntlBH f.ShowDialog(Me) End Sub - Private Sub Button13_Click(sender As Object, e As EventArgs) Handles btnZinsbelastung.Click + Private Sub btnZinsbelastung_Click(sender As Object, e As EventArgs) Handles btnZinsbelastung.Click If txtKdNrvon.Text = "" OrElse Not IsNumeric(txtKdNrvon.Text) Then txtKdNrvon.Focus() @@ -1305,7 +1298,7 @@ Public Class usrCntlBH Dim startDate As String = CDate(R("zahlungsperiode_start")).ToShortDateString Dim EndDate As String = CDate(R("zahlungsperiode_ende")).ToShortDateString - Dim vermerk As String = "Zahlungen vom " & startDate & " - " & EndDate 'max 50 Zeichen!!! + Dim vermerk As String = "Zahlungen von " & startDate & " - " & EndDate 'max 50 Zeichen!!! Dim Fußtext As String = "" 'Fußtext = "Sehr geehrte Damen und Herren," & vbNewLine & " @@ -1341,15 +1334,13 @@ Public Class usrCntlBH Try - - If txtUID_Jahr.Text <> "" AndAlso IsNumeric(txtUID_Jahr.Text) AndAlso txtUID_Jahr.Text.Length = 4 Then If txtUID_Monat.Text = "" OrElse txtUID_Monat.Text <> "" AndAlso IsNumeric(txtUID_Monat.Text) AndAlso CInt(txtUID_Monat.Text) > 0 AndAlso CInt(txtUID_Monat.Text) < 13 Then Dim SQL_UID As String = "SELECT [uid_KundenNr] as KdNr , Adressen.[Name 1],[uid_UstIdKz] as UstIdKz,[uid_UstIdNr] as UstIdnr, case when [uid_valid] = 1 then 'GUELTIG' else 'UNGUELTIG' end as Ergebnis, cast([uid_Datum] as date) as Pruefdatum,Convert(varchar(8), [uid_Datum], 108) As Pruefzeit, [tblUIDPruefung].[firma] as Firma, cast(Adressen.UstIdGeprüft as date) as [letzte Prüfung], uid_pruefungstool as Quelle, uid_Sachbearbeiter as Sachbearbeiter, Filialen.FilialenNr FROM [VERAG].[dbo].[tblUIDPruefung] inner join Adressen on Adressen.AdressenNr = [uid_KundenNr] inner Join kunden On KundenNr=AdressenNr inner join Filialen On Filialen.FilialenNr=Kunden.FilialenNr - where YEAR(uid_Datum) = " & txtUID_Jahr.Text & IIf(txtUID_Monat.Text <> "", " AND MONTH(uid_Datum) = " & txtUID_Monat.Text, "") & IIf(cbxFirmaUID._value <> "", " And [tblUIDPruefung].[firma] = '" & cbxFirmaUID._value & "'", "") & IIf(cbx_nur_ungueltige.Checked, " AND [uid_valid] = 0 ", "") & " ORDER BY Filialen.FilialenNr " + where YEAR(uid_Datum) = " & txtUID_Jahr.Text & IIf(txtUID_Monat.Text <> "", " AND MONTH(uid_Datum) = " & txtUID_Monat.Text, "") & IIf(cbxFirmaUID._value <> "", " And Filialen.Firma = '" & cbxFirmaUID._value & "'", "") & IIf(cbx_nur_ungueltige.Checked, " AND [uid_valid] = 0 ", "") & " ORDER BY Filialen.FilialenNr " Me.Cursor = Cursors.WaitCursor Dim dt_UID As DataTable = SQL.loadDgvBySql(SQL_UID, "FMZOLL") @@ -1435,4 +1426,6 @@ Public Class usrCntlBH Try : Process.Start(sender.tag) : Catch : End Try End If End Sub + + End Class diff --git a/SDL/frmMain.Designer.vb b/SDL/frmMain.Designer.vb index 166876d7..323c8484 100644 --- a/SDL/frmMain.Designer.vb +++ b/SDL/frmMain.Designer.vb @@ -114,6 +114,9 @@ Partial Class frmMain Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.AuswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) + Me.WikiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.WikiToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.MItarbeiterverzeichnisToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.pnlLeft.SuspendLayout() Me.MenuStripSDL.SuspendLayout() Me.Panel1.SuspendLayout() @@ -319,14 +322,14 @@ Partial Class frmMain ' Me.FakturierungToolStripMenuItem.Enabled = False Me.FakturierungToolStripMenuItem.Name = "FakturierungToolStripMenuItem" - Me.FakturierungToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.FakturierungToolStripMenuItem.Size = New System.Drawing.Size(163, 22) Me.FakturierungToolStripMenuItem.Text = "Fakturierung" Me.FakturierungToolStripMenuItem.Visible = False ' 'RechnungsdatenToolStripMenuItem ' Me.RechnungsdatenToolStripMenuItem.Name = "RechnungsdatenToolStripMenuItem" - Me.RechnungsdatenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.RechnungsdatenToolStripMenuItem.Size = New System.Drawing.Size(163, 22) Me.RechnungsdatenToolStripMenuItem.Text = "Rechnungsdaten" Me.RechnungsdatenToolStripMenuItem.Visible = False ' @@ -734,7 +737,7 @@ Partial Class frmMain ' Me.MenuStrip1.BackColor = System.Drawing.Color.White Me.MenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProgramm, Me.mnuFormular, Me.mnuAdministrator, Me.StatistikToolStripMenuItem, Me.mnuFunktionen, Me.mnuFragezeichen}) + Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProgramm, Me.mnuFormular, Me.mnuFragezeichen, Me.mnuAdministrator, Me.StatistikToolStripMenuItem, Me.mnuFunktionen}) Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) Me.MenuStrip1.Name = "MenuStrip1" Me.MenuStrip1.Size = New System.Drawing.Size(984, 24) @@ -848,7 +851,7 @@ Partial Class frmMain ' 'mnuFragezeichen ' - Me.mnuFragezeichen.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BenutzerhandbuchToolStripMenuItem, Me.mnuInfo}) + Me.mnuFragezeichen.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BenutzerhandbuchToolStripMenuItem, Me.mnuInfo, Me.WikiToolStripMenuItem}) Me.mnuFragezeichen.ForeColor = System.Drawing.Color.Black Me.mnuFragezeichen.ImageTransparentColor = System.Drawing.Color.Brown Me.mnuFragezeichen.Name = "mnuFragezeichen" @@ -858,13 +861,13 @@ Partial Class frmMain 'BenutzerhandbuchToolStripMenuItem ' Me.BenutzerhandbuchToolStripMenuItem.Name = "BenutzerhandbuchToolStripMenuItem" - Me.BenutzerhandbuchToolStripMenuItem.Size = New System.Drawing.Size(174, 22) + Me.BenutzerhandbuchToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.BenutzerhandbuchToolStripMenuItem.Text = "Benutzerhandbuch" ' 'mnuInfo ' Me.mnuInfo.Name = "mnuInfo" - Me.mnuInfo.Size = New System.Drawing.Size(174, 22) + Me.mnuInfo.Size = New System.Drawing.Size(180, 22) Me.mnuInfo.Text = "Info" ' 'lblMs @@ -1049,6 +1052,25 @@ Partial Class frmMain Me.Timer_REFRESH.Enabled = True Me.Timer_REFRESH.Interval = 5000 ' + 'WikiToolStripMenuItem + ' + Me.WikiToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.WikiToolStripMenuItem1, Me.MItarbeiterverzeichnisToolStripMenuItem}) + Me.WikiToolStripMenuItem.Name = "WikiToolStripMenuItem" + Me.WikiToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.WikiToolStripMenuItem.Text = "VERAG-WIKI" + ' + 'WikiToolStripMenuItem1 + ' + Me.WikiToolStripMenuItem1.Name = "WikiToolStripMenuItem1" + Me.WikiToolStripMenuItem1.Size = New System.Drawing.Size(190, 22) + Me.WikiToolStripMenuItem1.Text = "Wiki" + ' + 'MItarbeiterverzeichnisToolStripMenuItem + ' + Me.MItarbeiterverzeichnisToolStripMenuItem.Name = "MItarbeiterverzeichnisToolStripMenuItem" + Me.MItarbeiterverzeichnisToolStripMenuItem.Size = New System.Drawing.Size(190, 22) + Me.MItarbeiterverzeichnisToolStripMenuItem.Text = "MItarbeiterverzeichnis" + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -1174,4 +1196,7 @@ Partial Class frmMain Friend WithEvents mnuFormular As ToolStripMenuItem Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem Friend WithEvents MailvorlagenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents WikiToolStripMenuItem As ToolStripMenuItem + Friend WithEvents WikiToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents MItarbeiterverzeichnisToolStripMenuItem As ToolStripMenuItem End Class diff --git a/SDL/frmMain.resx b/SDL/frmMain.resx index f9ebb507..17d66a17 100644 --- a/SDL/frmMain.resx +++ b/SDL/frmMain.resx @@ -127,32 +127,31 @@ iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAYAAAAe2bNZAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAXLSURBVFhHzVhncFVFFI69jr33rjOOOjpjL2P54Ywj - AQkKhCIqCIoIKk3AQURaEMShSBsERFCaiKaQ8FJfCkle3oOENBNIQl4qqaS3437nupe99+0LGJzRH1+S - 8+3es3tP+XZvAojofwMt6Q/dPT10rLqVfo4vo1HLDtKjExPo2uFRdM2wKP79yMcJNGKph36K9VJxVQt1 - dfeIx/S+dNCS/lBZ307rI0to6GI3XTk0kgL6hfrg8sH76K1FGbQ2ooTKatvEY3pfOmhJOxpbOmnmj3n8 - 9ljwsUlO+vD7LJqzLZ82R5fSbwcq+DfsCWsO0xOfJfK8K4ZE0ozNuVTT2CHc6H2r0JIqwl1VdP+4WHY+ - aV02xWbWCFo/V0V8Vg1N+SGHn7trTAztSakQtH6uhJaUmL01n85/I5z6zU0jz5EGQenn9YaDRxtpcEgG - ndM/jKaKzdnHVWhJYPKGHHbwpdhQR5dvIXYKrvZEBxfz9E25nMaw9CoCb5+Lwg/ZVcj+kF77uISWRETw - 4EbHMWH6jq+JKKbhSzx0n0jfuQPCOBUAoohuSsmrE9N8n9sS4+01Qj4EagKOERH7GOAubODClBvQ4caR - +6lESID9WWDx7kKeE5pWJUzrmMWobmin29+LpldmpQjT4OqaOjj80I4q0dqJObV0mWhf+wZUXDwogiJE - 4VfUtdEmRyk5s2tNf0D/r9N5w+W21jf/ANCacIZFYe9MLKfnpiWZi/ySUEZtHd103d8t7g+InLfGEEfY - FwwMp9HLD1Frezf7Pd7YzjxqDbYE/0CBQqCgI2NXZvIEPHh1sHVRCBnGbnnHYeHtuOltB89Dzan8uFWZ - hGLGGPQIyl1U2ULtncYmeTMIl3wwNb+eB060drE+qM5Whhbx2D3vW3k77hwdw/Og1iqP4s33NvEYpALc - 6vBis754M9udZSzhUE55niBaz0w5maKrgiMps6iRfk+tpIuCIkxeh/NEhyGlf5Y1c21I/uzAMPo1+aT4 - PTs1iV7/Ks3sWibRpihKhA42gLw+9FG86ejlmUZRvzo71eR6wwvTk3k+BFNy2CReHDwwce1hrqegBS7m - mJSLQl9gA3hIOgEe+CCO8z1tY66F94cxKw6xL5zkksNmdjjLzTUW7ixgXqaVyetHGKGEKMEGkNNL37Sm - A22KMTV9OmADSDO6UeXPCgyl7/YeNdfYlWSMo/tgMymvA9AT2BIboqzdcNu70ZQhRA8FBy1Rx1RgvL65 - k+4daxywKlCXaHv4j3RXMwepgM2L6iIj8dKMFIuzF4WNdA1b4rbwEoMWuqi5rcs86XWQ6+zWRebhCb41 - I2GvHRyIOAwhASovkVfaxPcXtYuApyYn8hGDqwWUGb4XicMTY3cI1YfNCwZ/4+b6QHXDVoG3UJ1CpcE3 - iDSgINUxHJrgMb5M1IY6tjXON+q4H8HHgHnpPMbktngvDZzv4nzChiLizXG6yiJGKtHWOCgxZ7/nOBek - uiBs6BDGC8ub6bU5qWaEkAr4S86t4yMFc9D+8Llun6HsvBkcBegUPLR0zxG+bMsF0HbjV2eZDrCZ+TsK - 6AZbGiRwhCB6rgJDySGiiPjdipqj3lb8UcR/44ixKDAKEiKHu618AG+J+yvGARTbkBB90foDoq2KHGpG - Te2D4+O4fqTq8yQJRAWTcI2Qd1ZctE+lK6cC0g+ZgD/Ih4wSRA+chGUz6AJoSeBco6D8tW9fgbaH35Hf - eriW8OkDW8KyGQA3sFvFFQGHmM7hmeJpEWW8sHosSFgMidM9f/oK9UBW4UNIzNqSp3V0psBXh7xg2eFD - qJi3vYAusR2WfcWFQeH0hXhB+xoqtKQKiJj8XO0r8A8CSIPdtx1a0g58ay8QQofi0y3mD49/6iRE91/7 - 1lYBp7iDfLI+m29yN49y8L0WAolzCRfx5wWPAoXYya+M04WW7A24vO89UMnqDN1AtJ4UaYQwQnE/F58f - SIm8s/wTaMn/BhTwFyTS58zDvQ4BAAAAAElFTkSuQmCC + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAWnSURBVFhHzVhncFRVFMZex9571xlHHZ2xl7H8cMaR + EAkaCEUQkCgiKARiwEFEWhDEEZQ2QDAGJQQxms6mN5JsEkhIMyGF1A2ppG3acb6z3pf73n3ZDZnM6I9v + Nu/ce88975TvnJdxRDTu/wJF4AwDg4N0urGbfk2spZlbjtOTC5PoxmkxdMPUGP594tMkmr45l36Jr6FK + Wxf1DwySUYczKAJnaGi10+7oKpqyMYeunRJN48aHKbjaM4re25BNOyOrqLa5Z+yNae/qo+U/F/Pb48Kn + FiXTxz/l06oDJbQ/tpr+OFbPv3hesOMkPbM4hfddMzma/PYXUVN774iMUgRGRFht9LB3PCtftKuA4vOa + RqQ4Mb+JfPYW8rn75sbRkfR6l+cUgYyVQSV08TsRNH51JuWeanOpzAzHy9vJ0z+bLpgQTkv3FjrVoQgE + luwpZAVfBZVQb7+aiH39g9R8tpeT2TegiMMYnmUjyI17kfj+IWWsD+E1rgsoAgAewcF9ltOmB3dEVtK0 + Tbn0kHc8XegeriUvvIhqSi9uMT0XGFfj1EOKADkBxfCIcQ3IKWvjxDRWkYxbZxylqsZu0/MbD5fxnrBM + m7Kue2hss9Pds2PpjRXp2saWjl52P7jD1mqnlMJmusozSjFAxuWTIinSaqP6lh4KsFRTckGz7uIJ32Sx + wXWG0tcZg9KEMlyK50MpdfTSslTtkt+Saqmnd4Bu+rfEhwM8V9PkIEc8XzIxgub8cIK67QOs90y7neXI + NcUYJCgICjwyb1seb8DB6730l4LIsHbHLItigIzb3rfwPuScLPf+MY+QzFgDH4G5Kxq6yN7nMJKNgbvE + wYySVl44293P/CAr2xZWwWsPfKiXG3HvnDjeB7aW5UjekpoOXgNVQLY9olLLLzbmYHItUziYU/QTeOsF + n6EQXecVTXkV7fRnRgNd5hGpGCDjIvdwDunftZ2cG0J+vls4/Z42RH4vLk2lt7/O1KqWhShTJCVcJzYi + ro99kqgpen25I6nfXJmhXG6GV3zTeD8IUzYSLy7uWLjzJOeTxzrrkDHiUvCL2IhDsvJHPkrgeC/bV6Rc + bIa5W0+wLnRy2Zjg5DrtjvWHSlkuwsrCm6c7XAlSEhsR0yvf1YcDZYo1OXxmgAEIM6pRlp/nFkbfh5Zr + d4SkOtZRfZoxYhwAn4iNwJ4YfTXc9UEsZZe1ccKBS4xGCGC9tbOPHpznaLAykJcoe+iPzmlkGajCqWcE + XvNL1yl71S+dwzV1U45yETBpvZU6e/q1Tm8Gcc9hM888vkDNGQFj7qAhohmCAoyXAMXVHTy/yFUEPLck + hVsMRgswM3RvCHG0hntmxw4Z4/VtDucHsttoDN5CVgqWhryts48TUl5D04Qc61tCy3VrQQmq1zEfQYf7 + mqwhYw4k1tDEtVaOJ57BiHhzdFeRxAglyhqNEnuO5p7hhJQvxDN4COtldZ301qoMzUMIBfSlFbVwS8Ee + lD907opyMDsbg1aASsGhzUdO8bAtLkDZzd+erymAMWuDS+kWQxgE0ELgPWupg8lBovD4/RKbI9+2/lXB + f6PF6BgYCQmSw2wrvyXmV+FSJNtkf/OkHQ7wtkxyyBk5tI/OT+D8EayviyG8gk0YI8TMikHbFa+4AsIP + moA+0IfwEkhPvl9nDKoAXOK22pFQw5XvaIGyh94Z3+VyLuHTZ1hjAExgd86yEJqYUdlY4HmfVH5huS0M + awww0v4zWsgN2aUxwIrAYkXJWABfHWLAMkIRyFhzsJSuMDTL0eJSjwj6MrDY1IgRGQOAxMTn6miBfxCA + Goy6jVAEZsC39rrgUk4+40XO8PTnyQTvjtm3tgwoxQzy2e4CnuRun2nhuRYEib6EQfxl3zROUJCd+MoY + KRSBK2B4Dz3WwOwM3oC3nl2cwsQIxv0ioIhDImaWc4Ei+C/xDyTS58xsrLJ/AAAAAElFTkSuQmCC diff --git a/SDL/frmMain.vb b/SDL/frmMain.vb index e1d29c79..3469541e 100644 --- a/SDL/frmMain.vb +++ b/SDL/frmMain.vb @@ -1169,7 +1169,15 @@ Public Class frmMain End If End Sub + Private Sub WikiToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles WikiToolStripMenuItem.Click, MItarbeiterverzeichnisToolStripMenuItem.Click + Select Case sender.Name + Case "WikiToolStripMenuItem" : Process.Start("https://wiki.verag.ag/") + Case "MitarbeiterverzeichnisToolStripMenuItem" : Process.Start("https://wiki.verag.ag/de/mitarbeiter/verzeichnis") + + End Select + + End Sub End Class Public Class MyRenderer diff --git a/SDL/kassenbuch/frmNacherfassungLeihgeld.Designer.vb b/SDL/kassenbuch/frmNacherfassungLeihgeld.Designer.vb index d02b6dcb..4d2d496c 100644 --- a/SDL/kassenbuch/frmNacherfassungLeihgeld.Designer.vb +++ b/SDL/kassenbuch/frmNacherfassungLeihgeld.Designer.vb @@ -795,9 +795,9 @@ Partial Class frmNacherfassungLeihgeld Me.cbxOP_sofort_buchen.CheckState = System.Windows.Forms.CheckState.Checked Me.cbxOP_sofort_buchen.Location = New System.Drawing.Point(291, 290) Me.cbxOP_sofort_buchen.Name = "cbxOP_sofort_buchen" - Me.cbxOP_sofort_buchen.Size = New System.Drawing.Size(117, 17) + Me.cbxOP_sofort_buchen.Size = New System.Drawing.Size(145, 17) Me.cbxOP_sofort_buchen.TabIndex = 213 - Me.cbxOP_sofort_buchen.Text = "OP sofort erzeugen" + Me.cbxOP_sofort_buchen.Text = "Buchung sofort erzeugen" Me.cbxOP_sofort_buchen.UseVisualStyleBackColor = True ' 'frmNacherfassungLeihgeld diff --git a/SDL/kassenbuch/frmNacherfassungLeihgeld.vb b/SDL/kassenbuch/frmNacherfassungLeihgeld.vb index 454a8112..4cd01c2e 100644 --- a/SDL/kassenbuch/frmNacherfassungLeihgeld.vb +++ b/SDL/kassenbuch/frmNacherfassungLeihgeld.vb @@ -87,7 +87,6 @@ Public Class frmNacherfassungLeihgeld Case "NKD" : stammfiliale = "5303" '"4801,4803,4806,5103,5003,5303" : stammfiliale = 4806 Case "SBG" : stammfiliale = "5003" '"4801,4803,4806,5103,5003,5303" : stammfiliale = 4806 Case "NEU" : stammfiliale = "4819" '"4801,4803,4806,5103,5003,5303" : stammfiliale = 4806 - ' Case Else : filialen = "4806" '"4801,4803,4806,5103,5003,5303" : stammfiliale = 4806 End Select End Select @@ -428,15 +427,6 @@ Public Class frmNacherfassungLeihgeld End If - 'If cbxOP_sofort_buchen.Checked Then - - ' If Not createSyskaBuchung(PERSONAL_LG, BELEG, True) Then - ' MsgBox("Fehler beim Erzeugen der Buchung in der FIBU") - ' End If - - 'End If - - Me.Close() Me.DialogResult = Windows.Forms.DialogResult.OK Me.Cursor = Cursors.Default @@ -810,42 +800,4 @@ Public Class frmNacherfassungLeihgeld txtAuftrProvision.Enabled = sender.checked End Sub - Private Sub cboPrintAktendeckel_CheckedChanged(sender As Object, e As EventArgs) Handles cboPrintAktendeckel.CheckedChanged - - End Sub - - Private Sub kdFrachtführer_TextChanged(sender As Object, e As System.ComponentModel.PropertyChangedEventArgs) Handles kdFrachtführer.PropertyChanged - - End Sub - - Private Function getSachkonto(pos As EABelegPositionen) - - - ' Dim SQL = New VERAG_PROG_ALLGEMEIN.SQL - ' Dim RE As New cRechnungsausgang(pos.RK_ID) - - ' If RE.RechnungsLandKz Is Nothing OrElse RE.RechnungsLandKz Is DBNull.Value OrElse RE.RechnungsLandKz.trim = "" _ - ' OrElse RE.RechnungsLandKz = "A" _ - ' OrElse RE.RechnungsLandKz = "AT" Then - ' If CBool(pos.Steuerpflichtig) Then - ' getSachkonto = If(SQL.DLookup("[SachkontoInlandSteuerpflichtig]", "Leistungen", "[LeistungsNr]=" & pos.LeistungsNr, "FMZOLL"), "") - - ' Else - ' getSachkonto = If(SQL.DLookup("[SachkontoInlandSteuerfrei]", "Leistungen", "[LeistungsNr]=" & pos.LeistungsNr, "FMZOLL"), "") - ' End If - ' Else - ' If SQL.DLookup("[MitgliedslandEU]", "[Währungstabelle]", "[LandKz]='" & RE.RechnungsLandKz & "'", "FMZOLL", False) Then - ' If pos.LeistungsNr Then - ' getSachkonto = If(SQL.DLookup("[SachkontoEUSteuerpflichtig]", "Leistungen", "[LeistungsNr]=" & pos.LeistungsNr, "FMZOLL"), "") - ' Else - ' getSachkonto = If(SQL.DLookup("[SachkontoEUSteuerfrei]", "Leistungen", "[LeistungsNr]=" & pos.LeistungsNr, "FMZOLL"), "") - ' End If - ' Else - ' getSachkonto = If(SQL.DLookup("[Sachkonto3Land]", "Leistungen", "[LeistungsNr]=" & pos.LeistungsNr, "FMZOLL"), "") - ' End If - ' End If - ' If getSachkonto = "" Then getSachkonto = "4000" 'DEFAULT! - - End Function - End Class \ No newline at end of file diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index f415d6c1..8d9f1879 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -38,9 +38,6 @@ Partial Class frmKundenblatt Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -48,14 +45,20 @@ Partial Class frmKundenblatt Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmKundenblatt)) Me.pnlInfo = New System.Windows.Forms.Panel() Me.txtInfotext = New System.Windows.Forms.Label() Me.tbFirmendaten = New System.Windows.Forms.TabPage() Me.Panel4 = New System.Windows.Forms.Panel() - Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() Me.tbcntrMain = New System.Windows.Forms.TabControl() Me.tbAllgemein = New System.Windows.Forms.TabPage() + Me.txtEmailRE2 = New System.Windows.Forms.TextBox() Me.txtEmailRE = New System.Windows.Forms.TextBox() Me.TextBox1 = New System.Windows.Forms.TextBox() Me.PictureBox8 = New System.Windows.Forms.PictureBox() @@ -153,10 +156,8 @@ Partial Class frmKundenblatt Me.lblLetzterSA_SDL = New System.Windows.Forms.Label() Me.rtbVermerke = New System.Windows.Forms.RichTextBox() Me.tbSDLKarten = New System.Windows.Forms.TabPage() - Me.usrcntlKarten = New SDL.usrCntlKartenDaten() Me.tbLKW = New System.Windows.Forms.TabPage() Me.pnlLKWRight = New System.Windows.Forms.Panel() - Me.UsrCntlLKW1 = New SDL.usrCntlLKW() Me.pnlLKW = New System.Windows.Forms.Panel() Me.dgvLKW = New System.Windows.Forms.DataGridView() Me.pnlLKWBottom = New System.Windows.Forms.Panel() @@ -188,7 +189,6 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte = New System.Windows.Forms.TabPage() Me.tbFremdrechnungen = New System.Windows.Forms.TabPage() Me.tbOfferte = New System.Windows.Forms.TabPage() - Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.tbUSTV = New System.Windows.Forms.TabPage() Me.tbcntrUSTV = New System.Windows.Forms.TabControl() Me.tbUSTVDokumente = New System.Windows.Forms.TabPage() @@ -199,7 +199,6 @@ Partial Class frmKundenblatt Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.tbUSTVAntrage = New System.Windows.Forms.TabPage() - Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.tbFIBU = New System.Windows.Forms.TabPage() Me.txtZinsbelastungNew = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.btn_FIBU_speichern = New System.Windows.Forms.Button() @@ -249,7 +248,13 @@ Partial Class frmKundenblatt Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem() Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem() Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem() - Me.txtEmailRE2 = New System.Windows.Forms.TextBox() + Me.txtAnsprechp = New System.Windows.Forms.TextBox() + Me.dgvLeistungen = New System.Windows.Forms.DataGridView() + Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() + Me.usrcntlKarten = New SDL.usrCntlKartenDaten() + Me.UsrCntlLKW1 = New SDL.usrCntlLKW() + Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() + Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.pnlInfo.SuspendLayout() Me.tbFirmendaten.SuspendLayout() Me.Panel4.SuspendLayout() @@ -309,6 +314,7 @@ Partial Class frmKundenblatt Me.ContextMenuStrip3.SuspendLayout() Me.mne.SuspendLayout() Me.pnl.SuspendLayout() + CType(Me.dgvLeistungen, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnlInfo @@ -317,7 +323,7 @@ Partial Class frmKundenblatt Me.pnlInfo.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer)) Me.pnlInfo.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.pnlInfo.Controls.Add(Me.txtInfotext) - Me.pnlInfo.Location = New System.Drawing.Point(332, 6) + Me.pnlInfo.Location = New System.Drawing.Point(350, 6) Me.pnlInfo.Name = "pnlInfo" Me.pnlInfo.Size = New System.Drawing.Size(602, 35) Me.pnlInfo.TabIndex = 1 @@ -339,7 +345,7 @@ Partial Class frmKundenblatt Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25) Me.tbFirmendaten.Name = "tbFirmendaten" Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3) - Me.tbFirmendaten.Size = New System.Drawing.Size(1644, 962) + Me.tbFirmendaten.Size = New System.Drawing.Size(1681, 996) Me.tbFirmendaten.TabIndex = 3 Me.tbFirmendaten.Text = "Firmendaten" ' @@ -349,19 +355,9 @@ Partial Class frmKundenblatt Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(3, 3) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1638, 956) + Me.Panel4.Size = New System.Drawing.Size(1675, 990) Me.Panel4.TabIndex = 0 ' - 'UsrcntlKundeBearbeitenFull1 - ' - Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White - Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) - Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 956) - Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 - ' 'tbcntrMain ' Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons @@ -379,17 +375,19 @@ Partial Class frmKundenblatt Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMain.Name = "tbcntrMain" Me.tbcntrMain.SelectedIndex = 0 - Me.tbcntrMain.Size = New System.Drawing.Size(1652, 991) + Me.tbcntrMain.Size = New System.Drawing.Size(1689, 1025) Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein ' Me.tbAllgemein.BackColor = System.Drawing.Color.White + Me.tbAllgemein.Controls.Add(Me.txtAnsprechp) Me.tbAllgemein.Controls.Add(Me.txtEmailRE2) Me.tbAllgemein.Controls.Add(Me.txtEmailRE) Me.tbAllgemein.Controls.Add(Me.TextBox1) Me.tbAllgemein.Controls.Add(Me.PictureBox8) Me.tbAllgemein.Controls.Add(Me.FlatButton6) + Me.tbAllgemein.Controls.Add(Me.picLogo) Me.tbAllgemein.Controls.Add(Me.lblBonitaet) Me.tbAllgemein.Controls.Add(Me.Label39) Me.tbAllgemein.Controls.Add(Me.btnBonitaetBearbeiten) @@ -399,7 +397,6 @@ Partial Class frmKundenblatt Me.tbAllgemein.Controls.Add(Me.cboFirmaFMZOLL) Me.tbAllgemein.Controls.Add(Me.Label17) Me.tbAllgemein.Controls.Add(Me.dgvOfferte) - Me.tbAllgemein.Controls.Add(Me.picLogo) Me.tbAllgemein.Controls.Add(Me.Button4) Me.tbAllgemein.Controls.Add(Me.lblEmail2) Me.tbAllgemein.Controls.Add(Me.lblEmail) @@ -424,10 +421,23 @@ Partial Class frmKundenblatt Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0) Me.tbAllgemein.Name = "tbAllgemein" Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3) - Me.tbAllgemein.Size = New System.Drawing.Size(1644, 962) + Me.tbAllgemein.Size = New System.Drawing.Size(1681, 996) Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' + 'txtEmailRE2 + ' + Me.txtEmailRE2.BackColor = System.Drawing.Color.White + Me.txtEmailRE2.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtEmailRE2.Cursor = System.Windows.Forms.Cursors.Hand + Me.txtEmailRE2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtEmailRE2.Location = New System.Drawing.Point(40, 410) + Me.txtEmailRE2.Name = "txtEmailRE2" + Me.txtEmailRE2.ReadOnly = True + Me.txtEmailRE2.Size = New System.Drawing.Size(384, 19) + Me.txtEmailRE2.TabIndex = 195 + Me.txtEmailRE2.Text = "email-Rechnung" + ' 'txtEmailRE ' Me.txtEmailRE.BackColor = System.Drawing.Color.White @@ -542,7 +552,7 @@ Partial Class frmKundenblatt Me.TabControl1.Location = New System.Drawing.Point(8, 474) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(718, 482) + Me.TabControl1.Size = New System.Drawing.Size(718, 516) Me.TabControl1.TabIndex = 186 ' 'TabPage1 @@ -554,7 +564,7 @@ Partial Class frmKundenblatt Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(710, 456) + Me.TabPage1.Size = New System.Drawing.Size(710, 490) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Offene Posten" Me.TabPage1.UseVisualStyleBackColor = True @@ -613,7 +623,7 @@ Partial Class frmKundenblatt Me.dgvOffenePosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvOffenePosten.RowHeadersVisible = False Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 424) + Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 458) Me.dgvOffenePosten.TabIndex = 175 ' 'Label10 @@ -646,7 +656,7 @@ Partial Class frmKundenblatt Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(710, 456) + Me.TabPage2.Size = New System.Drawing.Size(710, 473) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Umsatzbericht" Me.TabPage2.UseVisualStyleBackColor = True @@ -691,7 +701,7 @@ Partial Class frmKundenblatt Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 Me.dgvUmsaetze.RowHeadersVisible = False Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 451) + Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 468) Me.dgvUmsaetze.TabIndex = 182 ' 'Label13 @@ -739,7 +749,7 @@ Partial Class frmKundenblatt Me.TabPage3.Controls.Add(Me.dgvUmsatzNachLeistngsNr) Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(710, 456) + Me.TabPage3.Size = New System.Drawing.Size(710, 473) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Umsatz nach LeistungsNr" Me.TabPage3.UseVisualStyleBackColor = True @@ -795,7 +805,7 @@ Partial Class frmKundenblatt Me.dgvUmsatzNachLeistngsNr.RowHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvUmsatzNachLeistngsNr.RowHeadersVisible = False Me.dgvUmsatzNachLeistngsNr.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 450) + Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 467) Me.dgvUmsatzNachLeistngsNr.TabIndex = 183 ' 'lblAdressenzusatz @@ -803,7 +813,7 @@ Partial Class frmKundenblatt Me.lblAdressenzusatz.BackColor = System.Drawing.Color.White Me.lblAdressenzusatz.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblAdressenzusatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAdressenzusatz.Location = New System.Drawing.Point(3, 144) + Me.lblAdressenzusatz.Location = New System.Drawing.Point(3, 126) Me.lblAdressenzusatz.Name = "lblAdressenzusatz" Me.lblAdressenzusatz.ReadOnly = True Me.lblAdressenzusatz.Size = New System.Drawing.Size(419, 19) @@ -835,11 +845,12 @@ Partial Class frmKundenblatt 'Label17 ' Me.Label17.AutoSize = True - Me.Label17.Location = New System.Drawing.Point(430, 20) + Me.Label17.Location = New System.Drawing.Point(660, 21) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(66, 13) Me.Label17.TabIndex = 1 Me.Label17.Text = "Offertenliste:" + Me.Label17.Visible = False ' 'dgvOfferte ' @@ -861,7 +872,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] Me.dgvOfferte.DefaultCellStyle = DataGridViewCellStyle14 - Me.dgvOfferte.Location = New System.Drawing.Point(433, 37) + Me.dgvOfferte.Location = New System.Drawing.Point(684, 37) Me.dgvOfferte.Name = "dgvOfferte" Me.dgvOfferte.ReadOnly = True DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft @@ -872,8 +883,9 @@ Partial Class frmKundenblatt DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvOfferte.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 - Me.dgvOfferte.Size = New System.Drawing.Size(293, 320) + Me.dgvOfferte.Size = New System.Drawing.Size(42, 320) Me.dgvOfferte.TabIndex = 12 + Me.dgvOfferte.Visible = False ' 'picLogo ' @@ -882,9 +894,9 @@ Partial Class frmKundenblatt Me.picLogo.Cursor = System.Windows.Forms.Cursors.Hand Me.picLogo.Image = Global.SDL.My.Resources.Resources.person_default Me.picLogo.ImageLocation = "" - Me.picLogo.Location = New System.Drawing.Point(788, 839) + Me.picLogo.Location = New System.Drawing.Point(430, 6) Me.picLogo.Name = "picLogo" - Me.picLogo.Size = New System.Drawing.Size(287, 114) + Me.picLogo.Size = New System.Drawing.Size(145, 58) Me.picLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom Me.picLogo.TabIndex = 173 Me.picLogo.TabStop = False @@ -896,7 +908,7 @@ Partial Class frmKundenblatt Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button4.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button4.Location = New System.Drawing.Point(1058, 792) + Me.Button4.Location = New System.Drawing.Point(1095, 470) Me.Button4.Name = "Button4" Me.Button4.Size = New System.Drawing.Size(136, 32) Me.Button4.TabIndex = 21 @@ -971,7 +983,7 @@ Partial Class frmKundenblatt Me.lblUid.BackColor = System.Drawing.Color.White Me.lblUid.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblUid.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblUid.Location = New System.Drawing.Point(5, 216) + Me.lblUid.Location = New System.Drawing.Point(5, 191) Me.lblUid.Name = "lblUid" Me.lblUid.ReadOnly = True Me.lblUid.Size = New System.Drawing.Size(419, 19) @@ -983,7 +995,7 @@ Partial Class frmKundenblatt Me.lblPostfach.BackColor = System.Drawing.Color.White Me.lblPostfach.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblPostfach.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblPostfach.Location = New System.Drawing.Point(5, 191) + Me.lblPostfach.Location = New System.Drawing.Point(3, 170) Me.lblPostfach.Name = "lblPostfach" Me.lblPostfach.ReadOnly = True Me.lblPostfach.Size = New System.Drawing.Size(419, 19) @@ -995,7 +1007,7 @@ Partial Class frmKundenblatt Me.lblLandPlzOrt.BackColor = System.Drawing.Color.White Me.lblLandPlzOrt.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblLandPlzOrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblLandPlzOrt.Location = New System.Drawing.Point(5, 166) + Me.lblLandPlzOrt.Location = New System.Drawing.Point(3, 149) Me.lblLandPlzOrt.Name = "lblLandPlzOrt" Me.lblLandPlzOrt.ReadOnly = True Me.lblLandPlzOrt.Size = New System.Drawing.Size(419, 19) @@ -1007,7 +1019,7 @@ Partial Class frmKundenblatt Me.lblStrasse.BackColor = System.Drawing.Color.White Me.lblStrasse.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblStrasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStrasse.Location = New System.Drawing.Point(3, 122) + Me.lblStrasse.Location = New System.Drawing.Point(3, 104) Me.lblStrasse.Name = "lblStrasse" Me.lblStrasse.ReadOnly = True Me.lblStrasse.Size = New System.Drawing.Size(419, 19) @@ -1019,7 +1031,7 @@ Partial Class frmKundenblatt Me.lblFirmenname2.BackColor = System.Drawing.Color.White Me.lblFirmenname2.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblFirmenname2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblFirmenname2.Location = New System.Drawing.Point(3, 97) + Me.lblFirmenname2.Location = New System.Drawing.Point(3, 83) Me.lblFirmenname2.Name = "lblFirmenname2" Me.lblFirmenname2.ReadOnly = True Me.lblFirmenname2.Size = New System.Drawing.Size(419, 19) @@ -1031,7 +1043,7 @@ Partial Class frmKundenblatt Me.lblFirmenname1.BackColor = System.Drawing.Color.White Me.lblFirmenname1.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblFirmenname1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblFirmenname1.Location = New System.Drawing.Point(3, 79) + Me.lblFirmenname1.Location = New System.Drawing.Point(3, 62) Me.lblFirmenname1.Name = "lblFirmenname1" Me.lblFirmenname1.ReadOnly = True Me.lblFirmenname1.Size = New System.Drawing.Size(419, 19) @@ -1057,10 +1069,11 @@ Partial Class frmKundenblatt Me.GroupBox5.Controls.Add(Me.lblStat_SdlLeistungen_Diesel) Me.GroupBox5.Controls.Add(Me.lblStat_SdlLeistungen) Me.GroupBox5.Controls.Add(Me.lblStat_Lkws) + Me.GroupBox5.Controls.Add(Me.dgvLeistungen) Me.GroupBox5.Controls.Add(Me.PictureBox5) - Me.GroupBox5.Location = New System.Drawing.Point(738, 832) + Me.GroupBox5.Location = New System.Drawing.Point(738, 501) Me.GroupBox5.Name = "GroupBox5" - Me.GroupBox5.Size = New System.Drawing.Size(456, 121) + Me.GroupBox5.Size = New System.Drawing.Size(493, 489) Me.GroupBox5.TabIndex = 22 Me.GroupBox5.TabStop = False Me.GroupBox5.Text = "Statistik" @@ -1071,7 +1084,7 @@ Partial Class frmKundenblatt Me.lblStat_SdlLeistungen_Maut.AutoSize = True Me.lblStat_SdlLeistungen_Maut.Cursor = System.Windows.Forms.Cursors.Hand Me.lblStat_SdlLeistungen_Maut.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStat_SdlLeistungen_Maut.Location = New System.Drawing.Point(12, 90) + Me.lblStat_SdlLeistungen_Maut.Location = New System.Drawing.Point(15, 48) Me.lblStat_SdlLeistungen_Maut.Name = "lblStat_SdlLeistungen_Maut" Me.lblStat_SdlLeistungen_Maut.Size = New System.Drawing.Size(27, 16) Me.lblStat_SdlLeistungen_Maut.TabIndex = 3 @@ -1082,7 +1095,7 @@ Partial Class frmKundenblatt Me.lblStat_SdlLeistungen_Diesel.AutoSize = True Me.lblStat_SdlLeistungen_Diesel.Cursor = System.Windows.Forms.Cursors.Hand Me.lblStat_SdlLeistungen_Diesel.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStat_SdlLeistungen_Diesel.Location = New System.Drawing.Point(12, 70) + Me.lblStat_SdlLeistungen_Diesel.Location = New System.Drawing.Point(15, 32) Me.lblStat_SdlLeistungen_Diesel.Name = "lblStat_SdlLeistungen_Diesel" Me.lblStat_SdlLeistungen_Diesel.Size = New System.Drawing.Size(27, 16) Me.lblStat_SdlLeistungen_Diesel.TabIndex = 2 @@ -1093,7 +1106,7 @@ Partial Class frmKundenblatt Me.lblStat_SdlLeistungen.AutoSize = True Me.lblStat_SdlLeistungen.Cursor = System.Windows.Forms.Cursors.Hand Me.lblStat_SdlLeistungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStat_SdlLeistungen.Location = New System.Drawing.Point(12, 50) + Me.lblStat_SdlLeistungen.Location = New System.Drawing.Point(15, 64) Me.lblStat_SdlLeistungen.Name = "lblStat_SdlLeistungen" Me.lblStat_SdlLeistungen.Size = New System.Drawing.Size(27, 16) Me.lblStat_SdlLeistungen.TabIndex = 1 @@ -1104,7 +1117,7 @@ Partial Class frmKundenblatt Me.lblStat_Lkws.AutoSize = True Me.lblStat_Lkws.Cursor = System.Windows.Forms.Cursors.Hand Me.lblStat_Lkws.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStat_Lkws.Location = New System.Drawing.Point(12, 30) + Me.lblStat_Lkws.Location = New System.Drawing.Point(15, 16) Me.lblStat_Lkws.Name = "lblStat_Lkws" Me.lblStat_Lkws.Size = New System.Drawing.Size(30, 16) Me.lblStat_Lkws.TabIndex = 0 @@ -1114,7 +1127,7 @@ Partial Class frmKundenblatt ' Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None Me.PictureBox5.Image = Global.SDL.My.Resources.Resources.statistik - Me.PictureBox5.Location = New System.Drawing.Point(409, 7) + Me.PictureBox5.Location = New System.Drawing.Point(449, 9) Me.PictureBox5.Name = "PictureBox5" Me.PictureBox5.Size = New System.Drawing.Size(38, 39) Me.PictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom @@ -1137,28 +1150,28 @@ Partial Class frmKundenblatt Me.dgvSperrliste.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvSperrliste.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19 Me.dgvSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle17.ForeColor = System.Drawing.Color.Black - DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSperrliste.DefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle20.ForeColor = System.Drawing.Color.Black + DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSperrliste.DefaultCellStyle = DataGridViewCellStyle20 Me.dgvSperrliste.Location = New System.Drawing.Point(732, 36) Me.dgvSperrliste.Name = "dgvSperrliste" Me.dgvSperrliste.ReadOnly = True Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 - Me.dgvSperrliste.Size = New System.Drawing.Size(462, 629) + Me.dgvSperrliste.Size = New System.Drawing.Size(499, 413) Me.dgvSperrliste.TabIndex = 23 ' 'PictureBox2 @@ -1198,11 +1211,11 @@ Partial Class frmKundenblatt Me.lblKurzname.BackColor = System.Drawing.Color.White Me.lblKurzname.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblKurzname.Font = New System.Drawing.Font("Microsoft Sans Serif", 16.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblKurzname.Location = New System.Drawing.Point(3, 18) + Me.lblKurzname.Location = New System.Drawing.Point(3, 6) Me.lblKurzname.Multiline = True Me.lblKurzname.Name = "lblKurzname" Me.lblKurzname.ReadOnly = True - Me.lblKurzname.Size = New System.Drawing.Size(421, 55) + Me.lblKurzname.Size = New System.Drawing.Size(421, 58) Me.lblKurzname.TabIndex = 0 Me.lblKurzname.Text = "VERAG Spedition AG" ' @@ -1212,7 +1225,7 @@ Partial Class frmKundenblatt Me.tbZoll.Location = New System.Drawing.Point(4, 25) Me.tbZoll.Name = "tbZoll" Me.tbZoll.Padding = New System.Windows.Forms.Padding(3) - Me.tbZoll.Size = New System.Drawing.Size(1644, 962) + Me.tbZoll.Size = New System.Drawing.Size(1681, 996) Me.tbZoll.TabIndex = 9 Me.tbZoll.Text = "ZOLL" Me.tbZoll.UseVisualStyleBackColor = True @@ -1224,7 +1237,7 @@ Partial Class frmKundenblatt Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3) Me.tbcntrZOLL.Name = "tbcntrZOLL" Me.tbcntrZOLL.SelectedIndex = 0 - Me.tbcntrZOLL.Size = New System.Drawing.Size(1638, 956) + Me.tbcntrZOLL.Size = New System.Drawing.Size(1675, 990) Me.tbcntrZOLL.TabIndex = 0 ' 'tabZoll_Artikel @@ -1232,7 +1245,7 @@ Partial Class frmKundenblatt Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22) Me.tabZoll_Artikel.Name = "tabZoll_Artikel" Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3) - Me.tabZoll_Artikel.Size = New System.Drawing.Size(1630, 930) + Me.tabZoll_Artikel.Size = New System.Drawing.Size(1667, 964) Me.tabZoll_Artikel.TabIndex = 1 Me.tabZoll_Artikel.Text = "Artikel" Me.tabZoll_Artikel.UseVisualStyleBackColor = True @@ -1243,7 +1256,7 @@ Partial Class frmKundenblatt Me.tbMdm.Location = New System.Drawing.Point(4, 25) Me.tbMdm.Name = "tbMdm" Me.tbMdm.Padding = New System.Windows.Forms.Padding(3) - Me.tbMdm.Size = New System.Drawing.Size(1644, 962) + Me.tbMdm.Size = New System.Drawing.Size(1681, 996) Me.tbMdm.TabIndex = 10 Me.tbMdm.Text = "MDM" Me.tbMdm.UseVisualStyleBackColor = True @@ -1262,7 +1275,7 @@ Partial Class frmKundenblatt Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMDM.Name = "tbcntrMDM" Me.tbcntrMDM.SelectedIndex = 0 - Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 956) + Me.tbcntrMDM.Size = New System.Drawing.Size(1675, 990) Me.tbcntrMDM.TabIndex = 0 ' 'tbSDL @@ -1274,7 +1287,7 @@ Partial Class frmKundenblatt Me.tbSDL.Margin = New System.Windows.Forms.Padding(0) Me.tbSDL.Name = "tbSDL" Me.tbSDL.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDL.Size = New System.Drawing.Size(1630, 930) + Me.tbSDL.Size = New System.Drawing.Size(1667, 964) Me.tbSDL.TabIndex = 5 Me.tbSDL.Text = "SDL-Leistungen" Me.tbSDL.UseVisualStyleBackColor = True @@ -1283,40 +1296,40 @@ Partial Class frmKundenblatt ' Me.dgvSDLLeistungenFull.AllowUserToAddRows = False Me.dgvSDLLeistungenFull.AllowUserToResizeRows = False - DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSDLLeistungenFull.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSDLLeistungenFull.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21 Me.dgvSDLLeistungenFull.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSDLLeistungenFull.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSDLLeistungenFull.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22 Me.dgvSDLLeistungenFull.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSDLLeistungenFull.DefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSDLLeistungenFull.DefaultCellStyle = DataGridViewCellStyle23 Me.dgvSDLLeistungenFull.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvSDLLeistungenFull.Location = New System.Drawing.Point(3, 50) Me.dgvSDLLeistungenFull.Name = "dgvSDLLeistungenFull" Me.dgvSDLLeistungenFull.ReadOnly = True - DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle24 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 734) + Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1661, 768) Me.dgvSDLLeistungenFull.TabIndex = 5 ' 'Panel6 @@ -1330,7 +1343,7 @@ Partial Class frmKundenblatt Me.Panel6.Dock = System.Windows.Forms.DockStyle.Top Me.Panel6.Location = New System.Drawing.Point(3, 3) Me.Panel6.Name = "Panel6" - Me.Panel6.Size = New System.Drawing.Size(1624, 47) + Me.Panel6.Size = New System.Drawing.Size(1661, 47) Me.Panel6.TabIndex = 178 ' 'Label28 @@ -1422,9 +1435,9 @@ Partial Class frmKundenblatt Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL) Me.Panel5.Controls.Add(Me.rtbVermerke) Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel5.Location = New System.Drawing.Point(3, 784) + Me.Panel5.Location = New System.Drawing.Point(3, 818) Me.Panel5.Name = "Panel5" - Me.Panel5.Size = New System.Drawing.Size(1624, 143) + Me.Panel5.Size = New System.Drawing.Size(1661, 143) Me.Panel5.TabIndex = 177 ' 'btnBestelldateiErzeugen @@ -1816,21 +1829,11 @@ Partial Class frmKundenblatt Me.tbSDLKarten.Location = New System.Drawing.Point(4, 22) Me.tbSDLKarten.Name = "tbSDLKarten" Me.tbSDLKarten.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDLKarten.Size = New System.Drawing.Size(178, 39) + Me.tbSDLKarten.Size = New System.Drawing.Size(1630, 947) Me.tbSDLKarten.TabIndex = 7 Me.tbSDLKarten.Text = "SDL-Kartenverwaltung" Me.tbSDLKarten.UseVisualStyleBackColor = True ' - 'usrcntlKarten - ' - Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default - Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) - Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.usrcntlKarten.Name = "usrcntlKarten" - Me.usrcntlKarten.Size = New System.Drawing.Size(172, 33) - Me.usrcntlKarten.TabIndex = 0 - ' 'tbLKW ' Me.tbLKW.Controls.Add(Me.pnlLKWRight) @@ -1838,7 +1841,7 @@ Partial Class frmKundenblatt Me.tbLKW.Location = New System.Drawing.Point(4, 22) Me.tbLKW.Name = "tbLKW" Me.tbLKW.Padding = New System.Windows.Forms.Padding(3) - Me.tbLKW.Size = New System.Drawing.Size(178, 39) + Me.tbLKW.Size = New System.Drawing.Size(1630, 947) Me.tbLKW.TabIndex = 4 Me.tbLKW.Text = "LKWs" Me.tbLKW.UseVisualStyleBackColor = True @@ -1850,22 +1853,9 @@ Partial Class frmKundenblatt Me.pnlLKWRight.Location = New System.Drawing.Point(309, 3) Me.pnlLKWRight.Name = "pnlLKWRight" Me.pnlLKWRight.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0) - Me.pnlLKWRight.Size = New System.Drawing.Size(0, 33) + Me.pnlLKWRight.Size = New System.Drawing.Size(1318, 941) Me.pnlLKWRight.TabIndex = 2 ' - 'UsrCntlLKW1 - ' - Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White - Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) - Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) - Me.UsrCntlLKW1.Name = "UsrCntlLKW1" - Me.UsrCntlLKW1.Size = New System.Drawing.Size(0, 33) - Me.UsrCntlLKW1.TabIndex = 0 - ' 'pnlLKW ' Me.pnlLKW.Controls.Add(Me.dgvLKW) @@ -1874,48 +1864,48 @@ Partial Class frmKundenblatt Me.pnlLKW.Dock = System.Windows.Forms.DockStyle.Left Me.pnlLKW.Location = New System.Drawing.Point(3, 3) Me.pnlLKW.Name = "pnlLKW" - Me.pnlLKW.Size = New System.Drawing.Size(306, 33) + Me.pnlLKW.Size = New System.Drawing.Size(306, 941) Me.pnlLKW.TabIndex = 3 ' 'dgvLKW ' Me.dgvLKW.AllowUserToAddRows = False Me.dgvLKW.AllowUserToDeleteRows = False - DataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvLKW.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle22 + DataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvLKW.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle25 Me.dgvLKW.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle26 Me.dgvLKW.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle24 + DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle27 Me.dgvLKW.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvLKW.Location = New System.Drawing.Point(0, 62) Me.dgvLKW.Name = "dgvLKW" Me.dgvLKW.ReadOnly = True - DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle25 + DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle28 Me.dgvLKW.RowHeadersVisible = False Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvLKW.Size = New System.Drawing.Size(306, 0) + Me.dgvLKW.Size = New System.Drawing.Size(306, 767) Me.dgvLKW.TabIndex = 2 ' 'pnlLKWBottom @@ -1927,7 +1917,7 @@ Partial Class frmKundenblatt Me.pnlLKWBottom.Controls.Add(Me.Button13) Me.pnlLKWBottom.Controls.Add(Me.lblErgebnisse) Me.pnlLKWBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlLKWBottom.Location = New System.Drawing.Point(0, -79) + Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 829) Me.pnlLKWBottom.Name = "pnlLKWBottom" Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112) Me.pnlLKWBottom.TabIndex = 3 @@ -2068,7 +2058,7 @@ Partial Class frmKundenblatt Me.tbVERAGCard.Location = New System.Drawing.Point(4, 22) Me.tbVERAGCard.Name = "tbVERAGCard" Me.tbVERAGCard.Padding = New System.Windows.Forms.Padding(3) - Me.tbVERAGCard.Size = New System.Drawing.Size(178, 39) + Me.tbVERAGCard.Size = New System.Drawing.Size(1630, 947) Me.tbVERAGCard.TabIndex = 6 Me.tbVERAGCard.Text = "VERAG Card" Me.tbVERAGCard.UseVisualStyleBackColor = True @@ -2080,7 +2070,7 @@ Partial Class frmKundenblatt Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel3.Location = New System.Drawing.Point(3, 3) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(172, 33) + Me.Panel3.Size = New System.Drawing.Size(1624, 941) Me.Panel3.TabIndex = 0 ' 'tbDokumente @@ -2098,7 +2088,7 @@ Partial Class frmKundenblatt Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd) Me.tbDokumente.Location = New System.Drawing.Point(4, 22) Me.tbDokumente.Name = "tbDokumente" - Me.tbDokumente.Size = New System.Drawing.Size(178, 39) + Me.tbDokumente.Size = New System.Drawing.Size(1630, 947) Me.tbDokumente.TabIndex = 8 Me.tbDokumente.Text = "Dokumente" Me.tbDokumente.UseVisualStyleBackColor = True @@ -2298,7 +2288,7 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte.Location = New System.Drawing.Point(4, 22) Me.tbBesuchsberichte.Name = "tbBesuchsberichte" Me.tbBesuchsberichte.Padding = New System.Windows.Forms.Padding(3) - Me.tbBesuchsberichte.Size = New System.Drawing.Size(178, 39) + Me.tbBesuchsberichte.Size = New System.Drawing.Size(1630, 947) Me.tbBesuchsberichte.TabIndex = 9 Me.tbBesuchsberichte.Text = "Besuchsberichte" Me.tbBesuchsberichte.UseVisualStyleBackColor = True @@ -2307,7 +2297,7 @@ Partial Class frmKundenblatt ' Me.tbFremdrechnungen.Location = New System.Drawing.Point(4, 22) Me.tbFremdrechnungen.Name = "tbFremdrechnungen" - Me.tbFremdrechnungen.Size = New System.Drawing.Size(178, 39) + Me.tbFremdrechnungen.Size = New System.Drawing.Size(1630, 947) Me.tbFremdrechnungen.TabIndex = 10 Me.tbFremdrechnungen.Text = "Fremdrechnungen" Me.tbFremdrechnungen.UseVisualStyleBackColor = True @@ -2318,27 +2308,17 @@ Partial Class frmKundenblatt Me.tbOfferte.Location = New System.Drawing.Point(4, 25) Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2) Me.tbOfferte.Name = "tbOfferte" - Me.tbOfferte.Size = New System.Drawing.Size(1644, 962) + Me.tbOfferte.Size = New System.Drawing.Size(1681, 996) Me.tbOfferte.TabIndex = 11 Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True ' - 'UsrCntlOfferte1 - ' - Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White - Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) - Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 962) - Me.UsrCntlOfferte1.TabIndex = 0 - ' 'tbUSTV ' Me.tbUSTV.Controls.Add(Me.tbcntrUSTV) Me.tbUSTV.Location = New System.Drawing.Point(4, 25) Me.tbUSTV.Name = "tbUSTV" - Me.tbUSTV.Size = New System.Drawing.Size(1644, 962) + Me.tbUSTV.Size = New System.Drawing.Size(1681, 996) Me.tbUSTV.TabIndex = 12 Me.tbUSTV.Text = "USTV" Me.tbUSTV.UseVisualStyleBackColor = True @@ -2352,7 +2332,7 @@ Partial Class frmKundenblatt Me.tbcntrUSTV.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrUSTV.Name = "tbcntrUSTV" Me.tbcntrUSTV.SelectedIndex = 0 - Me.tbcntrUSTV.Size = New System.Drawing.Size(1644, 962) + Me.tbcntrUSTV.Size = New System.Drawing.Size(1681, 996) Me.tbcntrUSTV.TabIndex = 1 ' 'tbUSTVDokumente @@ -2365,7 +2345,7 @@ Partial Class frmKundenblatt Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVVollmachten) Me.tbUSTVDokumente.Location = New System.Drawing.Point(4, 22) Me.tbUSTVDokumente.Name = "tbUSTVDokumente" - Me.tbUSTVDokumente.Size = New System.Drawing.Size(1636, 936) + Me.tbUSTVDokumente.Size = New System.Drawing.Size(1673, 970) Me.tbUSTVDokumente.TabIndex = 8 Me.tbUSTVDokumente.Text = "Dokumente" Me.tbUSTVDokumente.UseVisualStyleBackColor = True @@ -2466,19 +2446,11 @@ Partial Class frmKundenblatt Me.tbUSTVAntrage.Location = New System.Drawing.Point(4, 22) Me.tbUSTVAntrage.Name = "tbUSTVAntrage" Me.tbUSTVAntrage.Padding = New System.Windows.Forms.Padding(3) - Me.tbUSTVAntrage.Size = New System.Drawing.Size(184, 45) + Me.tbUSTVAntrage.Size = New System.Drawing.Size(1636, 953) Me.tbUSTVAntrage.TabIndex = 9 Me.tbUSTVAntrage.Text = "USTV-Anträge" Me.tbUSTVAntrage.UseVisualStyleBackColor = True ' - 'UsrCntlUSTV - ' - Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlUSTV.Name = "UsrCntlUSTV" - Me.UsrCntlUSTV.Size = New System.Drawing.Size(178, 39) - Me.UsrCntlUSTV.TabIndex = 0 - ' 'tbFIBU ' Me.tbFIBU.Controls.Add(Me.txtZinsbelastungNew) @@ -2496,7 +2468,7 @@ Partial Class frmKundenblatt Me.tbFIBU.Controls.Add(Me.txtFIBUKuerzel) Me.tbFIBU.Location = New System.Drawing.Point(4, 25) Me.tbFIBU.Name = "tbFIBU" - Me.tbFIBU.Size = New System.Drawing.Size(1644, 962) + Me.tbFIBU.Size = New System.Drawing.Size(1681, 996) Me.tbFIBU.TabIndex = 13 Me.tbFIBU.Text = "FIBU" Me.tbFIBU.UseVisualStyleBackColor = True @@ -2655,7 +2627,7 @@ Partial Class frmKundenblatt Me.tbRechnungen.Controls.Add(Me.MyPanel1) Me.tbRechnungen.Location = New System.Drawing.Point(4, 25) Me.tbRechnungen.Name = "tbRechnungen" - Me.tbRechnungen.Size = New System.Drawing.Size(1644, 962) + Me.tbRechnungen.Size = New System.Drawing.Size(1681, 996) Me.tbRechnungen.TabIndex = 14 Me.tbRechnungen.Text = "Rechnungen" Me.tbRechnungen.UseVisualStyleBackColor = True @@ -2674,7 +2646,7 @@ Partial Class frmKundenblatt Me.dgvRg.ReadOnly = True Me.dgvRg.RowHeadersVisible = False Me.dgvRg.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvRg.Size = New System.Drawing.Size(1644, 902) + Me.dgvRg.Size = New System.Drawing.Size(1681, 936) Me.dgvRg.TabIndex = 3 ' 'MyPanel1 @@ -2687,7 +2659,7 @@ Partial Class frmKundenblatt Me.MyPanel1.Dock = System.Windows.Forms.DockStyle.Top Me.MyPanel1.Location = New System.Drawing.Point(0, 0) Me.MyPanel1.Name = "MyPanel1" - Me.MyPanel1.Size = New System.Drawing.Size(1644, 60) + Me.MyPanel1.Size = New System.Drawing.Size(1681, 60) Me.MyPanel1.TabIndex = 2 ' 'btnRgPdf @@ -2696,7 +2668,7 @@ Partial Class frmKundenblatt Me.btnRgPdf.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnRgPdf.Image = Global.SDL.My.Resources.Resources.pdf1 Me.btnRgPdf.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnRgPdf.Location = New System.Drawing.Point(1531, 0) + Me.btnRgPdf.Location = New System.Drawing.Point(1568, 0) Me.btnRgPdf.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) Me.btnRgPdf.Name = "btnRgPdf" Me.btnRgPdf.Size = New System.Drawing.Size(105, 57) @@ -2848,7 +2820,7 @@ Partial Class frmKundenblatt Me.mne.Location = New System.Drawing.Point(0, 31) Me.mne.Name = "mne" Me.mne.Padding = New System.Windows.Forms.Padding(5, 0, 0, 0) - Me.mne.Size = New System.Drawing.Size(1652, 81) + Me.mne.Size = New System.Drawing.Size(1689, 81) Me.mne.TabIndex = 3 Me.mne.Text = "mnue" ' @@ -2901,7 +2873,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' @@ -2989,7 +2961,7 @@ Partial Class frmKundenblatt Me.pnl.Dock = System.Windows.Forms.DockStyle.Top Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(1652, 112) + Me.pnl.Size = New System.Drawing.Size(1689, 112) Me.pnl.TabIndex = 0 ' 'lblINAKTIV @@ -3034,7 +3006,7 @@ Partial Class frmKundenblatt Me.KdSearchBox1.Name = "KdSearchBox1" Me.KdSearchBox1.nurAktive = False Me.KdSearchBox1.searchActive = True - Me.KdSearchBox1.Size = New System.Drawing.Size(1652, 34) + Me.KdSearchBox1.Size = New System.Drawing.Size(1689, 34) Me.KdSearchBox1.TabIndex = 0 Me.KdSearchBox1.TIMER_SEARCH = True Me.KdSearchBox1.usrcntl = Nothing @@ -3063,18 +3035,105 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' - 'txtEmailRE2 + 'txtAnsprechp ' - Me.txtEmailRE2.BackColor = System.Drawing.Color.White - Me.txtEmailRE2.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtEmailRE2.Cursor = System.Windows.Forms.Cursors.Hand - Me.txtEmailRE2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtEmailRE2.Location = New System.Drawing.Point(40, 410) - Me.txtEmailRE2.Name = "txtEmailRE2" - Me.txtEmailRE2.ReadOnly = True - Me.txtEmailRE2.Size = New System.Drawing.Size(384, 19) - Me.txtEmailRE2.TabIndex = 195 - Me.txtEmailRE2.Text = "email-Rechnung" + Me.txtAnsprechp.BackColor = System.Drawing.Color.White + Me.txtAnsprechp.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtAnsprechp.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtAnsprechp.Location = New System.Drawing.Point(5, 212) + Me.txtAnsprechp.Name = "txtAnsprechp" + Me.txtAnsprechp.ReadOnly = True + Me.txtAnsprechp.Size = New System.Drawing.Size(431, 19) + Me.txtAnsprechp.TabIndex = 196 + Me.txtAnsprechp.Text = "Kontakt" + ' + 'dgvLeistungen + ' + Me.dgvLeistungen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.dgvLeistungen.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLeistungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16 + Me.dgvLeistungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle17.ForeColor = System.Drawing.Color.Black + DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvLeistungen.DefaultCellStyle = DataGridViewCellStyle17 + Me.dgvLeistungen.Location = New System.Drawing.Point(6, 92) + Me.dgvLeistungen.Name = "dgvLeistungen" + Me.dgvLeistungen.ReadOnly = True + DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLeistungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle18 + Me.dgvLeistungen.Size = New System.Drawing.Size(481, 391) + Me.dgvLeistungen.TabIndex = 197 + ' + 'UsrcntlKundeBearbeitenFull1 + ' + Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White + Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) + Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1675, 990) + Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 + ' + 'usrcntlKarten + ' + Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default + Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) + Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.usrcntlKarten.Name = "usrcntlKarten" + Me.usrcntlKarten.Size = New System.Drawing.Size(1624, 941) + Me.usrcntlKarten.TabIndex = 0 + ' + 'UsrCntlLKW1 + ' + Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White + Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) + Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) + Me.UsrCntlLKW1.Name = "UsrCntlLKW1" + Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 941) + Me.UsrCntlLKW1.TabIndex = 0 + ' + 'UsrCntlOfferte1 + ' + Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White + Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) + Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1681, 996) + Me.UsrCntlOfferte1.TabIndex = 0 + ' + 'UsrCntlUSTV + ' + Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlUSTV.Name = "UsrCntlUSTV" + Me.UsrCntlUSTV.Size = New System.Drawing.Size(1630, 947) + Me.UsrCntlUSTV.TabIndex = 0 ' 'frmKundenblatt ' @@ -3082,7 +3141,7 @@ Partial Class frmKundenblatt Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1649, 1120) + Me.ClientSize = New System.Drawing.Size(1689, 1137) Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain) @@ -3172,6 +3231,7 @@ Partial Class frmKundenblatt Me.mne.PerformLayout() Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() + CType(Me.dgvLeistungen, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -3377,4 +3437,6 @@ Partial Class frmKundenblatt Friend WithEvents TextBox1 As TextBox Friend WithEvents PictureBox8 As PictureBox Friend WithEvents txtEmailRE2 As TextBox + Friend WithEvents txtAnsprechp As TextBox + Friend WithEvents dgvLeistungen As DataGridView End Class diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index e69b6dfb..6c1a5ffd 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -18,7 +18,8 @@ Public Class frmKundenblatt ' Dim KUNDE As cKunde = Nothing Dim ADRESSE As VERAG_PROG_ALLGEMEIN.cAdressen = Nothing Dim KUNDE_ERW As VERAG_PROG_ALLGEMEIN.cKundenErweitert = Nothing - Dim KUNDE_K As VERAG_PROG_ALLGEMEIN.cKundenKontakte = Nothing + Dim KUNDE_K_RE As VERAG_PROG_ALLGEMEIN.cKundenKontakte = Nothing + Dim KUNDE_K_GF As VERAG_PROG_ALLGEMEIN.cKundenKontakte = Nothing ' Public BERECHTIGUNEN As List(Of cBerechtigungen) = Nothing @@ -344,6 +345,7 @@ Public Class frmKundenblatt initDGVOffenePosten() initDGVUmsatz() initDGVUmsatzNachLeistungsNr() + initStat() ' initDgvSDLLeistungen() 'showDgvSDLLeistungen() @@ -639,27 +641,47 @@ Public Class frmKundenblatt End Sub Sub initStat() - lblStat_Lkws.Text = SQL.getSqlCount("SELECT Count(KfzKennzeichen) FROM LKW WHERE KundenNr=" & kdNr & " and isnull(Verkauft,0) <> 1 and isnull(Abgemeldet,0) <> 1 ") & " aktive LKWs registriert" + lblStat_Lkws.Text = SQL.getSqlCount("SELECT Count(KfzKennzeichen) FROM LKW WHERE KundenNr=" & kdNr & " and isnull(Verkauft,0) <> 1 and isnull(Abgemeldet,0) <> 1 ") & " aktive LKWs registriert" 'OK + lblStat_SdlLeistungen.Text = SQL.getSqlCount("SELECT Count(SDL.SDLNr) FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdNr & " and ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr ") & " aktive SDL Leistungen" + With dgvLeistungen + .DataSource = SQL.loadDgvBySql(" SELECT Count(SDL.SDLNr) as Anzahl , SDLBez as Leistung FROM SDL, Speditionsdienstleistungen + WHERE KundenNr=" & kdNr & " and ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 + AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr group by SDLBez order by Count(SDL.SDLNr) desc ") + .Columns(1).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + + .RowTemplate.Height = 20 + .AllowUserToAddRows = False + .AllowUserToDeleteRows = False + .AllowUserToOrderColumns = False + .AllowUserToResizeColumns = False + .AllowUserToResizeRows = False + .RowTemplate.ReadOnly = True + .RowHeadersVisible = False + + + End With + + Dim SQL_Diesel As String = " FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdNr & " AND ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr AND SDL.SDLNr IN (100,101)" Dim dt_Diesel As DataTable = SQL.loadDgvBySql("SELECT SDL.SDLNr,Count(SDL.SDLNr) as Anzahl" & SQL_Diesel & " Group by SDL.SDLNr", "SDL") lblStat_SdlLeistungen_Diesel.Text = SQL.getSqlCount("SELECT Count(SDL.SDLNr)" & SQL_Diesel) & " aktive Tankkarten" - If dt_Diesel.Rows.Count > 0 Then - lblStat_SdlLeistungen_Diesel.Text &= " ( " - For Each r In dt_Diesel.Rows - Dim Lieferant As String = "" - Select Case r.Item("SDLNr") - Case "100" : Lieferant = r.Item("Anzahl") & "x IDS " - Case "101" : Lieferant = r.Item("Anzahl") & "x RMC " - End Select + 'If dt_Diesel.Rows.Count > 0 Then + ' lblStat_SdlLeistungen_Diesel.Text &= " ( " + ' For Each r In dt_Diesel.Rows + ' Dim Lieferant As String = "" + ' Select Case r.Item("SDLNr") + ' Case "100" : Lieferant = r.Item("Anzahl") & "x IDS " + ' Case "101" : Lieferant = r.Item("Anzahl") & "x RMC " + ' End Select - lblStat_SdlLeistungen_Diesel.Text &= Lieferant - Next - lblStat_SdlLeistungen_Diesel.Text &= ")" - End If + ' lblStat_SdlLeistungen_Diesel.Text &= Lieferant + ' Next + ' lblStat_SdlLeistungen_Diesel.Text &= ")" + 'End If @@ -668,35 +690,35 @@ Public Class frmKundenblatt lblStat_SdlLeistungen_Maut.Text = SQL.getSqlCount("SELECT Count(SDL.SDLNr)" & SQL_Maut) & " aktive Mautboxen/-karten" - If dt_Maut.Rows.Count > 0 Then - lblStat_SdlLeistungen_Maut.Text &= " ( " - For Each r As DataRow In dt_Maut.Rows - Dim Lieferant As String = "" - Select Case r.Item("SDLNr") - Case "200" : Lieferant = r.Item("Anzahl") & "x AT " - Case "201" : Lieferant = r.Item("Anzahl") & "x DE " - Case "202" : Lieferant = r.Item("Anzahl") & "x TELEPASS " - Case "203" : Lieferant = r.Item("Anzahl") & "x CZ " - Case "205" : Lieferant = r.Item("Anzahl") & "x MotorWay " - Case "206" : Lieferant = r.Item("Anzahl") & "x DouBox " - Case "208" : Lieferant = r.Item("Anzahl") & "x MSE " - Case "209" : Lieferant = r.Item("Anzahl") & "x PL " - Case "210" : Lieferant = r.Item("Anzahl") & "x SI " - Case "211" : Lieferant = r.Item("Anzahl") & "x MSE-MP " - Case "212" : Lieferant = r.Item("Anzahl") & "x UTA " - Case "213" : Lieferant = r.Item("Anzahl") & "x HUGO " - Case "214" : Lieferant = r.Item("Anzahl") & "x PLOSE-RM " - Case "215" : Lieferant = r.Item("Anzahl") & "x PLOSE-IT " - Case "216" : Lieferant = r.Item("Anzahl") & "x PLOSE-CZ " - Case "217" : Lieferant = r.Item("Anzahl") & "x PLOSE-MP " - Case "218" : Lieferant = r.Item("Anzahl") & "x PLOSE-TM " + 'If dt_Maut.Rows.Count > 0 Then + ' lblStat_SdlLeistungen_Maut.Text &= " ( " + ' For Each r As DataRow In dt_Maut.Rows + ' Dim Lieferant As String = "" + ' Select Case r.Item("SDLNr") + ' Case "200" : Lieferant = r.Item("Anzahl") & "x AT " + ' Case "201" : Lieferant = r.Item("Anzahl") & "x DE " + ' Case "202" : Lieferant = r.Item("Anzahl") & "x TELEPASS " + ' Case "203" : Lieferant = r.Item("Anzahl") & "x CZ " + ' Case "205" : Lieferant = r.Item("Anzahl") & "x MotorWay " + ' Case "206" : Lieferant = r.Item("Anzahl") & "x DouBox " + ' Case "208" : Lieferant = r.Item("Anzahl") & "x MSE " + ' Case "209" : Lieferant = r.Item("Anzahl") & "x PL " + ' Case "210" : Lieferant = r.Item("Anzahl") & "x SI " + ' Case "211" : Lieferant = r.Item("Anzahl") & "x MSE-MP " + ' Case "212" : Lieferant = r.Item("Anzahl") & "x UTA " + ' Case "213" : Lieferant = r.Item("Anzahl") & "x HUGO " + ' Case "214" : Lieferant = r.Item("Anzahl") & "x PLOSE-RM " + ' Case "215" : Lieferant = r.Item("Anzahl") & "x PLOSE-IT " + ' Case "216" : Lieferant = r.Item("Anzahl") & "x PLOSE-CZ " + ' Case "217" : Lieferant = r.Item("Anzahl") & "x PLOSE-MP " + ' Case "218" : Lieferant = r.Item("Anzahl") & "x PLOSE-TM " - End Select + ' End Select - lblStat_SdlLeistungen_Maut.Text &= Lieferant - Next - lblStat_SdlLeistungen_Maut.Text &= ")" - End If + ' lblStat_SdlLeistungen_Maut.Text &= Lieferant + ' Next + ' lblStat_SdlLeistungen_Maut.Text &= ")" + 'End If End Sub @@ -738,7 +760,8 @@ Public Class frmKundenblatt KUNDE = New VERAG_PROG_ALLGEMEIN.cKunde(kdNr) 'kundenSQL.getKundeByKdNr(kdNr) ADRESSE = New VERAG_PROG_ALLGEMEIN.cAdressen(kdNr) 'kundenSQL.getKundeByKdNr(kdNr) KUNDE_ERW = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdNr) - KUNDE_K = New VERAG_PROG_ALLGEMEIN.cKundenKontakte(8, kdNr) + KUNDE_K_RE = New VERAG_PROG_ALLGEMEIN.cKundenKontakte(8, kdNr) 'Rechnungen an! + KUNDE_K_GF = New VERAG_PROG_ALLGEMEIN.cKundenKontakte(13, kdNr) 'Rechnungen an! 'Me.dataAdapterFirma = Nothing ' Me.dataFirma.Clear() 'SDL! @@ -752,16 +775,16 @@ Public Class frmKundenblatt 'Me.dataFirma.AcceptChanges() ' Me.dataFirma.Locale = System.Globalization.CultureInfo.InvariantCulture - lblKurzname.Text = checkNullStr(ADRESSE.Ordnungsbegriff) lblFirmenname1.Text = checkNullStr(ADRESSE.Name_1) lblFirmenname2.Text = checkNullStr(ADRESSE.Name_2) - lblStrasse.Text = checkNullStr(ADRESSE.Straße) lblAdressenzusatz.Text = checkNullStr(KUNDE_ERW.kde_AdressZusatz) lblLandPlzOrt.Text = checkNullStr(ADRESSE.LandKz) & " - " & checkNullStr(ADRESSE.PLZ) & " - " & checkNullStr(ADRESSE.Ort) - lblPostfach.Text = checkNullStr(ADRESSE.PLZPF) & " - " & checkNullStr(ADRESSE.Postfach) + txtAnsprechp.Text = "" + txtAnsprechp.Text = IIf(checkNullStr(ADRESSE.Anrede) <> "", ADRESSE.Anrede & " ", "") + txtAnsprechp.Text &= IIf(checkNullStr(ADRESSE.Ansprechpartner) <> "", ADRESSE.Ansprechpartner, "") lblTel.Text = checkNullStr(ADRESSE.Telefon) @@ -772,9 +795,21 @@ Public Class frmKundenblatt txtEmailRE.Text = "-" txtEmailRE2.Text = "" - If KUNDE_K.hasEntry Then 'Rechnung an - txtEmailRE.Text = KUNDE_K.kkd_Email - txtEmailRE2.Text &= KUNDE_K.kkd_EmailCC + If KUNDE_K_RE.hasEntry Then 'Rechnung an + txtEmailRE.Text = KUNDE_K_RE.kkd_Email + txtEmailRE2.Text &= KUNDE_K_RE.kkd_EmailCC + End If + + + If KUNDE_K_GF.hasEntry Then + If txtAnsprechp.Text <> "" Then txtAnsprechp.Text &= " " + + txtAnsprechp.Text &= "(GF:" + txtAnsprechp.Text &= IIf(checkNullStr(KUNDE_K_GF.kkd_AnsprechpartnerAnrede) <> "", KUNDE_K_GF.kkd_AnsprechpartnerAnrede & " ", "") + txtAnsprechp.Text &= IIf(checkNullStr(KUNDE_K_GF.kkd_AnsprechpartnerVorname) <> "", KUNDE_K_GF.kkd_AnsprechpartnerVorname & " ", "") + txtAnsprechp.Text &= IIf(checkNullStr(KUNDE_K_GF.kkd_AnsprechpartnerNachname) <> "", KUNDE_K_GF.kkd_AnsprechpartnerNachname.ToString.ToUpper, "") + txtAnsprechp.Text &= ")" + End If @@ -1062,7 +1097,7 @@ Public Class frmKundenblatt ' .DataSource = SQL.loadDgvBySql("SELECT Speditionsdienstleistungen.SDLNr,Speditionsdienstleistungen.SDLBez,Sperrnummernverzeichnis.SperrNr,Sperrnummernverzeichnis.SperrBez,KundenSDL.Sperrdatum FROM Speditionsdienstleistungen,KundenSDL,Sperrnummernverzeichnis WHERE KundenSDL.KundenNr=" & kdNr & " AND Speditionsdienstleistungen.SDLNr=KundenSDL.SDLNr AND Sperrnummernverzeichnis.SperrNr=KundenSDL.Sperre /*AND KundenSDL.Sperrdatum IS NOT NULL*/ ORDER BY SperrNr") .DataSource = SQL.loadDgvBySql(" SELECT KundenSDL.SDLNr, Speditionsdienstleistungen.SDLBez,Sperrnummernverzeichnis.SperrNr,Sperrnummernverzeichnis.SperrBez, [Sperrdatum] " & " FROM KundenSDL INNER JOIN Speditionsdienstleistungen ON Speditionsdienstleistungen.SDLNr=KundenSDL.SDLNr INNER JOIN Sperrnummernverzeichnis ON Sperrnummernverzeichnis.SperrNr=KundenSDL.Sperre " & - " WHERE KundenSDL.KundenNr='" & kdNr & "' /*AND [SDLTypNr] <=2 */ ORDER BY Sperre,Speditionsdienstleistungen.SDLBez") + " WHERE KundenSDL.KundenNr='" & kdNr & "' AND KundenSDL.SDLNr in (select distinct(SDL.SDLNr) from SDL where SDL.SDLNr=KundenSDL.SDLNr AND SDL.KundenNr = KundenSDL.KundenNr) and SDLTypNr IN (1,2) ORDER BY Sperre,Speditionsdienstleistungen.SDLBez") .RowTemplate.Height = 20 .AllowUserToAddRows = False .AllowUserToDeleteRows = False @@ -1317,12 +1352,10 @@ Public Class frmKundenblatt If GroupBox5.Visible Then 'Stat angezeigt GroupBox5.Visible = False sender.text = "Statistik anzeigen" - picLogo.Visible = True Else GroupBox5.Visible = True initStat() sender.text = "Statistik ausblenden" - picLogo.Visible = False End If End Sub diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index 808c8a90..4c3dece4 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -424,7 +424,7 @@ Public Class usrCntlCBAM Dim SQL_DAKOSY = "" Dim SQL_GP = "" - getDY_Detail_SQL(SQLSTR_WHERE_FIRMEN, EORI, SQL_DAKOSY, SQL_GP) '--> Aufbau SQL String + getDY_Detail_SQL_DK(SQLSTR_WHERE_FIRMEN, EORI, SQL_DAKOSY, SQL_GP) '--> Aufbau SQL String Dim dt = SQL.loadDgvBySql(SQL_DAKOSY, "AVISO", 600) @@ -673,14 +673,14 @@ Public Class usrCntlCBAM End Sub - Sub getDY_Detail_SQL(SQLSTR_WHERE_FIRMEN, EORI, ByRef SQL_DAKOSY, ByRef SQL_GP) + Sub getDY_Detail_SQL_DK(SQLSTR_WHERE_FIRMEN, EORI, ByRef SQL_DAKOSY, ByRef SQL_GP) SQL_GP = "SELECT [Registriernummer_MRN] as 'declaration no' ,max(Ãœberlassungsdatum) as 'declaration date' ,isnull(max(Empfänger_CN_EORI),'') as 'importer identification number' ,'' as 'exporter identification number' , max(Warentarifnummer) as 'commodity code' - ,max([VersendungsLand]) as 'origin country code' + ,max(Ursprungsland_ISO2) as 'origin country code' ,Left(max(Verfahren2),2) as 'requested procedure' ,'' as 'previous procedure' ,(max(Eigenmasse) / 1000) as 'net mass' @@ -782,6 +782,219 @@ Public Class usrCntlCBAM SQL_DAKOSY &= SQLSTR + End Sub + + Sub getDY_Detail_SQL_DHF(EORI, ByRef SQL_DHF, ByRef SQL_GP) + + + 'Conee = Importeur + 'Conor = Exportuer + + SQL_GP = "SELECT CRN as 'declaration no' + ,cast(DecDT as date) as 'declaration date' + ,isnull((SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )),'') as 'importer identification number' + ,isnull((SELECT TIN FROM zsAnmConorTra WHERE (zsAnmConorTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConorTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConorTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConorTra.AnmID = zsAnmHea.AnmID )),'') as 'exporter identification number' + , zsAnmGdsitem.ComCd as 'commodity code' + ,Orig as 'origin country code' + ,Left(isnull(ProcCd, '00'),2) as 'requested procedure' + ,'' as 'previous procedure' + ,(Net / 1000) as 'net mass' + ,'TONNES' as 'type of measurement unit' + ,'' as 'invoice numbers' + ,'' as 'invoice date' + ,'' as 'member state auth' + ,'' as 'discharge bill waiver' + ,'' as 'authorisation' + ,'' as 'start time' + ,'' as 'end time' + ,'' as 'deadline' + ,'' as 'reporting declarant EORI number' + ,'' as 'type of representation' + ,isnull((SELECT Na FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )),'') as 'importer title' + ,'' as 'importer email' + ,'' as 'importer phone' + ,isnull((SELECT Ctry FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )),'') as 'importer country code or member state' + ,'' as 'importer subdivision' + ,isnull((SELECT Cty FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )),'') as 'importer city' + ,isnull((SELECT Strt FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )),'') as 'importer street' + ,'' as 'importer street additional' + ,'' as 'importer address number' + ,isnull((SELECT Pst FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )),'') as 'importer post code' + ,'' as 'importer po box' + ,'' as 'importer coordinate longitude (x)' + ,'' as 'importer coordinate latitude (y)' + ,isnull((SELECT Na FROM zsAnmConorTra WHERE (zsAnmConorTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConorTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConorTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConorTra.AnmID = zsAnmHea.AnmID )),'') as 'exporter title' + ,isnull((SELECT Ctry FROM zsAnmConorTra WHERE (zsAnmConorTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConorTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConorTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConorTra.AnmID = zsAnmHea.AnmID )),'') as 'exporter country code or member state' + ,isnull((SELECT Strt FROM zsAnmConorTra WHERE (zsAnmConorTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConorTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConorTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConorTra.AnmID = zsAnmHea.AnmID )),'') as 'exporter street' + ,'' as 'exporter street additional'" + + SQL_DHF = "select CRN Zollbelegnummer,cast(DecDT as date) Anmeldedatum,LRN,zsAnmGdsitem.ComCd Tarifnummer,Net Eigenmasse,ItVal Rechnungspreis + , Orig Ursprungsland + + , isnull((SELECT TIN FROM zsAnmConorTra WHERE (zsAnmConorTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConorTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConorTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConorTra.AnmID = zsAnmHea.AnmID )),'') EORI_Absender + , isnull((SELECT Na FROM zsAnmConorTra WHERE (zsAnmConorTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConorTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConorTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConorTra.AnmID = zsAnmHea.AnmID )),'') Absender + , isnull((SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )),'')EORI_Empfänger + , isnull((SELECT Na FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )),'')Empfänger" + + Dim SQLSTR = " from zsAnmRefs + inner join zsAnmDHFRefs on zsAnmRefs.LizenzNr=zsAnmDHFRefs.LizenzNr and zsAnmRefs.AnmID=zsAnmDHFRefs.AnmID and zsAnmRefs.VorgangID=zsAnmDHFRefs.VorgangID and zsAnmRefs.OperatorID=zsAnmDHFRefs.OperatorID + inner join zsAnmGdsitem on zsAnmRefs.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmRefs.AnmID=zsAnmGdsitem.AnmID and zsAnmRefs.VorgangID=zsAnmGdsitem.VorgangID and zsAnmRefs.OperatorID=zsAnmGdsitem.OperatorID + inner join zsAnmHea on zsAnmHea.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmHea.AnmID=zsAnmGdsitem.AnmID and zsAnmHea.VorgangID=zsAnmGdsitem.VorgangID and zsAnmHea.OperatorID=zsAnmGdsitem.OperatorID + inner join zsAnmDeclarant on zsAnmHea.LizenzNr=zsAnmDeclarant.LizenzNr and zsAnmHea.AnmID=zsAnmDeclarant.AnmID and zsAnmHea.VorgangID=zsAnmDeclarant.VorgangID and zsAnmHea.OperatorID=zsAnmDeclarant.OperatorID + inner join zsAnmTransp on zsAnmHea.LizenzNr=zsAnmTransp.LizenzNr and zsAnmHea.AnmID=zsAnmTransp.AnmID and zsAnmHea.VorgangID=zsAnmTransp.VorgangID and zsAnmHea.OperatorID=zsAnmTransp.OperatorID + where DecDT between '" & txtVon._value & "' and '" & txtBis._value & "' + and + ( + left(ComCd,4) IN (2523,2716,2808,2814,3102,3105,7201,7203,7318,7326,7601,7616) + OR left(ComCd,4) between 7301 and 7311 + OR left(ComCd,4) between 7205 and 7229 + OR left(ComCd,4) between 7603 and 7614 + OR ComCd like '25070080%' + OR ComCd like '283421%' + OR ComCd like '260112%' + OR ComCd like '720211%' + OR ComCd like '720219%' + OR ComCd like '720241%' + OR ComCd like '720249%' + OR ComCd like '720260%' + OR ComCd like '280410%' + ) + and ComCd not like '310560%' + and crn is not null + and zsAnmDHFRefs.ErledigungsTypID like 'F%'" + + If cbxVERAG.Checked Or cbxIMEX.Checked Or cbxUNISPED.Checked Then + SQLSTR &= " + and DecRep IN(3) + " + Else + SQLSTR &= " + and (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )) LIKE '" & EORI & "' + " + End If + + SQL_GP &= SQLSTR + SQL_GP &= " order by 'importer identification number'" + + SQL_DHF &= SQLSTR + SQL_DHF &= " order by Absender" + + + End Sub + + + Sub getDY_Detail_SQL_TT(EORI, ByRef SQL_TT, ByRef SQL_GP) + + 'Conee = Importeur + 'Conor = Exportuer + + SQL_GP = "SELECT telanm_CRN as 'declaration no' + ,cast(dec_CreateDate as Date) 'declaration date' + ,isnull(ConeeTra_TIN,'') as 'importer identification number' + ,isnull(ConorTra_TIN,'') as 'exporter identification number' + , Item_ComCd as 'commodity code' + , isnull(Item_orig,'') as 'origin country code' + ,Left(Item_ProcCd,2) as 'requested procedure' + ,'' as 'previous procedure' + ,(isnull(Item_net,0) / 1000) as 'net mass' + ,'TONNES' as 'type of measurement unit' + ,'' as 'invoice numbers' + ,'' as 'invoice date' + ,'' as 'member state auth' + ,'' as 'discharge bill waiver' + ,'' as 'authorisation' + ,'' as 'start time' + ,'' as 'end time' + ,'' as 'deadline' + ,isnull(Declarant_TIN,'') as 'reporting declarant EORI number' + ,isnull(Declarant_Na,'') as 'type of representation' + ,isnull(ConeeTra_Na,'') as 'importer title' + ,'' as 'importer email' + ,'' as 'importer phone' + ,isnull(ConeeTra_Ctry,'') as 'importer country code or member state' + ,'' as 'importer subdivision' + ,isnull(ConeeTra_Cty,'') as 'importer city' + ,isnull(ConeeTra_Strt,'') as 'importer street' + ,'' as 'importer street additional' + ,'' as 'importer address number' + ,isnull(ConeeTra_Pst,'') as 'importer post code' + ,'' as 'importer po box' + ,'' as 'importer coordinate longitude (x)' + ,'' as 'importer coordinate latitude (y)' + ,isnull(ConorTra_Na,'') as 'exporter title' + ,isnull(ConorTra_Ctry,'') as 'exporter country code or member state' + ,isnull(ConorTra_Strt,'') as 'exporter street' + ,'' as 'exporter street additional'" + + SQL_TT = "SELECT + telanm_CRN Registriernummer + ,Pos_ID PositionsNummer + ,dec_CreateDate Anmeldedatum + ,telanm_BezugsNr BezugsNr + ,Declarant_DecRep VertretungsVerhaeltnis + ,Item_ComCd Tarifnummer + ,dec_TotNet Eigenmasse + ,Locs_Disp VersendungsLand + , Locs_Dest Bestimmungsland + ,Item_ItVal Rechnungspreis + ,ValData_InvCurr Rechnungswaehrung + ,ConeeTra_TIN as Empfänger + ,ConeeTra_Na as Empfänger_ + ,ConorTra_TIN as Absender + ,ConorTra_Na as Absender_ " + + Dim SQLSTR = "FROM [VERAG].[dbo].[tblTelotec_Anmeldung] + inner join tblTelotec_Positionsdaten on telpos_telanmId=telanm_id + + where 1=1 + + and + ( + left(Item_ComCd,4) IN (2523,2716,2808,2814,3102,3105,7201,7203,7318,7326,7601,7616) + OR left(Item_ComCd,4) between 7301 and 7311 + OR left(Item_ComCd,4) between 7205 and 7229 + OR left(Item_ComCd,4) between 7603 and 7614 + OR Item_ComCd like '25070080%' + OR Item_ComCd like '283421%' + OR Item_ComCd like '260112%' + OR Item_ComCd like '720211%' + OR Item_ComCd like '720219%' + OR Item_ComCd like '720241%' + OR Item_ComCd like '720249%' + OR Item_ComCd like '720260%' + OR Item_ComCd like '280410%' + ) + and Item_ComCd not like '310560%' + + and telnam_aktuellsteNachricht=1 + + and telanm_ART ='EUA' + and dec_CreateDate between '" & txtVon._value & "' and '" & txtBis._value & "'" + + + + + + If cbxVERAG.Checked Or cbxIMEX.Checked Or cbxUNISPED.Checked Then + SQLSTR &= " + and Declarant_DecRep IN(1,3,5,7) + " + Else + SQLSTR &= " + and ConeeTra_TIN='" & EORI & "' /*and Declarant_DecRep NOT IN(1,3,5,7)*/ + " + End If + + + + + + SQL_GP &= SQLSTR + SQL_GP &= " order by ConorTra_TIN,telanm_CRN " + SQL_TT &= SQLSTR + SQL_TT &= " order by Absender,telanm_CRN " + + End Sub 'Private Sub btnCBAM_DS_DAKOSY_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY.Click @@ -1105,7 +1318,7 @@ Public Class usrCntlCBAM If cbxUNISPED.Checked Then SQLSTR_WHERE_FIRMEN &= IIf(SQLSTR_WHERE_FIRMEN <> "", ", ", "") & "'ATSPED'" '??? Dim SQL_DAKOSY = "" - getDY_Detail_SQL(SQLSTR_WHERE_FIRMEN, EORI, SQL_DAKOSY, "") '--> Aufbau SQL String + getDY_Detail_SQL_DK(SQLSTR_WHERE_FIRMEN, EORI, SQL_DAKOSY, "") '--> Aufbau SQL String Dim dt = SQL.loadDgvBySql(SQL_DAKOSY, "AVISO", 600) @@ -1319,6 +1532,12 @@ Public Class usrCntlCBAM End Sub Private Sub btnCBAM_DS_DHF_VERAG_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DHF_VERAG.Click, btnCBAM_DS_DHF_UNISPED.Click + + btnCBAM_DS_DHF_UNISPED_GP.Enabled = False + btnCBAM_DS_DHF_VERAG_GP.Enabled = False + btnCBAM_DS_DHF_UNISPED_GP.Tag = "" + btnCBAM_DS_DHF_VERAG_GP.Tag = "" + Dim EZOLL_SQL = "EZOLL" If sender Is btnCBAM_DS_DHF_VERAG Then btnCBAM_DS_DHF_VERAG_Detail.Enabled = False @@ -1340,56 +1559,17 @@ Public Class usrCntlCBAM If txtBis._value = "" Then MsgBox("Datum bis eingeben!") : Exit Sub Me.Cursor = Cursors.WaitCursor - Dim SQLSTR = " - select CRN Zollbelegnummer,cast(DecDT as date) Anmeldedatum,LRN,zsAnmGdsitem.ComCd Tarifnummer,Net Eigenmasse,ItVal Rechnungspreis - , Orig Ursprungsland - - , isnull((SELECT TIN FROM zsAnmConorTra WHERE (zsAnmConorTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConorTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConorTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConorTra.AnmID = zsAnmHea.AnmID )),'') EORI_Absender - , isnull((SELECT Na FROM zsAnmConorTra WHERE (zsAnmConorTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConorTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConorTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConorTra.AnmID = zsAnmHea.AnmID )),'') Absender - , isnull((SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )),'')EORI_Empfänger - , isnull((SELECT Na FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )),'')Empfänger - from zsAnmRefs - inner join zsAnmDHFRefs on zsAnmRefs.LizenzNr=zsAnmDHFRefs.LizenzNr and zsAnmRefs.AnmID=zsAnmDHFRefs.AnmID and zsAnmRefs.VorgangID=zsAnmDHFRefs.VorgangID and zsAnmRefs.OperatorID=zsAnmDHFRefs.OperatorID - inner join zsAnmGdsitem on zsAnmRefs.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmRefs.AnmID=zsAnmGdsitem.AnmID and zsAnmRefs.VorgangID=zsAnmGdsitem.VorgangID and zsAnmRefs.OperatorID=zsAnmGdsitem.OperatorID - inner join zsAnmHea on zsAnmHea.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmHea.AnmID=zsAnmGdsitem.AnmID and zsAnmHea.VorgangID=zsAnmGdsitem.VorgangID and zsAnmHea.OperatorID=zsAnmGdsitem.OperatorID - inner join zsAnmDeclarant on zsAnmHea.LizenzNr=zsAnmDeclarant.LizenzNr and zsAnmHea.AnmID=zsAnmDeclarant.AnmID and zsAnmHea.VorgangID=zsAnmDeclarant.VorgangID and zsAnmHea.OperatorID=zsAnmDeclarant.OperatorID - inner join zsAnmTransp on zsAnmHea.LizenzNr=zsAnmTransp.LizenzNr and zsAnmHea.AnmID=zsAnmTransp.AnmID and zsAnmHea.VorgangID=zsAnmTransp.VorgangID and zsAnmHea.OperatorID=zsAnmTransp.OperatorID - where DecDT between '" & txtVon._value & "' and '" & txtBis._value & "' - and - ( - left(ComCd,4) IN (2523,2716,2808,2814,3102,3105,7201,7203,7318,7326,7601,7616) - OR left(ComCd,4) between 7301 and 7311 - OR left(ComCd,4) between 7205 and 7229 - OR left(ComCd,4) between 7603 and 7614 - OR ComCd like '25070080%' - OR ComCd like '283421%' - OR ComCd like '260112%' - OR ComCd like '720211%' - OR ComCd like '720219%' - OR ComCd like '720241%' - OR ComCd like '720249%' - OR ComCd like '720260%' - OR ComCd like '280410%' - ) - and ComCd not like '310560%' - and crn is not null - and zsAnmDHFRefs.ErledigungsTypID like 'F%' - " - If cbxVERAG.Checked Or cbxIMEX.Checked Or cbxUNISPED.Checked Then - SQLSTR &= " - and DecRep IN(3) - " - Else - SQLSTR &= " - and (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )) LIKE '" & EORI & "' - " - End If + Dim SQL_DHF = "" + Dim SQL_GP = "" + getDY_Detail_SQL_DHF(EORI, SQL_DHF, SQL_GP) '--> Aufbau SQL String + + Dim dt = SQL.loadDgvBySql(SQL_DHF, EZOLL_SQL, 600) + + Dim dtGP = SQL.loadDgvBySql(SQL_GP, EZOLL_SQL, 600) - SQLSTR &= " order by Absender" - Dim dt = SQL.loadDgvBySql(SQLSTR, EZOLL_SQL, 600) If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value) If sender Is btnCBAM_DS_DHF_VERAG Then @@ -1407,6 +1587,52 @@ Public Class usrCntlCBAM End If + If dtGP IsNot Nothing AndAlso dt.Rows.Count > 0 Then + + 'If ReDaten.Rows.Count > 0 Then + ' dtGP.Columns("invoice date").ReadOnly = False + ' dtGP.Columns("invoice numbers").ReadOnly = False + ' dtGP.Columns("invoice date").MaxLength = -1 + ' dtGP.Columns("invoice numbers").MaxLength = -1 + 'End If + + 'For Each r As DataRow In dtGP.Rows + ' Dim MDN_NR As String = r("declaration no") + + ' ' Look for matching row in dt2 + ' Dim found() As DataRow = ReDaten.Select("Registriernummer_MRN = '" & MDN_NR & "'") + + + + ' If found.Length > 0 Then + + ' Dim rechnugnsdatum As String = found(0)("Positionsunterlagendatum") + ' If rechnugnsdatum <> "" Then rechnugnsdatum.Replace("00:00:00", "") + + ' r("invoice date") = rechnugnsdatum + ' r("invoice numbers") = found(0)("Positionsunterlagennummer") + ' Else + ' r("invoice date") = "-" + ' r("invoice numbers") = "-" + ' End If + + 'Next + If sender Is btnCBAM_DS_DHF_VERAG Then + btnCBAM_DS_DHF_VERAG_GP.Tag = "" + btnCBAM_DS_DHF_VERAG_GP.Tag = createExcelForGreenPulse(dtGP, EORI, "") + btnCBAM_DS_DHF_VERAG_GP.Enabled = True + End If + + If sender Is btnCBAM_DS_DHF_UNISPED Then + btnCBAM_DS_DHF_UNISPED_GP.Tag = "" + btnCBAM_DS_DHF_UNISPED_GP.Tag = createExcelForGreenPulse(dtGP, EORI, "") + btnCBAM_DS_DHF_UNISPED_GP.Enabled = True + End If + + + End If + + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -1544,7 +1770,8 @@ Public Class usrCntlCBAM Private Sub btnCBAM_DS_TELOTEC_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_TELOTEC.Click btnCBAM_DS_TELOTEC_Detail.Enabled = False btnCBAM_DS_TELOTEC_Copy.Enabled = False - btnCBAM_DS_TELOTEC_Detail.Tag = "" + btnCBAM_DS_TELOTEC_GP.Enabled = False + Try Dim EORI = txtEori.Text @@ -1554,72 +1781,15 @@ Public Class usrCntlCBAM If txtBis._value = "" Then MsgBox("Datum bis eingeben!") : Exit Sub Me.Cursor = Cursors.WaitCursor - Dim SQLSTR = " - SELECT - telanm_CRN Registriernummer - ,Pos_ID PositionsNummer - ,dec_CreateDate Anmeldedatum - ,telanm_BezugsNr BezugsNr - ,Declarant_DecRep VertretungsVerhaeltnis - ,Item_ComCd Tarifnummer - ,dec_TotNet Eigenmasse - ,Locs_Disp VersendungsLand - , Locs_Dest Bestimmungsland - ,Item_ItVal Rechnungspreis - ,ValData_InvCurr Rechnungswaehrung - ,ConeeTra_TIN as Empfänger - ,ConeeTra_Na as Empfänger_ - ,ConorTra_TIN as Absender - ,ConorTra_Na as Absender_ - - FROM [VERAG].[dbo].[tblTelotec_Anmeldung] - inner join tblTelotec_Positionsdaten on telpos_telanmId=telanm_id - where 1=1 - - and - ( - left(Item_ComCd,4) IN (2523,2716,2808,2814,3102,3105,7201,7203,7318,7326,7601,7616) - OR left(Item_ComCd,4) between 7301 and 7311 - OR left(Item_ComCd,4) between 7205 and 7229 - OR left(Item_ComCd,4) between 7603 and 7614 - OR Item_ComCd like '25070080%' - OR Item_ComCd like '283421%' - OR Item_ComCd like '260112%' - OR Item_ComCd like '720211%' - OR Item_ComCd like '720219%' - OR Item_ComCd like '720241%' - OR Item_ComCd like '720249%' - OR Item_ComCd like '720260%' - OR Item_ComCd like '280410%' - ) - and Item_ComCd not like '310560%' + Dim SQL_TT = "" + Dim SQL_GP = "" + getDY_Detail_SQL_TT(EORI, SQL_TT, SQL_GP) '--> Aufbau SQL String - and telnam_aktuellsteNachricht=1 + Dim dt = SQL.loadDgvBySql(SQL_TT, "FMZOLL", 600) - and telanm_ART ='EUA' - and dec_CreateDate between '" & txtVon._value & "' and '" & txtBis._value & "' - - - - - " + Dim dtGP = SQL.loadDgvBySql(SQL_GP, "FMZOLL", 600) - - If cbxVERAG.Checked Or cbxIMEX.Checked Or cbxUNISPED.Checked Then - SQLSTR &= " - and Declarant_DecRep IN(1,3,5,7) - " - Else - SQLSTR &= " - and ConeeTra_TIN='" & EORI & "' /*and Declarant_DecRep NOT IN(1,3,5,7)*/ - " - End If - - SQLSTR &= " order by Absender,telanm_CRN " - - - Dim dt = SQL.loadDgvBySql(SQLSTR, "FMZOLL", 600) If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value,, False) btnCBAM_DS_TELOTEC_Detail.Tag = path @@ -1630,6 +1800,15 @@ Public Class usrCntlCBAM End If + If dtGP IsNot Nothing AndAlso dt.Rows.Count > 0 Then + Me.Cursor = Cursors.WaitCursor + btnCBAM_DS_TELOTEC_GP.Tag = "" + btnCBAM_DS_TELOTEC_GP.Tag = createExcelForGreenPulse(dtGP, EORI, "") + btnCBAM_DS_TELOTEC_GP.Enabled = True + Me.Cursor = Cursors.Default + End If + + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index d162ec93..1ce5d686 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -23,34 +23,34 @@ Partial Class usrcntlKundeBearbeitenFull Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle43 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle44 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle45 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle46 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle47 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle48 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle49 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle50 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle51 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle52 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle53 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle54 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle55 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle56 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.tbcntrDetails = New System.Windows.Forms.TabControl() Me.tbAbfertigung = New System.Windows.Forms.TabPage() Me.cbxVerzolltBeiExport = New System.Windows.Forms.CheckBox() @@ -61,9 +61,11 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFremdspedition = New System.Windows.Forms.ComboBox() Me.cbxVerzolltBei = New System.Windows.Forms.CheckBox() Me.cbxBesonderheitenNEU = New System.Windows.Forms.CheckBox() + Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() Me.tbcntrAbf = New System.Windows.Forms.TabControl() Me.TabPage4 = New System.Windows.Forms.TabPage() Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel() + Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() Me.rtbLKWFreigabeSenden = New System.Windows.Forms.RichTextBox() Me.Label18 = New System.Windows.Forms.Label() Me.TabPage3 = New System.Windows.Forms.TabPage() @@ -77,6 +79,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboAbfVerb_Abfertigungsverbot = New System.Windows.Forms.CheckBox() Me.txtAbfVerb_AbfertigungsverbotSeit = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbAufschub = New System.Windows.Forms.TabPage() + Me.usrCntlAufschubkonten = New SDL.usrCntlAufschubkonten() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.Label78 = New System.Windows.Forms.Label() Me.cbxAbf_ZollVM = New System.Windows.Forms.CheckBox() @@ -101,6 +104,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.rtbAbf_Besonderheiten = New System.Windows.Forms.RichTextBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.tbFiskal = New System.Windows.Forms.TabPage() + Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten() Me.tbVerrechnung = New System.Windows.Forms.TabPage() Me.Panel2 = New System.Windows.Forms.Panel() Me.Label115 = New System.Windows.Forms.Label() @@ -271,11 +275,19 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtUSt_GVAusgestelltAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtUSt_GVAngefordertAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbSonstiges = New System.Windows.Forms.TabPage() + Me.txtSonst_weitereKdNrWOELFL = New System.Windows.Forms.TextBox() + Me.lblIDS_Rabatte = New System.Windows.Forms.Label() + Me.PictureBox7 = New System.Windows.Forms.PictureBox() + Me.cbx_IDS_inaktiveeinblenden = New System.Windows.Forms.CheckBox() + Me.TabControl1 = New System.Windows.Forms.TabControl() + Me.Standard = New System.Windows.Forms.TabPage() + Me.dgvIDS_Standard = New System.Windows.Forms.DataGridView() + Me.Kunden = New System.Windows.Forms.TabPage() + Me.dgvIDS_Rabatte = New System.Windows.Forms.DataGridView() Me.cbxCSInsolvent = New System.Windows.Forms.CheckBox() Me.cbxCS_Added = New System.Windows.Forms.CheckBox() Me.Label113 = New System.Windows.Forms.Label() Me.Label112 = New System.Windows.Forms.Label() - Me.dgvIDS_Rabatte = New System.Windows.Forms.DataGridView() Me.txtSumVerag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtSonst_KdNrVerag = New System.Windows.Forms.TextBox() Me.Label110 = New System.Windows.Forms.Label() @@ -387,6 +399,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbKontakt = New System.Windows.Forms.TabControl() Me.TabPage10 = New System.Windows.Forms.TabPage() Me.TabPage11 = New System.Windows.Forms.TabPage() + Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() Me.Label50 = New System.Windows.Forms.Label() Me.Label68 = New System.Windows.Forms.Label() Me.pnlNeukunde = New System.Windows.Forms.Panel() @@ -412,18 +425,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.TabControl1 = New System.Windows.Forms.TabControl() - Me.Standard = New System.Windows.Forms.TabPage() - Me.Kunden = New System.Windows.Forms.TabPage() - Me.dgvIDS_Standard = New System.Windows.Forms.DataGridView() - Me.cbx_IDS_inaktiveeinblenden = New System.Windows.Forms.CheckBox() - Me.PictureBox7 = New System.Windows.Forms.PictureBox() - Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() - Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() - Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() - Me.usrCntlAufschubkonten = New SDL.usrCntlAufschubkonten() - Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten() - Me.lblIDS_Rabatte = New System.Windows.Forms.Label() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -450,6 +451,11 @@ Partial Class usrcntlKundeBearbeitenFull CType(Me.dgvMWST, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvUstv_LaenderUndSteuernummern, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbSonstiges.SuspendLayout() + CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() + Me.TabControl1.SuspendLayout() + Me.Standard.SuspendLayout() + CType(Me.dgvIDS_Standard, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Kunden.SuspendLayout() CType(Me.dgvIDS_Rabatte, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvSonst_IDSKunden, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbSchnittstellen.SuspendLayout() @@ -465,11 +471,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage11.SuspendLayout() Me.pnlNeukunde.SuspendLayout() Me.cnsBankverbindungen.SuspendLayout() - Me.TabControl1.SuspendLayout() - Me.Standard.SuspendLayout() - Me.Kunden.SuspendLayout() - CType(Me.dgvIDS_Standard, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'tbcntrDetails @@ -615,6 +616,16 @@ Partial Class usrcntlKundeBearbeitenFull Me.cbxBesonderheitenNEU.Text = "Besonderheiten NEU" Me.cbxBesonderheitenNEU.UseVisualStyleBackColor = True ' + 'UsrCntlKundenBesonderheiten1 + ' + Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(6, 25) + Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1" + Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52) + Me.UsrCntlKundenBesonderheiten1.TabIndex = 235 + Me.UsrCntlKundenBesonderheiten1.Visible = False + ' 'tbcntrAbf ' Me.tbcntrAbf.Controls.Add(Me.TabPage4) @@ -649,6 +660,15 @@ Partial Class usrcntlKundeBearbeitenFull Me.FlowLayoutPanel1.Size = New System.Drawing.Size(200, 100) Me.FlowLayoutPanel1.TabIndex = 7 ' + 'UsrCntlKundenAvisoMailBenachrichtigung1 + ' + Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True + Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(0, 6) + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(479, 172) + Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 6 + ' 'rtbLKWFreigabeSenden ' Me.rtbLKWFreigabeSenden.Location = New System.Drawing.Point(485, 33) @@ -817,6 +837,14 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbAufschub.Text = "Aufschubkonten" Me.tbAufschub.UseVisualStyleBackColor = True ' + 'usrCntlAufschubkonten + ' + Me.usrCntlAufschubkonten.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrCntlAufschubkonten.Location = New System.Drawing.Point(3, 3) + Me.usrCntlAufschubkonten.Name = "usrCntlAufschubkonten" + Me.usrCntlAufschubkonten.Size = New System.Drawing.Size(652, 172) + Me.usrCntlAufschubkonten.TabIndex = 0 + ' 'TabPage1 ' Me.TabPage1.Controls.Add(Me.Label78) @@ -1122,6 +1150,15 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbFiskal.Text = "Fiskal" Me.tbFiskal.UseVisualStyleBackColor = True ' + 'UsrCntlKundeFiskaldaten1 + ' + Me.UsrCntlKundeFiskaldaten1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundeFiskaldaten1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlKundeFiskaldaten1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlKundeFiskaldaten1.Name = "UsrCntlKundeFiskaldaten1" + Me.UsrCntlKundeFiskaldaten1.Size = New System.Drawing.Size(672, 495) + Me.UsrCntlKundeFiskaldaten1.TabIndex = 0 + ' 'tbVerrechnung ' Me.tbVerrechnung.Controls.Add(Me.Panel2) @@ -3197,8 +3234,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvUmsatzbericht.AllowUserToDeleteRows = False Me.dgvUmsatzbericht.AllowUserToOrderColumns = True Me.dgvUmsatzbericht.AllowUserToResizeRows = False - DataGridViewCellStyle38.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle38 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25) @@ -3297,8 +3334,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvOffenePosten.AllowUserToDeleteRows = False Me.dgvOffenePosten.AllowUserToOrderColumns = True Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle39.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle39 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38) @@ -3473,40 +3510,40 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvKreditkarten.AllowUserToDeleteRows = False Me.dgvKreditkarten.AllowUserToOrderColumns = True Me.dgvKreditkarten.AllowUserToResizeRows = False - DataGridViewCellStyle40.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle40 + DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle41.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle41 + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle42.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle42.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle42.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle42.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle42 + DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5 Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20) Me.dgvKreditkarten.MultiSelect = False Me.dgvKreditkarten.Name = "dgvKreditkarten" - DataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle43 + DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 Me.dgvKreditkarten.RowHeadersVisible = False - DataGridViewCellStyle44.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle44 + DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle7 Me.dgvKreditkarten.RowTemplate.DefaultCellStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.dgvKreditkarten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvKreditkarten.Size = New System.Drawing.Size(642, 312) @@ -3586,26 +3623,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvMWST ' - DataGridViewCellStyle45.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle45 + DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 Me.dgvMWST.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle46.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle46.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle46.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle46.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle46 + DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9 Me.dgvMWST.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle47.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle47.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle47.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle47.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle47.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle47 + DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle10 Me.dgvMWST.Location = New System.Drawing.Point(9, 359) Me.dgvMWST.Name = "dgvMWST" Me.dgvMWST.Size = New System.Drawing.Size(171, 125) @@ -3690,26 +3727,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvUstv_LaenderUndSteuernummern ' - DataGridViewCellStyle48.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle48 + DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle49.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle49.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle49.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle49.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle49.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle49.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle49 + DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle50.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle50.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle50.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle50.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle50.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle50.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle50 + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle13 Me.dgvUstv_LaenderUndSteuernummern.Location = New System.Drawing.Point(9, 94) Me.dgvUstv_LaenderUndSteuernummern.Name = "dgvUstv_LaenderUndSteuernummern" Me.dgvUstv_LaenderUndSteuernummern.Size = New System.Drawing.Size(657, 259) @@ -3845,6 +3882,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'tbSonstiges ' + Me.tbSonstiges.Controls.Add(Me.txtSonst_weitereKdNrWOELFL) Me.tbSonstiges.Controls.Add(Me.lblIDS_Rabatte) Me.tbSonstiges.Controls.Add(Me.PictureBox7) Me.tbSonstiges.Controls.Add(Me.cbx_IDS_inaktiveeinblenden) @@ -3894,6 +3932,139 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbSonstiges.Text = "Sonstiges" Me.tbSonstiges.UseVisualStyleBackColor = True ' + 'txtSonst_weitereKdNrWOELFL + ' + Me.txtSonst_weitereKdNrWOELFL.Location = New System.Drawing.Point(179, 53) + Me.txtSonst_weitereKdNrWOELFL.Name = "txtSonst_weitereKdNrWOELFL" + Me.txtSonst_weitereKdNrWOELFL.Size = New System.Drawing.Size(50, 20) + Me.txtSonst_weitereKdNrWOELFL.TabIndex = 148 + ' + 'lblIDS_Rabatte + ' + Me.lblIDS_Rabatte.AutoSize = True + Me.lblIDS_Rabatte.Enabled = False + Me.lblIDS_Rabatte.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblIDS_Rabatte.Location = New System.Drawing.Point(10, 273) + Me.lblIDS_Rabatte.Name = "lblIDS_Rabatte" + Me.lblIDS_Rabatte.Size = New System.Drawing.Size(100, 13) + Me.lblIDS_Rabatte.TabIndex = 147 + Me.lblIDS_Rabatte.Text = "IDS-Rabatte/Preise" + Me.lblIDS_Rabatte.Visible = False + ' + 'PictureBox7 + ' + Me.PictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.PictureBox7.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.PictureBox7.Location = New System.Drawing.Point(645, 273) + Me.PictureBox7.Name = "PictureBox7" + Me.PictureBox7.Size = New System.Drawing.Size(20, 20) + Me.PictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.PictureBox7.TabIndex = 146 + Me.PictureBox7.TabStop = False + ' + 'cbx_IDS_inaktiveeinblenden + ' + Me.cbx_IDS_inaktiveeinblenden.AutoSize = True + Me.cbx_IDS_inaktiveeinblenden.Location = New System.Drawing.Point(9, 194) + Me.cbx_IDS_inaktiveeinblenden.Name = "cbx_IDS_inaktiveeinblenden" + Me.cbx_IDS_inaktiveeinblenden.Size = New System.Drawing.Size(15, 14) + Me.cbx_IDS_inaktiveeinblenden.TabIndex = 41 + Me.cbx_IDS_inaktiveeinblenden.UseVisualStyleBackColor = True + ' + 'TabControl1 + ' + Me.TabControl1.Controls.Add(Me.Standard) + Me.TabControl1.Controls.Add(Me.Kunden) + Me.TabControl1.Location = New System.Drawing.Point(6, 288) + Me.TabControl1.Name = "TabControl1" + Me.TabControl1.SelectedIndex = 0 + Me.TabControl1.Size = New System.Drawing.Size(659, 201) + Me.TabControl1.TabIndex = 40 + ' + 'Standard + ' + Me.Standard.Controls.Add(Me.dgvIDS_Standard) + Me.Standard.Location = New System.Drawing.Point(4, 22) + Me.Standard.Name = "Standard" + Me.Standard.Padding = New System.Windows.Forms.Padding(3) + Me.Standard.Size = New System.Drawing.Size(651, 175) + Me.Standard.TabIndex = 0 + Me.Standard.Text = "Standardpreise" + Me.Standard.UseVisualStyleBackColor = True + ' + 'dgvIDS_Standard + ' + Me.dgvIDS_Standard.AllowUserToAddRows = False + Me.dgvIDS_Standard.AllowUserToDeleteRows = False + Me.dgvIDS_Standard.AllowUserToResizeRows = False + DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvIDS_Standard.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 + Me.dgvIDS_Standard.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvIDS_Standard.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 + Me.dgvIDS_Standard.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvIDS_Standard.DefaultCellStyle = DataGridViewCellStyle16 + Me.dgvIDS_Standard.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvIDS_Standard.Location = New System.Drawing.Point(3, 3) + Me.dgvIDS_Standard.Name = "dgvIDS_Standard" + Me.dgvIDS_Standard.Size = New System.Drawing.Size(645, 169) + Me.dgvIDS_Standard.TabIndex = 35 + ' + 'Kunden + ' + Me.Kunden.Controls.Add(Me.dgvIDS_Rabatte) + Me.Kunden.Location = New System.Drawing.Point(4, 22) + Me.Kunden.Name = "Kunden" + Me.Kunden.Padding = New System.Windows.Forms.Padding(3) + Me.Kunden.Size = New System.Drawing.Size(651, 175) + Me.Kunden.TabIndex = 1 + Me.Kunden.Text = "Kundenpreise" + Me.Kunden.UseVisualStyleBackColor = True + ' + 'dgvIDS_Rabatte + ' + Me.dgvIDS_Rabatte.AllowUserToAddRows = False + Me.dgvIDS_Rabatte.AllowUserToDeleteRows = False + Me.dgvIDS_Rabatte.AllowUserToResizeRows = False + DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 + Me.dgvIDS_Rabatte.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18 + Me.dgvIDS_Rabatte.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle19 + Me.dgvIDS_Rabatte.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvIDS_Rabatte.Location = New System.Drawing.Point(3, 3) + Me.dgvIDS_Rabatte.Name = "dgvIDS_Rabatte" + Me.dgvIDS_Rabatte.Size = New System.Drawing.Size(645, 169) + Me.dgvIDS_Rabatte.TabIndex = 34 + ' 'cbxCSInsolvent ' Me.cbxCSInsolvent.AutoSize = True @@ -3935,37 +4106,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label112.TabIndex = 35 Me.Label112.Text = "CSV-Daten bereitstellen" ' - 'dgvIDS_Rabatte - ' - Me.dgvIDS_Rabatte.AllowUserToAddRows = False - Me.dgvIDS_Rabatte.AllowUserToDeleteRows = False - Me.dgvIDS_Rabatte.AllowUserToResizeRows = False - DataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle32 - Me.dgvIDS_Rabatte.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle33 - Me.dgvIDS_Rabatte.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle34 - Me.dgvIDS_Rabatte.Dock = System.Windows.Forms.DockStyle.Fill - Me.dgvIDS_Rabatte.Location = New System.Drawing.Point(3, 3) - Me.dgvIDS_Rabatte.Name = "dgvIDS_Rabatte" - Me.dgvIDS_Rabatte.Size = New System.Drawing.Size(645, 169) - Me.dgvIDS_Rabatte.TabIndex = 34 - ' 'txtSumVerag ' Me.txtSumVerag._DateTimeOnly = False @@ -3981,7 +4121,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtSumVerag._Waehrung = False Me.txtSumVerag._WaehrungZeichen = True Me.txtSumVerag.ForeColor = System.Drawing.Color.Black - Me.txtSumVerag.Location = New System.Drawing.Point(258, 163) + Me.txtSumVerag.Location = New System.Drawing.Point(246, 160) Me.txtSumVerag.MaxLineLength = -1 Me.txtSumVerag.MaxLines_Warning = "" Me.txtSumVerag.MaxLines_Warning_Label = Nothing @@ -3994,7 +4134,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtSonst_KdNrVerag.Location = New System.Drawing.Point(123, 164) Me.txtSonst_KdNrVerag.MaxLength = 20 Me.txtSonst_KdNrVerag.Name = "txtSonst_KdNrVerag" - Me.txtSonst_KdNrVerag.Size = New System.Drawing.Size(122, 20) + Me.txtSonst_KdNrVerag.Size = New System.Drawing.Size(106, 20) Me.txtSonst_KdNrVerag.TabIndex = 31 ' 'Label110 @@ -4012,7 +4152,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label109.AutoSize = True Me.Label109.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label109.Location = New System.Drawing.Point(262, 9) + Me.Label109.Location = New System.Drawing.Point(250, 6) Me.Label109.Name = "Label109" Me.Label109.Size = New System.Drawing.Size(94, 13) Me.Label109.TabIndex = 25 @@ -4061,7 +4201,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtSonst_KdNrPLOSE.Enabled = False Me.txtSonst_KdNrPLOSE.Location = New System.Drawing.Point(123, 134) Me.txtSonst_KdNrPLOSE.Name = "txtSonst_KdNrPLOSE" - Me.txtSonst_KdNrPLOSE.Size = New System.Drawing.Size(122, 20) + Me.txtSonst_KdNrPLOSE.Size = New System.Drawing.Size(106, 20) Me.txtSonst_KdNrPLOSE.TabIndex = 20 ' 'Label83 @@ -4090,26 +4230,26 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvSonst_IDSKunden.AllowUserToAddRows = False Me.dgvSonst_IDSKunden.AllowUserToDeleteRows = False Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False - DataGridViewCellStyle35.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle35 + DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20 Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle36 + DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle21 Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle37 + DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle22 Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 214) Me.dgvSonst_IDSKunden.MultiSelect = False Me.dgvSonst_IDSKunden.Name = "dgvSonst_IDSKunden" @@ -4160,7 +4300,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.txtSonst_KdNrUTA.Location = New System.Drawing.Point(123, 108) Me.txtSonst_KdNrUTA.Name = "txtSonst_KdNrUTA" - Me.txtSonst_KdNrUTA.Size = New System.Drawing.Size(122, 20) + Me.txtSonst_KdNrUTA.Size = New System.Drawing.Size(106, 20) Me.txtSonst_KdNrUTA.TabIndex = 13 ' 'Label75 @@ -4194,7 +4334,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.txtSonst_KdNrMSE.Location = New System.Drawing.Point(123, 79) Me.txtSonst_KdNrMSE.Name = "txtSonst_KdNrMSE" - Me.txtSonst_KdNrMSE.Size = New System.Drawing.Size(122, 20) + Me.txtSonst_KdNrMSE.Size = New System.Drawing.Size(106, 20) Me.txtSonst_KdNrMSE.TabIndex = 8 ' 'Label73 @@ -4211,7 +4351,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.txtSonst_KdNrWOELFL.Location = New System.Drawing.Point(123, 53) Me.txtSonst_KdNrWOELFL.Name = "txtSonst_KdNrWOELFL" - Me.txtSonst_KdNrWOELFL.Size = New System.Drawing.Size(122, 20) + Me.txtSonst_KdNrWOELFL.Size = New System.Drawing.Size(50, 20) Me.txtSonst_KdNrWOELFL.TabIndex = 6 ' 'Label72 @@ -4270,7 +4410,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtSumPLOSE._Waehrung = False Me.txtSumPLOSE._WaehrungZeichen = True Me.txtSumPLOSE.ForeColor = System.Drawing.Color.Black - Me.txtSumPLOSE.Location = New System.Drawing.Point(258, 134) + Me.txtSumPLOSE.Location = New System.Drawing.Point(246, 131) Me.txtSumPLOSE.MaxLineLength = -1 Me.txtSumPLOSE.MaxLines_Warning = "" Me.txtSumPLOSE.MaxLines_Warning_Label = Nothing @@ -4293,7 +4433,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtSumUTA._Waehrung = False Me.txtSumUTA._WaehrungZeichen = True Me.txtSumUTA.ForeColor = System.Drawing.Color.Black - Me.txtSumUTA.Location = New System.Drawing.Point(258, 111) + Me.txtSumUTA.Location = New System.Drawing.Point(246, 108) Me.txtSumUTA.MaxLineLength = -1 Me.txtSumUTA.MaxLines_Warning = "" Me.txtSumUTA.MaxLines_Warning_Label = Nothing @@ -4316,7 +4456,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtSumMSE._Waehrung = False Me.txtSumMSE._WaehrungZeichen = True Me.txtSumMSE.ForeColor = System.Drawing.Color.Black - Me.txtSumMSE.Location = New System.Drawing.Point(258, 79) + Me.txtSumMSE.Location = New System.Drawing.Point(246, 76) Me.txtSumMSE.MaxLineLength = -1 Me.txtSumMSE.MaxLines_Warning = "" Me.txtSumMSE.MaxLines_Warning_Label = Nothing @@ -4339,7 +4479,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtSumIDS._Waehrung = False Me.txtSumIDS._WaehrungZeichen = True Me.txtSumIDS.ForeColor = System.Drawing.Color.Black - Me.txtSumIDS.Location = New System.Drawing.Point(256, 31) + Me.txtSumIDS.Location = New System.Drawing.Point(244, 28) Me.txtSumIDS.MaxLineLength = -1 Me.txtSumIDS.MaxLines_Warning = "" Me.txtSumIDS.MaxLines_Warning_Label = Nothing @@ -4371,7 +4511,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboSonst_Rechnungsdruck.FormattingEnabled = True Me.cboSonst_Rechnungsdruck.Location = New System.Drawing.Point(119, 6) Me.cboSonst_Rechnungsdruck.Name = "cboSonst_Rechnungsdruck" - Me.cboSonst_Rechnungsdruck.Size = New System.Drawing.Size(122, 21) + Me.cboSonst_Rechnungsdruck.Size = New System.Drawing.Size(110, 21) Me.cboSonst_Rechnungsdruck.TabIndex = 1 ' 'tbSchnittstellen @@ -4420,26 +4560,26 @@ Partial Class usrcntlKundeBearbeitenFull 'DataGridView1 ' Me.DataGridView1.AllowUserToResizeRows = False - DataGridViewCellStyle51.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle51 + DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23 Me.DataGridView1.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle52.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle52.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle52.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle52.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle52.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle52.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle52.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle52 + DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle24 Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle53.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle53.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle53.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle53.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle53.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle53.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle53.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle53 + DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle25 Me.DataGridView1.Enabled = False Me.DataGridView1.Location = New System.Drawing.Point(6, 111) Me.DataGridView1.MultiSelect = False @@ -4506,26 +4646,26 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.dgvBankverbindungen.AllowUserToDeleteRows = False Me.dgvBankverbindungen.AllowUserToResizeRows = False - DataGridViewCellStyle54.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle54 + DataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26 Me.dgvBankverbindungen.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle55.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle55.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle55.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle55.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle55.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle55.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle55.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle55 + DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27 Me.dgvBankverbindungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle56.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle56.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle56.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle56.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle56.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle56.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle56.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle56 + DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle28 Me.dgvBankverbindungen.Location = New System.Drawing.Point(3, 40) Me.dgvBankverbindungen.MultiSelect = False Me.dgvBankverbindungen.Name = "dgvBankverbindungen" @@ -5366,6 +5506,14 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage11.Text = "Spezifisch" Me.TabPage11.UseVisualStyleBackColor = True ' + 'ucKundenKontakte + ' + Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill + Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3) + Me.ucKundenKontakte.Name = "ucKundenKontakte" + Me.ucKundenKontakte.Size = New System.Drawing.Size(439, 169) + Me.ucKundenKontakte.TabIndex = 0 + ' 'Label50 ' Me.Label50.AutoSize = True @@ -5646,145 +5794,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' - 'TabControl1 - ' - Me.TabControl1.Controls.Add(Me.Standard) - Me.TabControl1.Controls.Add(Me.Kunden) - Me.TabControl1.Location = New System.Drawing.Point(6, 288) - Me.TabControl1.Name = "TabControl1" - Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(659, 201) - Me.TabControl1.TabIndex = 40 - ' - 'Standard - ' - Me.Standard.Controls.Add(Me.dgvIDS_Standard) - Me.Standard.Location = New System.Drawing.Point(4, 22) - Me.Standard.Name = "Standard" - Me.Standard.Padding = New System.Windows.Forms.Padding(3) - Me.Standard.Size = New System.Drawing.Size(651, 175) - Me.Standard.TabIndex = 0 - Me.Standard.Text = "Standardpreise" - Me.Standard.UseVisualStyleBackColor = True - ' - 'Kunden - ' - Me.Kunden.Controls.Add(Me.dgvIDS_Rabatte) - Me.Kunden.Location = New System.Drawing.Point(4, 22) - Me.Kunden.Name = "Kunden" - Me.Kunden.Padding = New System.Windows.Forms.Padding(3) - Me.Kunden.Size = New System.Drawing.Size(651, 175) - Me.Kunden.TabIndex = 1 - Me.Kunden.Text = "Kundenpreise" - Me.Kunden.UseVisualStyleBackColor = True - ' - 'dgvIDS_Standard - ' - Me.dgvIDS_Standard.AllowUserToAddRows = False - Me.dgvIDS_Standard.AllowUserToDeleteRows = False - Me.dgvIDS_Standard.AllowUserToResizeRows = False - DataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvIDS_Standard.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle29 - Me.dgvIDS_Standard.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvIDS_Standard.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle30 - Me.dgvIDS_Standard.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle31.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvIDS_Standard.DefaultCellStyle = DataGridViewCellStyle31 - Me.dgvIDS_Standard.Dock = System.Windows.Forms.DockStyle.Fill - Me.dgvIDS_Standard.Location = New System.Drawing.Point(3, 3) - Me.dgvIDS_Standard.Name = "dgvIDS_Standard" - Me.dgvIDS_Standard.Size = New System.Drawing.Size(645, 169) - Me.dgvIDS_Standard.TabIndex = 35 - ' - 'cbx_IDS_inaktiveeinblenden - ' - Me.cbx_IDS_inaktiveeinblenden.AutoSize = True - Me.cbx_IDS_inaktiveeinblenden.Location = New System.Drawing.Point(9, 194) - Me.cbx_IDS_inaktiveeinblenden.Name = "cbx_IDS_inaktiveeinblenden" - Me.cbx_IDS_inaktiveeinblenden.Size = New System.Drawing.Size(15, 14) - Me.cbx_IDS_inaktiveeinblenden.TabIndex = 41 - Me.cbx_IDS_inaktiveeinblenden.UseVisualStyleBackColor = True - ' - 'PictureBox7 - ' - Me.PictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.PictureBox7.Image = Global.SDL.My.Resources.Resources.Excel_logo - Me.PictureBox7.Location = New System.Drawing.Point(645, 273) - Me.PictureBox7.Name = "PictureBox7" - Me.PictureBox7.Size = New System.Drawing.Size(20, 20) - Me.PictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.PictureBox7.TabIndex = 146 - Me.PictureBox7.TabStop = False - ' - 'ucKundenKontakte - ' - Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill - Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3) - Me.ucKundenKontakte.Name = "ucKundenKontakte" - Me.ucKundenKontakte.Size = New System.Drawing.Size(439, 169) - Me.ucKundenKontakte.TabIndex = 0 - ' - 'UsrCntlKundenBesonderheiten1 - ' - Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(6, 25) - Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1" - Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52) - Me.UsrCntlKundenBesonderheiten1.TabIndex = 235 - Me.UsrCntlKundenBesonderheiten1.Visible = False - ' - 'UsrCntlKundenAvisoMailBenachrichtigung1 - ' - Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True - Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(0, 6) - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(479, 172) - Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 6 - ' - 'usrCntlAufschubkonten - ' - Me.usrCntlAufschubkonten.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrCntlAufschubkonten.Location = New System.Drawing.Point(3, 3) - Me.usrCntlAufschubkonten.Name = "usrCntlAufschubkonten" - Me.usrCntlAufschubkonten.Size = New System.Drawing.Size(652, 172) - Me.usrCntlAufschubkonten.TabIndex = 0 - ' - 'UsrCntlKundeFiskaldaten1 - ' - Me.UsrCntlKundeFiskaldaten1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundeFiskaldaten1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlKundeFiskaldaten1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlKundeFiskaldaten1.Name = "UsrCntlKundeFiskaldaten1" - Me.UsrCntlKundeFiskaldaten1.Size = New System.Drawing.Size(672, 495) - Me.UsrCntlKundeFiskaldaten1.TabIndex = 0 - ' - 'lblIDS_Rabatte - ' - Me.lblIDS_Rabatte.AutoSize = True - Me.lblIDS_Rabatte.Enabled = False - Me.lblIDS_Rabatte.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblIDS_Rabatte.Location = New System.Drawing.Point(10, 273) - Me.lblIDS_Rabatte.Name = "lblIDS_Rabatte" - Me.lblIDS_Rabatte.Size = New System.Drawing.Size(100, 13) - Me.lblIDS_Rabatte.TabIndex = 147 - Me.lblIDS_Rabatte.Text = "IDS-Rabatte/Preise" - Me.lblIDS_Rabatte.Visible = False - ' 'usrcntlKundeBearbeitenFull ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -5862,6 +5871,11 @@ Partial Class usrcntlKundeBearbeitenFull CType(Me.dgvUstv_LaenderUndSteuernummern, System.ComponentModel.ISupportInitialize).EndInit() Me.tbSonstiges.ResumeLayout(False) Me.tbSonstiges.PerformLayout() + CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() + Me.TabControl1.ResumeLayout(False) + Me.Standard.ResumeLayout(False) + CType(Me.dgvIDS_Standard, System.ComponentModel.ISupportInitialize).EndInit() + Me.Kunden.ResumeLayout(False) CType(Me.dgvIDS_Rabatte, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvSonst_IDSKunden, System.ComponentModel.ISupportInitialize).EndInit() Me.tbSchnittstellen.ResumeLayout(False) @@ -5884,11 +5898,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.pnlNeukunde.ResumeLayout(False) Me.pnlNeukunde.PerformLayout() Me.cnsBankverbindungen.ResumeLayout(False) - Me.TabControl1.ResumeLayout(False) - Me.Standard.ResumeLayout(False) - Me.Kunden.ResumeLayout(False) - CType(Me.dgvIDS_Standard, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -6266,4 +6275,5 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents cbx_IDS_inaktiveeinblenden As CheckBox Friend WithEvents PictureBox7 As PictureBox Friend WithEvents lblIDS_Rabatte As Label + Friend WithEvents txtSonst_weitereKdNrWOELFL As TextBox End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index b78addd4..879624b7 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -367,6 +367,7 @@ Public Class usrcntlKundeBearbeitenFull cboSonst_Rechnungsdruck._value = loadValue(ADRESSE.Rechnungsdruck, "") txtSonst_KdNrIDS.Text = loadValue(ADRESSE.IDSKundenNr, "") txtSonst_KdNrWOELFL.Text = loadValue(ADRESSE.WölflKundenNr, "") + txtSonst_weitereKdNrWOELFL.Text = loadValue(ADRESSE.weitereWölflKundenNr, "") txtSonst_KdNrMSE.Text = loadValue(ADRESSE.MSEKundenNr, "") txtSonst_KdNrTelepass.Text = loadValue(ADRESSE.TELEPASS_Kd_Nr, "") txtSonst_KdNrPLOSE.Text = loadValue(ADRESSE.PLOSEKundenNr, "") @@ -813,6 +814,7 @@ Public Class usrcntlKundeBearbeitenFull ADRESSE.Rechnungsdruck = isLeerNothing(cboSonst_Rechnungsdruck._value) ADRESSE.IDSKundenNr = isLeerNothing(txtSonst_KdNrIDS.Text) ADRESSE.WölflKundenNr = isLeerNothing(txtSonst_KdNrWOELFL.Text) + ADRESSE.weitereWölflKundenNr = isLeerNothing(txtSonst_weitereKdNrWOELFL.Text) ADRESSE.MSEKundenNr = isLeerNothing(txtSonst_KdNrMSE.Text) ADRESSE.TELEPASS_Kd_Nr = isLeerNothing(txtSonst_KdNrTelepass.Text) ADRESSE.PLOSEKundenNr = isLeerNothing(txtSonst_KdNrPLOSE.Text) @@ -2234,7 +2236,7 @@ Public Class usrcntlKundeBearbeitenFull Dim dt_IDS_Rabatte As DataTable = sql.loadDgvBySql("SELECT P.ProductDescription, C.OutletCountry, S.OutletName, RW.Rechenwert, Kz, RW.KategorieNr as KatNr FROM [VERAG].[dbo].[tbl_IDS_Rechenwerte] as RW left join [VERAG].[dbo].[tbl_IDS_Produkte] as P on P.ProductTypeCode = RW.ProductTypeCode left join [VERAG].[dbo].[tbl_IDS_Länder] as C on C.OutletCountryCode = RW.OutletCountryCode - left join [VERAG].[dbo].[tbl_IDS_Stationen] as S on S.[OutletCode] = RW.OutletCode where CustomerCode =" & KUNDE.KundenNr & " order by Kz", "FMZOLL") + left join [VERAG].[dbo].[tbl_IDS_Stationen] as S on S.[OutletCode] = RW.OutletCode and S.OutletCountryCode = RW.OutletCountryCode where CustomerCode =" & KUNDE.KundenNr & " order by Kz", "FMZOLL") With dgvIDS_Rabatte @@ -2265,7 +2267,7 @@ Public Class usrcntlKundeBearbeitenFull Dim dt_IDS As DataTable = sql.loadDgvBySql("SELECT P.ProductDescription, C.OutletCountry, S.OutletName, RW.Rechenwert, Kz, RW.KategorieNr as KatNr FROM [VERAG].[dbo].[tbl_IDS_Rechenwerte] as RW left join [VERAG].[dbo].[tbl_IDS_Produkte] as P on P.ProductTypeCode = RW.ProductTypeCode left join [VERAG].[dbo].[tbl_IDS_Länder] as C on C.OutletCountryCode = RW.OutletCountryCode - left join [VERAG].[dbo].[tbl_IDS_Stationen] as S on S.[OutletCode] = RW.OutletCode where CustomerCode is null order by KZ", "FMZOLL") + left join [VERAG].[dbo].[tbl_IDS_Stationen] as S on S.[OutletCode] = RW.OutletCode and S.OutletCountryCode = RW.OutletCountryCode where CustomerCode is null order by KZ", "FMZOLL") With dgvIDS_Standard .DataSource = dt_IDS diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index dc051b0b..4eff12fb 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -1501,8 +1501,8 @@ Public Class frmMDMDatenverarbetiung Dim top = "" Dim sqlWhere = "" Select Case art - Case "IDS" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode<>740543" & IIf(Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, " AND Adressen.AdressenNr = 204055 ", "") - Case "IDS_AT" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode=740543" & IIf(Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, " AND Adressen.AdressenNr = 204055 ", "") + Case "IDS" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode<>740543" + Case "IDS_AT" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode=740543" Case Else MsgBox("falscher Typ!") : Return False diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb index c4b02701..507d71db 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -424,29 +424,32 @@ Public Class usrcntlFremdrechnungen End If '4. Rechnungen der Länder, in denen der Kunde selber MWST beantragt - If land <> "" AndAlso dtKundeMWST.Rows.Count > 0 Then - Dim counter = 0 - Dim landBez As String = "" - For Each row As DataRow In dtKundeMWST.Rows - landBez &= "'" & row.Item("LandKz") & "'" - counter = counter + 1 - If (dtKundeMWST.Rows.Count <> 0 And counter <> dtKundeMWST.Rows.Count) Then landBez &= "," - Next - SQLWhere &= " OR " & land & " in (" & landBez & ")" + If dtKundeMWST IsNot Nothing Then + If land <> "" AndAlso dtKundeMWST.Rows.Count > 0 Then + Dim counter = 0 + Dim landBez As String = "" + For Each row As DataRow In dtKundeMWST.Rows + landBez &= "'" & row.Item("LandKz") & "'" + counter = counter + 1 + If (dtKundeMWST.Rows.Count <> 0 And counter <> dtKundeMWST.Rows.Count) Then landBez &= "," + Next + SQLWhere &= " OR " & land & " in (" & landBez & ")" + End If End If + SQLWhere &= ")" - 'nicht NOTWENDIG! - 'Select Case KUNDE.LandKz - ' Case "SRB", "BIH", "MK", "MNE", "TR" - ' If land <> "" Then SQLWhere &= " AND " & land & " not in('AT','CH', 'CZ', 'DE', 'EE', 'ES', 'IE', 'LT', 'LV', 'NRW', 'NO', 'OT', 'RS', 'UA', " & IIf(KUNDE.LandKz = "SRB", "'BG', 'HU', 'RO', 'SI', 'SK'", "") & IIf(KUNDE.LandKz = "BIH", "'SK'", "") & IIf(KUNDE.LandKz = "TR", "'HU', 'SI', 'SK'", "") & IIf(KUNDE.LandKz = "MNE", "'PL', 'SI'", "") & IIf(KUNDE.LandKz = "MK", "'BG', 'PL','SI'", "") & ")" - 'End Select + 'nicht NOTWENDIG! + 'Select Case KUNDE.LandKz + ' Case "SRB", "BIH", "MK", "MNE", "TR" + ' If land <> "" Then SQLWhere &= " AND " & land & " not in('AT','CH', 'CZ', 'DE', 'EE', 'ES', 'IE', 'LT', 'LV', 'NRW', 'NO', 'OT', 'RS', 'UA', " & IIf(KUNDE.LandKz = "SRB", "'BG', 'HU', 'RO', 'SI', 'SK'", "") & IIf(KUNDE.LandKz = "BIH", "'SK'", "") & IIf(KUNDE.LandKz = "TR", "'HU', 'SI', 'SK'", "") & IIf(KUNDE.LandKz = "MNE", "'PL', 'SI'", "") & IIf(KUNDE.LandKz = "MK", "'BG', 'PL','SI'", "") & ")" + 'End Select - End If + End If - Return SQLWhere + Return SQLWhere End Function @@ -533,7 +536,7 @@ Public Class usrcntlFremdrechnungen Else - If land <> "" AndAlso dtKundeMWST.Rows.Count > 0 Then + If land <> "" AndAlso dtKundeMWST.Rows.Count > 0 Then Dim counter = 0 Dim landBez As String = "" For Each row As DataRow In dtKundeMWST.Rows @@ -546,6 +549,12 @@ Public Class usrcntlFremdrechnungen SQLWhere &= ")" End If End If + + If dtKundeMWST Is Nothing AndAlso dtKundeMWSTTemp Is Nothing Then + SQLWhere &= ")" + End If + + Return SQLWhere End Function @@ -1435,10 +1444,10 @@ Public Class usrcntlFremdrechnungen If Not SplitContainer1.Panel2Collapsed Then Select Case aktLieferant - Case "IDS" : initDGVRechnungsdetails(dgvLFRechnung.SelectedRows(0).Cells("invoice_id").Value) + Case "IDS" : initDGVRechnungsdetails(dgvLFRechnung.SelectedRows(0).Cells("invoice_id").Value,, dgvLFRechnung.SelectedRows(0).Cells("AdressenNr").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) + initDGVRechnungsdetails(dgvLFRechnung.SelectedRows(0).Cells("invoice_id").Value,, dgvLFRechnung.SelectedRows(0).Cells("AdressenNr").Value) Else dgvDetails.Visible = False End If @@ -1469,6 +1478,15 @@ Public Class usrcntlFremdrechnungen Private Function initDGVRechnungsdetails(rechnugnsID As Integer, Optional setDatatable As Boolean = False, Optional KundenNr_Input As Integer = -1, Optional dtKundeMWSTTemp As DataTable = Nothing) As DataTable + + + If dtKundeMWSTTemp Is Nothing AndAlso KundenNr_Input > 0 Then + dtKundeMWSTTemp = (New SQL).loadDgvBySql("select LandKz from tblKundenMWST where KdNr = " & KundenNr_Input, "FMZOLL") + End If + + + + Dim sql = " select [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer, CustomerCode as Kundennummer,[daId],[TransactionVolume] as Transaktionsmenge,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden,[Country] as Land FROM [VERAG].[dbo].[tblIDSInvoicesNewSplittedByCountry] WHERE [TotalInvoiceId] = " & rechnugnsID & setSQLDetailWhere(aktLieferant, "Country", , KundenNr_Input, dtKundeMWSTTemp) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb b/VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb index b723416e..fb25e4cb 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb @@ -45,6 +45,8 @@ Public Class cAdressen Property MWSTVorauszahlung As Object = Nothing Property PLOSEKundenNr As Object = Nothing + Property weitereWölflKundenNr As Object = Nothing + Public hasEntry = False Shared SQL As New SQL @@ -139,6 +141,7 @@ Public Class cAdressen ' list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SSMA_TimeStamp", SSMA_TimeStamp)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MWSTVorauszahlung", MWSTVorauszahlung)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PLOSEKundenNr", PLOSEKundenNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("weitereWölflKundenNr", weitereWölflKundenNr)) Return list End Function @@ -311,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, 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, conn) Dim dr = cmd.ExecuteReader() If dr.Read Then diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb b/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb index 426ea8de..e50e7377 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb @@ -145,6 +145,7 @@ Public Class cDY_Zollanmeldungen_Import Property Importstatus As Object = Nothing Property Importdate As Object = Nothing Property Importfile As Object = Nothing + Property Ursprungsland_ISO2 As Object = Nothing Public hasEntry = False @@ -301,6 +302,7 @@ Public Class cDY_Zollanmeldungen_Import list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Importstatus", Importstatus)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Importdate", Importdate)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Importfile", Importfile)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Ursprungsland_ISO2", Ursprungsland_ISO2)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb index 709ce01a..5baed19c 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb @@ -1,6 +1,5 @@  Imports System.Data.SqlClient -Imports System.IO Imports System.Reflection Public Class cRMC @@ -177,7 +176,7 @@ Public Class cRMC Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() Using cmd As New SqlCommand(" SELECT rmc_reDatum,rmc_kdNr,[rmc_reNr],sum([rmc_betragNetto])[rmc_betragNetto],sum([rmc_betragMWST])[rmc_betragMWST] ,sum([rmc_betragBrutto] )[rmc_betragBrutto], [rmc_waehrung], sum([rmc_euroBrutto])[rmc_euroBrutto], rmc_daId, isnull(rmc_daId_InvAtt,0) as rmc_daId_InvAtt FROM [tblRMCImport] - INNER JOIN Adressen as adr on rmc_kdNr=adr.[WölflKundenNr] + INNER JOIN Adressen as adr on rmc_kdNr=adr.[WölflKundenNr] or rmc_kdNr=adr.[weitereWölflKundenNr] where cast(rmc_reDatum as date) between @von and @bis and AdressenNr=@AdressenNr AND rmc_landKZ ='" & LandKZ & "'" & IIf(Not Archiv, " And rmc_archiv = 0 ", "") & " group by rmc_reDatum,rmc_kdNr,[rmc_reNr],[rmc_waehrung], rmc_daId, isnull(rmc_daId_InvAtt,0) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb index e588e371..30cfc734 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb @@ -152,29 +152,10 @@ Public Class cUIDPruefung End Function - Public Shared Function doUIDPruefungALL(Optional datum As Object = Nothing, Optional SaveErgInAdressen As Boolean = True, Optional Sciherheitsabfrage As Boolean = True, Optional MaxEintraege As Integer = -1, Optional showErr As Boolean = True, Optional finanzOnline As Boolean = True, Optional veroegerungMs As Integer = 1500) As DataTable + Public Shared Function doUIDPruefungALL(Optional datum As Object = Nothing, Optional SaveErgInAdressen As Boolean = True, Optional Sciherheitsabfrage As Boolean = True, Optional MaxEintraege As Integer = -1, Optional showErr As Boolean = True, Optional finanzOnline As Boolean = True, Optional veroegerungMs As Integer = 3000) As DataTable Dim dt As DataTable = Nothing - 'If datum = Nothing Then datum = CDate("15." & Now.ToString("MM.yyyy")).AddMonths(-1) - 'Dim where = "" - '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 "UNISPED" : where = " AND Filialen.firma='UNISPED' " - ' Case Else : where = " AND Filialen.firma='VERAG' " '" And isnull(FilialenNr,'') Not IN (5501,5701)" - 'End Select - 'Dim Top = "" - 'If MaxEintraege > 0 Then - ' Top = " TOP " & MaxEintraege - 'End If - - 'dt = SQL.loadDgvBySql("SELECT " & Top & " [AdressenNr] as KdNr,[Ordnungsbegriff] as Firma,UstIdGeprüft as [letzte Prüfung],Adressen.UstIdKz,Adressen.UstIdnr " & - ' " From [Adressen] inner Join kunden On KundenNr=AdressenNr inner join Filialen on Filialen.FilialenNr=Kunden.FilialenNr " & - ' " where (UstIdGeprüft <= '" & datum.ToShortDateString & "' OR UstIdGeprüft is null) and (isnull(Adressen.UstIdKz,'') <> ''and isnull(Adressen.UstIdNr,'') <> '') " & - ' " And Auswahl='A' " & where & " ORDER BY Ordnungsbegriff", "FMZOLL") - - dt = get_zupruefendeKunden(MaxEintraege, datum) + dt = get_zupruefendeKunden(MaxEintraege, datum,, True) If dt IsNot Nothing Then If dt.Rows.Count = 0 Then Return Nothing @@ -195,6 +176,14 @@ Public Class cUIDPruefung e.ColumnName = "Error-Text" dt.Columns.Add(e) + Dim f As New DataColumn + f.ColumnName = "Re-Login" + dt.Columns.Add(f) + + Dim g As New DataColumn + g.ColumnName = "Verzoegerung" + dt.Columns.Add(g) + '------------------------------------------------ 'ENTWEDER ÃœBER EU-KOMISSION ODER FINANZONLINE:::: @@ -204,25 +193,29 @@ Public Class cUIDPruefung Case "EUROPE" For Each r As DataRow In dt.Rows - Dim UID_TMP = doUIDPruefung(r("KdNr"),, SaveErgInAdressen, showErr, ART) - If UID_TMP IsNot Nothing Then - If UID_TMP.uid_valid Then - r("Ergebnis") = "OK" - For Each row As DataRow In dt.Select("UstIdnr = '" & r("UstIdnr") & "' AND UstIdKz ='" & r("UstIdKz") & "'") - row("Ergebnis") = r("Ergebnis") - Next + If Not IsDBNull(r("istEUVAT")) AndAlso r("istEUVAT") = "Ja" Then ' Alle 27 Mitgliedstaaten der Europäischen Union + Dim UID_TMP = doUIDPruefung(r("KdNr"),, SaveErgInAdressen, showErr, ART) + If UID_TMP IsNot Nothing Then + If UID_TMP.uid_valid Then + r("Ergebnis") = "OK" + + For Each row As DataRow In dt.Select("UstIdnr = '" & r("UstIdnr") & "' AND UstIdKz ='" & r("UstIdKz") & "'") + row("Ergebnis") = r("Ergebnis") + Next + + Else + r("Ergebnis") = "UNGÃœLTIG" + End If Else - r("Ergebnis") = "UNGÃœLTIG" + r("Ergebnis") = "ERROR" + End If - Else - r("Ergebnis") = "ERROR" - End If - - If veroegerungMs > 0 Then - Thread.Sleep(veroegerungMs) 'Bei Verögeung soll zwischen jeder Abfrage eine Pause gemacht werden! (Wegen Sperre bei zu vielen Abfragen) + If veroegerungMs > 0 Then + Thread.Sleep(veroegerungMs) 'Bei Verögeung soll zwischen jeder Abfrage eine Pause gemacht werden! (Wegen Sperre bei zu vielen Abfragen) + End If End If Next @@ -230,57 +223,65 @@ Public Class cUIDPruefung Case "FINANZONLINE" Dim FO As New VERAG_PROG_ALLGEMEIN.cFinanzOnlineWebService - VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "" Then VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" FO.initValues() Dim counter = 0 + Dim errorCounter As Integer = 0 If FO.Call_Web_Service_MethodUID_Login_NEU2020() = 0 Then For Each r As DataRow In dt.Rows - If IsDBNull(r("Ergebnis")) Then + If Not IsDBNull(r("istEUVAT")) AndAlso r("istEUVAT") = "Ja" Then ' Alle 27 Mitgliedstaaten der Europäischen Union - counter += 1 - Dim errorCode = -99 - Dim errormsg = "" - Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(r("KdNr"),, SaveErgInAdressen, showErr,, errorCode, errormsg) - If UID_TMP IsNot Nothing Then - If UID_TMP.uid_valid Then - r("Ergebnis") = "OK" + If IsDBNull(r("Ergebnis")) Then - For Each row As DataRow In dt.Select("UstIdnr = '" & r("UstIdnr") & "' AND UstIdKz ='" & r("UstIdKz") & "'") - row("Ergebnis") = r("Ergebnis") - Next - ' Bei ungültig soll er einzeln durchgehen! Besprochen mit A.Stockenhuber + counter += 1 + Dim errorCode = -99 + Dim errormsg = "" + Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(r("KdNr"),, SaveErgInAdressen, showErr,, errorCode, errormsg) + If UID_TMP IsNot Nothing Then + If UID_TMP.uid_valid Then + r("Ergebnis") = "OK" + + For Each row As DataRow In dt.Select("UstIdnr = '" & r("UstIdnr") & "' AND UstIdKz ='" & r("UstIdKz") & "'") + row("Ergebnis") = r("Ergebnis") + Next + ' Bei ungültig soll er einzeln durchgehen! Besprochen mit A.Stockenhuber + Else + r("Ergebnis") = "UNGÃœLTIG" + End If Else - r("Ergebnis") = "UNGÃœLTIG" - ' For Each row As DataRow In dt.Select("UstIdnr = '" & r("UstIdnr") & "' AND UstIdKz ='" & r("UstIdKz") & "'") - ' row("Ergebnis") = r("Ergebnis") - ' Next - End If - Else - r("Ergebnis") = "ERROR" - r("Error-Code") = errorCode.ToString() - r("Error-Text") = FO.GetCodeText(errorCode) & errormsg + r("Ergebnis") = "ERROR" + r("Error-Code") = errorCode.ToString() + r("Error-Text") = FO.GetCodeText(errorCode) & errormsg - ' Bei ERROR soll er ebenfalls einzeln durchgehen! Besprochen mit A.Stockenhuber - 'For Each row As DataRow In dt.Select("UstIdnr = '" & r("UstIdnr") & "' AND UstIdKz ='" & r("UstIdKz") & "'") - ' row("Ergebnis") = r("Ergebnis") - ' row("Error-Code") = r("Error-Code") - ' row("Error-Text") = r("Error-Text") - 'Next + If r("Error-Code") = "1511" Then + errorCounter += 1 'Fehler Mitgliedsstaat nicht erreichbar!!! + ElseIf r("Error-Code") = "-99" AndAlso r("Error-Text") <> "" AndAlso r("Error-Text").ToString.Contains("Wegen Wartungsarbeiten") Then + Exit For 'Wartungsarbeiten -> sofort abbrechen! + + End If + + + End If End If - End If + r("Re-Login") = "0" - If counter Mod 100 = 0 Then - FO.Call_Web_Service_MethodUID_Logout_NEU2020() - Thread.Sleep(2000) - FO.Call_Web_Service_MethodUID_Login_NEU2020() - End If + If counter Mod 100 = 0 OrElse errorCounter > 10 Then + If errorCounter > 10 Then errorCounter = 0 + FO.Call_Web_Service_MethodUID_Logout_NEU2020() + Thread.Sleep(5000) + FO.Call_Web_Service_MethodUID_Login_NEU2020() + r("Re-Login") = "1" + End If + + If veroegerungMs > 0 Then + r("Verzoegerung") = veroegerungMs + Thread.Sleep(veroegerungMs) 'Bei Verögeung soll zwischen jeder Abfrage eine Pause gemacht werden! (Wegen Sperre bei zu vielen Abfragen) + End If - If veroegerungMs > 0 Then - Thread.Sleep(veroegerungMs) 'Bei Verögeung soll zwischen jeder Abfrage eine Pause gemacht werden! (Wegen Sperre bei zu vielen Abfragen) End If Next @@ -298,7 +299,7 @@ Public Class cUIDPruefung Return dt End Function - Public Shared Function get_zupruefendeKunden(MaxEintraege As Integer, Optional datum As Object = Nothing, Optional Firma As String = "") As DataTable + Public Shared Function get_zupruefendeKunden(MaxEintraege As Integer, Optional datum As Object = Nothing, Optional Firma As String = "", Optional Validierungspruefung As Boolean = False) As DataTable Dim dt As DataTable = Nothing If datum = Nothing Then datum = CDate("15." & Now.ToString("MM.yyyy")).AddMonths(-1) @@ -309,11 +310,10 @@ Public Class cUIDPruefung Firma = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA End If - Select Case 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 "AMBAR" : where = " And Filialen.FilialenNr IN (5701) " + Case "IMEX" : where = " And Filialen.FilialenNr IN (5501) " + 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 @@ -324,9 +324,24 @@ Public Class cUIDPruefung Top = " TOP " & MaxEintraege End If - dt = SQL.loadDgvBySql("SELECT " & Top & " [AdressenNr] as KdNr,[Ordnungsbegriff] as Firma,UstIdGeprüft as [letzte Prüfung],Adressen.UstIdKz,Adressen.UstIdnr " & + If Validierungspruefung Then + where &= " AND UPPER(Adressen.UstIdKz) IN ( + 'AT','BE','BG','CY','CZ','DE','DK','EE','EL','ES','FI','FR','HR', + 'HU','IE','IT','LT','LU','LV','MT','NL','PL','PT','RO','SE','SI','SK' + )" + End If + + + + dt = SQL.loadDgvBySql("SELECT " & Top & " [AdressenNr] as KdNr,[Ordnungsbegriff] as Firma,UstIdGeprüft as [letzte Prüfung],Adressen.UstIdKz,Adressen.UstIdnr ,CASE + WHEN UPPER(Adressen.UstIdKz) IN ( + 'AT','BE','BG','CY','CZ','DE','DK','EE','EL','ES','FI','FR','HR', + 'HU','IE','IT','LT','LU','LV','MT','NL','PL','PT','RO','SE','SI','SK' + ) THEN 'Ja' + ELSE 'Nein' + END AS istEUVAT " & " From [Adressen] inner Join kunden On KundenNr=AdressenNr inner join Filialen on Filialen.FilialenNr=Kunden.FilialenNr " & - " where (UstIdGeprüft <= '" & datum.ToShortDateString & "' OR UstIdGeprüft is null) and (isnull(Adressen.UstIdKz,'') <> ''and isnull(Adressen.UstIdNr,'') <> '') " & + " where (UstIdGeprüft <= '" & datum.ToShortDateString & "' OR UstIdGeprüft is null) and (isnull(Adressen.UstIdKz,'') <> '' and isnull(Adressen.UstIdNr,'') <> '') " & " And Auswahl='A' " & where & " ORDER BY Ordnungsbegriff", "FMZOLL") Return dt diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 32f9942f..18029d51 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -1398,13 +1398,13 @@ Public Class cFormularManager If doc.Pages.Count = 0 Then Continue For Dim size = doc.Pages(0).Size - If size.Width <= 0 OrElse size.Height <= 0 Then Continue For - ' --- Druckeinstellungen --- - doc.PrintSettings.PrinterName = printerName - doc.PrintSettings.SelectSinglePageLayout(PdfSinglePageScalingMode.ActualSize, False) - doc.PrintSettings.Landscape = True - doc.PrintSettings.PaperSize = New System.Drawing.Printing.PaperSize("A4", 827, 1169) - doc.Print() + If size.Width <= 10 OrElse size.Height <= 10 Then Continue For 'zu kleine Seiten überspringen + ' --- Druckeinstellungen --- + doc.PrintSettings.PrinterName = printerName + doc.PageSettings.Size = Spire.Pdf.PdfPageSize.A4 + doc.PageSettings.Orientation = Spire.Pdf.PdfPageOrientation.Landscape + doc.PrintSettings.SelectSinglePageLayout(PdfSinglePageScalingMode.FitSize, True) + doc.Print() End Using diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb index 421a5c83..57ee26a2 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb @@ -63,7 +63,7 @@ Public Class frmMessenger 'End Try End Sub - Private Sub MyDatagridview1_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvChats.CellContentClick, dgvChats.CellClick + Private Sub MyDatagridview1_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvChats.CellClick '.CellContentClick If dgvChats.Rows(e.RowIndex).Cells("ungelesen").Value <> "" Then Dim dgv_ChatID = If(dgvChats.SelectedRows.Count > 0, dgvChats.SelectedRows(0).Cells("chat_id").Value, -1) intiDGVChats(dgv_ChatID, False) ' Splate ungelesen sol sich ändern diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb index 469d738e..67131b18 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb @@ -1,11 +1,6 @@ -Imports System.ComponentModel -Imports System.Diagnostics.Eventing.Reader -Imports System.Drawing -Imports System.Net +Imports System.Drawing Imports System.Threading Imports System.Windows.Forms -Imports Therefore.API -Imports VERAG_PROG_ALLGEMEIN.cCreditSafeAPI Public Class frmMitarbeitersuche Dim mit_id As Integer = -1 diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb index c22a47b7..fc846b99 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb @@ -136,6 +136,16 @@ Public Class cFinanzOnlineWebService Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, "Fehler im externen Webservice " & System.Reflection.MethodInfo.GetCurrentMethod.Name & vbNewLine & " Daten: TID: " & tid & vbNewLine & " BENID: " & benid & vbNewLine & " SessionID: " & SESSION_ID & vbNewLine & " UID: " & uid & vbNewLine & " COUNTRY-CODE/VAT: " & countryCode & vatNumber & vbNewLine & " Stufe: " & StufeAbf & vbNewLine & " MSG: " & msg & vbNewLine & " Name: " & name & vbNewLine & " Adr1: " & adrz1 & vbNewLine & " Adr2: " & adrz2 & vbNewLine & " Adr3: " & adrz3 & vbNewLine & " Adr4: " & adrz4 & vbNewLine & " Adr5: " & adrz5 & vbNewLine & " Adr6: " & adrz6, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + + If ex.Message.Contains("Wegen Wartungsarbeiten") AndAlso ex.Message.Contains("Verf??gung") Then + Dim startIndex As Integer = ex.Message.IndexOf("Wegen Wartungsarbeiten") + Dim endIndex As Integer = ex.Message.IndexOf("Verf??gung", startIndex) + Dim messageError As String = ex.Message.Substring(startIndex, endIndex - startIndex + "Verf??gung".Length) + If messageError <> "" Then errorMsg = messageError + errorCode = -99 + + End If + Exit Function End Try @@ -382,6 +392,7 @@ Public Class cFinanzOnlineWebService Case 4 : Return "Die UID-Nummer des Erwerbers ist falsch." Case 5 : Return "Die UID-Nummer des Antragstellers ist ungültig." Case 10 : Return "Der angegebene Mitgliedstaat verbietet diese Abfrage." + Case -99 : Return "" & rc Case 101 : Return "UID beginnt nicht mit ATU." Case 103 : Return "Die angefragte UID-Nummer kann im FinanzOnline nur in Stufe 1 bestätigt werden, da diese UID-Nummer zu einer Unternehmensgruppe (Umsatzsteuergruppe) gehört. diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index 534816d6..4c66932b 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -639,6 +639,13 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( Return SQL.getValueTxtBySql(sqlstr, "FMZOLL") End Function + Shared Function getISO2LandFromLandbezeichnung(LandBez As String) + If LandBez Is Nothing Then Return Nothing + Dim sqlstr = "SELECT TOP 1 isnull([Länderverzeichnis für die Außenhandelsstatistik].LandKz,'') AS LandKzISO2 FROM [Länderverzeichnis für die Außenhandelsstatistik] LEFT JOIN Währungstabelle ON [Länderverzeichnis für die Außenhandelsstatistik].LandNr = Währungstabelle.Währungsschlüssel WHERE Währungstabelle.Land='" & LandBez & "' " + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Return SQL.getValueTxtBySql(sqlstr, "FMZOLL") + End Function + Shared Function getISO2LandFromISO1Land(Iso1Land As String) Dim sqlstr = "SELECT TOP 1 isnull([Länderverzeichnis für die Außenhandelsstatistik].LandKz,'') AS LandKzISO2 FROM [Länderverzeichnis für die Außenhandelsstatistik] LEFT JOIN Währungstabelle ON [Länderverzeichnis für die Außenhandelsstatistik].LandNr = Währungstabelle.Währungsschlüssel WHERE Währungstabelle.LandKz='" & Iso1Land & "' "