diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 2387aae4..79de4ad1 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -5,7 +5,9 @@ Imports Microsoft.Office.Interop Imports VERAG_PROG_ALLGEMEIN Imports s2industries.ZUGFeRD Imports System.IO - +Imports VERAG_PROG_ALLGEMEIN.TESTJSON +Imports org.omg.PortableServer +Imports GrapeCity.ActiveReports.ReportsCore.Tools Public Class cFakturierung @@ -1539,10 +1541,10 @@ Public Class cFakturierung Dim Paramslist As New cParameterList(VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID) Dim enableZugpferd = Paramslist.GET_PARAMETER_VALUE_BOOL("ZUGFeRD") If enableZugpferd Then - tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.addAttachementToPDF(tmpPath, createZUGFeRD(RECHNUNG)) + tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.addAttachementToPDF(tmpPath, createZUGFeRD(True, RECHNUNG)) Else - Dim Zugferdpath = createZUGFeRD(RECHNUNG) + Dim Zugferdpath = createZUGFeRD(True, RECHNUNG) Dim fileInfo_ZP As New FileInfo(Zugferdpath) Dim ZUGF_DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "ZUGFERD", Now().Year, "", "", fileInfo_ZP.Name, -1, False) ZUGF_DS.uploadDataToDATENSERVER(Zugferdpath, fileInfo_ZP.Name, fileInfo_ZP.Extension,,,, True) @@ -1736,69 +1738,75 @@ Public Class cFakturierung Return False End Function - Shared Function createZUGFeRD(RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang) As String + Shared Function createZUGFeRD(einzelrechnung As Boolean, Optional RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang = Nothing, Optional SR_DT As DataTable = Nothing, Optional rpt As rptSammelRechnungDruck = Nothing) As String Dim ZZTage = 10 Dim vatSeller As ElectronicAddressSchemeIdentifiers Dim vatBuyer As ElectronicAddressSchemeIdentifiers - If RECHNUNG.RechnungsKundenNr > 0 Then + If einzelrechnung AndAlso RECHNUNG IsNot Nothing Then - Dim RECHNUNG_AD As New VERAG_PROG_ALLGEMEIN.cAdressen(RECHNUNG.RechnungsKundenNr) - Dim RECHNUNG_KD As New VERAG_PROG_ALLGEMEIN.cKunde(RECHNUNG.RechnungsKundenNr) + '--------------------------------------------------------------------------------- + '--------------------------------EINZELRECHNUNG----------------------------------- + '--------------------------------------------------------------------------------- - If RECHNUNG_KD.Zahlungsziel IsNot Nothing AndAlso IsNumeric(RECHNUNG_KD.Zahlungsziel) Then - ZZTage = RECHNUNG_KD.Zahlungsziel - End If - End If + If RECHNUNG.RechnungsKundenNr > 0 Then - Dim zahlungszieldatum As Date = CDate(RECHNUNG.RechnungsDatum).AddDays(ZZTage) - Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(RECHNUNG.Firma_ID) - Dim desc As InvoiceDescriptor = InvoiceDescriptor.CreateInvoice(RECHNUNG.RechnungsNr, RECHNUNG.RechnungsDatum, IIf(FIRMA.Firma_ID = 26, CurrencyCodes.GBP, CurrencyCodes.EUR)) + Dim RECHNUNG_AD As New VERAG_PROG_ALLGEMEIN.cAdressen(RECHNUNG.RechnungsKundenNr) + Dim RECHNUNG_KD As New VERAG_PROG_ALLGEMEIN.cKunde(RECHNUNG.RechnungsKundenNr) - Select Case RECHNUNG.BelegartenKz - Case "AR" - desc.Name = "SPEDITIONSRECHNUNG" - desc.Type = InvoiceType.ForwardersInvoice - Case "AG" - desc.Name = "GUTSCHRIFT" - desc.Type = InvoiceType.CreditNote - End Select - - If RECHNUNG.Besonderheiten IsNot Nothing Then desc.AddNote(RECHNUNG.Besonderheiten.ToString, SubjectCodes.AAI) - If RECHNUNG.Text IsNot Nothing Then desc.AddNote(RECHNUNG.Text.ToString, SubjectCodes.AAI) - desc.AddNote("Es bestehen Rabatt- und Bonusvereinbarungen.", SubjectCodes.AAK) - - desc.SetBuyer(RECHNUNG.RechnungsName_1, RECHNUNG.RechnungsOrt, RECHNUNG.RechnungsOrt, RECHNUNG.RechnungsStraße, GetCountryCodeFromLandKZ(RECHNUNG.RechnungsLandKz, vatBuyer), IIf(Not IsDBNull(RECHNUNG.KundenNrZentrale), RECHNUNG.KundenNrZentrale, "")) - - desc.SetSeller(FIRMA.Firma_Bez, FIRMA.Firma_Ort, FIRMA.Firma_Ort, FIRMA.Firma_Straße, GetCountryCodeFromLandKZ(FIRMA.Firma_LandKz, vatSeller)) - desc.AddSellerTaxRegistration(FIRMA.Firma_UID.ToString.Replace("UID: ", ""), TaxRegistrationSchemeID.VA) - - ' Optionally, to support Peppol----------------------------- - - - If Not IsDBNull(RECHNUNG.RechnungsUstIdNr) AndAlso RECHNUNG.RechnungsUstIdNr IsNot Nothing AndAlso Not IsDBNull(RECHNUNG.RechnungsUstIdKz) AndAlso RECHNUNG.RechnungsUstIdKz IsNot Nothing Then - desc.AddBuyerTaxRegistration(RECHNUNG.RechnungsUstIdKz & RECHNUNG.RechnungsUstIdNr, TaxRegistrationSchemeID.VA) - If vatBuyer Then - desc.SetBuyerElectronicAddress(RECHNUNG.RechnungsUstIdKz & RECHNUNG.RechnungsUstIdNr, vatBuyer) - desc.SetSellerElectronicAddress(FIRMA.Firma_UID.ToString.Replace("UID: ", ""), vatSeller) + If RECHNUNG_KD.Zahlungsziel IsNot Nothing AndAlso IsNumeric(RECHNUNG_KD.Zahlungsziel) Then + ZZTage = RECHNUNG_KD.Zahlungsziel + End If End If - End If - '----------------------------- + Dim zahlungszieldatum As Date = CDate(RECHNUNG.RechnungsDatum).AddDays(ZZTage) + Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(RECHNUNG.Firma_ID) + Dim desc As InvoiceDescriptor = InvoiceDescriptor.CreateInvoice(RECHNUNG.RechnungsNr, RECHNUNG.RechnungsDatum, IIf(FIRMA.Firma_ID = 26, CurrencyCodes.GBP, CurrencyCodes.EUR)) + + Select Case RECHNUNG.BelegartenKz + Case "AR" + desc.Name = "SPEDITIONSRECHNUNG" + desc.Type = InvoiceType.ForwardersInvoice + Case "AG" + desc.Name = "GUTSCHRIFT" + desc.Type = InvoiceType.CreditNote + End Select + + If RECHNUNG.Besonderheiten IsNot Nothing Then desc.AddNote(RECHNUNG.Besonderheiten.ToString, SubjectCodes.AAI) + If RECHNUNG.Text IsNot Nothing Then desc.AddNote(RECHNUNG.Text.ToString, SubjectCodes.AAI) + desc.AddNote("Es bestehen Rabatt- und Bonusvereinbarungen.", SubjectCodes.AAK) + + desc.SetBuyer(RECHNUNG.RechnungsName_1, RECHNUNG.RechnungsOrt, RECHNUNG.RechnungsOrt, RECHNUNG.RechnungsStraße, GetCountryCodeFromLandKZ(RECHNUNG.RechnungsLandKz, vatBuyer), IIf(Not IsDBNull(RECHNUNG.KundenNrZentrale), RECHNUNG.KundenNrZentrale, "")) + + desc.SetSeller(FIRMA.Firma_Bez, FIRMA.Firma_Ort, FIRMA.Firma_Ort, FIRMA.Firma_Straße, GetCountryCodeFromLandKZ(FIRMA.Firma_LandKz, vatSeller)) + desc.AddSellerTaxRegistration(FIRMA.Firma_UID.ToString.Replace("UID: ", ""), TaxRegistrationSchemeID.VA) + + ' Optionally, to support Peppol----------------------------- - Dim steuerProzent As Double = SQL.DLookup(" isnull([Steuersatz %],0)", "[Steuertabelle] ", "[Steuerschlüssel]='" & checkNull(RECHNUNG.Steuerschlüssel) & "'", "FMZOLL", 0) - Dim steuerProzenFaktor As Double = 0 - If steuerProzent > 0 AndAlso steuerProzent < 1 Then - steuerProzenFaktor = steuerProzent * 100 - End If + If Not IsDBNull(RECHNUNG.RechnungsUstIdNr) AndAlso RECHNUNG.RechnungsUstIdNr IsNot Nothing AndAlso Not IsDBNull(RECHNUNG.RechnungsUstIdKz) AndAlso RECHNUNG.RechnungsUstIdKz IsNot Nothing Then + desc.AddBuyerTaxRegistration(RECHNUNG.RechnungsUstIdKz & RECHNUNG.RechnungsUstIdNr, TaxRegistrationSchemeID.VA) + If vatBuyer Then + desc.SetBuyerElectronicAddress(RECHNUNG.RechnungsUstIdKz & RECHNUNG.RechnungsUstIdNr, vatBuyer) + desc.SetSellerElectronicAddress(FIRMA.Firma_UID.ToString.Replace("UID: ", ""), vatSeller) + End If + + End If + '----------------------------- - Dim sumNetto As Double = 0 - For Each p In RECHNUNG.POSITIONEN + Dim steuerProzent As Double = SQL.DLookup(" isnull([Steuersatz %],0)", "[Steuertabelle] ", "[Steuerschlüssel]='" & checkNull(RECHNUNG.Steuerschlüssel) & "'", "FMZOLL", 0) + Dim steuerProzenFaktor As Double = 0 + If steuerProzent > 0 AndAlso steuerProzent < 1 Then + steuerProzenFaktor = steuerProzent * 100 + End If - Dim tradeLineItemNew As TradeLineItem = desc.AddTradeLineItem( + + Dim sumNetto As Double = 0 + For Each p In RECHNUNG.POSITIONEN + + Dim tradeLineItemNew As TradeLineItem = desc.AddTradeLineItem( name:=p.LeistungsBez, billedQuantity:=Convert.ToDecimal(p.Anzahl), unitCode:=QuantityCodes.C62, ' immer in Stück @@ -1808,24 +1816,24 @@ Public Class cFakturierung taxPercent:=IIf(p.Steuerpflichtig, Convert.ToDecimal(RECHNUNG.Steuersatz_Proz * 100), 0), taxType:=IIf(p.Steuerpflichtig, TaxTypes.VAT, TaxTypes.VAT) ) - Dim netUnitPrice = Convert.ToDecimal(p.Preis) + Dim netUnitPrice = Convert.ToDecimal(p.Preis) Dim grossUnitPrice = IIf(p.Steuerpflichtig, Convert.ToDecimal(p.Preis * (1 + RECHNUNG.Steuersatz_Proz)), Convert.ToDecimal(p.Preis)) Dim netPricePos = netUnitPrice * Convert.ToDecimal(p.Anzahl) - sumNetto += netPricePos - Next + sumNetto += netPricePos + Next - 'Summe aller Rechnungspositions-Nettobeträge der Rechnung - Dim lineTotalAmont = sumNetto - 'Der Gesamtbetrag der Umsatzsteuer für die Rechnung, - Dim taxTotalAmount = IIf(RECHNUNG.SteuerpflichtigerGesamtbetrag <> 0, Math.Round(Convert.ToDecimal(RECHNUNG.SteuerpflichtigerGesamtbetrag) / (100 + steuerProzenFaktor) * steuerProzenFaktor, 2), 0) - ' Die Gesamtsumme der Rechnung ohne Umsatzsteuer ' RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag + 0 - 0 - Dim taxBasisAmount = Convert.ToDecimal(RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag + 0 - 0 - taxTotalAmount) - 'Der Gesamtbetrag der Rechnung mit Umsatzsteuer - Dim grandTotalAmount = Convert.ToDecimal(RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag) - 'Der ausstehende Betrag, um dessen Zahlung gebeten wird. Dieser Betrag ist der Rechnungsgesamtbetrag einschließlich Umsatzsteuer abzüglich des im Voraus gezahlten Betrages.Im Falle einer vollständig beglichenen Rechnung ist dieser Betrag gleich null. Der Betrag kann negativ sein; In diesem Fall schuldet der Verkäufer dem Käufer den Betrag - Dim duePayableAmount = Convert.ToDecimal(RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag) + 'Summe aller Rechnungspositions-Nettobeträge der Rechnung + Dim lineTotalAmont = sumNetto + 'Der Gesamtbetrag der Umsatzsteuer für die Rechnung, + Dim taxTotalAmount = IIf(RECHNUNG.SteuerpflichtigerGesamtbetrag <> 0, Math.Round(Convert.ToDecimal(RECHNUNG.SteuerpflichtigerGesamtbetrag) / (100 + steuerProzenFaktor) * steuerProzenFaktor, 2), 0) + ' Die Gesamtsumme der Rechnung ohne Umsatzsteuer ' RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag + 0 - 0 + Dim taxBasisAmount = Convert.ToDecimal(RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag + 0 - 0 - taxTotalAmount) + 'Der Gesamtbetrag der Rechnung mit Umsatzsteuer + Dim grandTotalAmount = Convert.ToDecimal(RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag) + 'Der ausstehende Betrag, um dessen Zahlung gebeten wird. Dieser Betrag ist der Rechnungsgesamtbetrag einschließlich Umsatzsteuer abzüglich des im Voraus gezahlten Betrages.Im Falle einer vollständig beglichenen Rechnung ist dieser Betrag gleich null. Der Betrag kann negativ sein; In diesem Fall schuldet der Verkäufer dem Käufer den Betrag + Dim duePayableAmount = Convert.ToDecimal(RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag) - desc.SetTotals( + desc.SetTotals( lineTotalAmount:=Convert.ToDecimal(lineTotalAmont), chargeTotalAmount:=0, 'Summe aller in der Rechnung enthaltenen Zuschläge der Dokumentenebene allowanceTotalAmount:=0, 'Summe aller in der Rechnung enthaltenen Abschläge der Dokumenteneben @@ -1838,27 +1846,251 @@ Public Class cFakturierung ) - desc.AddTradePaymentTerms(RECHNUNG.TextZZ, zahlungszieldatum) + desc.AddTradePaymentTerms(RECHNUNG.TextZZ, zahlungszieldatum) - Dim isReverseCharge = isReverseChargeSumme(FIRMA, RECHNUNG) + Dim isReverseCharge = isReverseChargeSumme(FIRMA, RECHNUNG) - If RECHNUNG.SteuerfreierGesamtbetrag > 0 Then - desc.AddApplicableTradeTax(Convert.ToDecimal(RECHNUNG.SteuerfreierGesamtbetrag), 0, TaxTypes.VAT, TaxCategoryCodes.Z) - End If + If RECHNUNG.SteuerfreierGesamtbetrag > 0 Then + desc.AddApplicableTradeTax(Convert.ToDecimal(RECHNUNG.SteuerfreierGesamtbetrag), 0, TaxTypes.VAT, TaxCategoryCodes.Z) + End If + + If RECHNUNG.SteuerpflichtigerGesamtbetrag > 0 Then + desc.AddApplicableTradeTax(Convert.ToDecimal(taxBasisAmount - RECHNUNG.SteuerfreierGesamtbetrag), Convert.ToDecimal(steuerProzenFaktor), Convert.ToDecimal(taxTotalAmount), TaxTypes.VAT, IIf(isReverseCharge, TaxCategoryCodes.AE, TaxCategoryCodes.S)) + End If + + + Dim tmpPathZugpferd = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("ZUGFeRD_Invoice_" & RECHNUNG.RechnungsNr, ".xml", True, False) + Dim stream As FileStream = New FileStream(tmpPathZugpferd, FileMode.Create, FileAccess.Write) + desc.Save(stream, ZUGFeRDVersion.Version20, Profile.Comfort) + + stream.Flush() + stream.Close() + Return tmpPathZugpferd + + ElseIf Not einzelrechnung AndAlso SR_DT IsNot Nothing Then + + '--------------------------------------------------------------------------------- + '--------------------------------SAMMELRECHNUNG----------------------------------- + '--------------------------------------------------------------------------------- + + Dim ROW As DataRow = SR_DT.Rows(0) + Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(ROW("Firma_ID")) + + Dim RECHNUNG_AD As New VERAG_PROG_ALLGEMEIN.cAdressen(ROW("RechnungsKundenNr")) + Dim RECHNUNG_KD As New VERAG_PROG_ALLGEMEIN.cKunde(ROW("RechnungsKundenNr")) + + If RECHNUNG_KD.Zahlungsziel IsNot Nothing AndAlso IsNumeric(RECHNUNG_KD.Zahlungsziel) Then + ZZTage = RECHNUNG_KD.Zahlungsziel + End If + + Dim Gesamt_RG_BetragSteuerfrei As Double = CDbl(SR_DT.Compute("SUM(SteuerFreierBetrag)", "")) + + Dim Gesamt_RG_BetragSteuerpflichtig As Double = CDbl(SR_DT.Compute("SUM(SteuerpflichtigerBetrag)", "")) + + Dim Gesamt_RG_Betrag As Double = Gesamt_RG_BetragSteuerfrei + Gesamt_RG_BetragSteuerpflichtig + + Dim BelegartenKz = If(Gesamt_RG_Betrag < 0, "AG", "AR") + + Dim RechnungsNr = If(ROW("RechnungsNr") IsNot DBNull.Value, addYeartoRgNr(FIRMA.Firma_ID, ROW("Buchungsjahr")) & ROW("RechnungsNr"), "Vorschau") + Dim RechnungsDatum = If(ROW("RechnungsDatum") IsNot DBNull.Value, ROW("RechnungsDatum"), "Vorschau") + Dim zahlungszieldatum As Date = CDate(RechnungsDatum).AddDays(ZZTage) + Dim desc As InvoiceDescriptor = InvoiceDescriptor.CreateInvoice(RechnungsNr, RechnungsDatum, IIf(FIRMA.Firma_ID = 26, CurrencyCodes.GBP, CurrencyCodes.EUR)) + + Select Case BelegartenKz + Case "AR" + desc.Name = "SPEDITIONSRECHNUNG" + desc.Type = InvoiceType.ForwardersInvoice + Case "AG" + desc.Name = "GUTSCHRIFT" + desc.Type = InvoiceType.CreditNote + End Select + + + Dim Rechnugnsname2 As String = "" + If ROW("RechnungsName 2") IsNot DBNull.Value AndAlso ROW("RechnungsName 2") <> "" Then + Rechnugnsname2 = ROW("RechnungsName 2") + End If + + Dim RechnungsName_AdressZusatz As String = "" + If ROW("RechnungsName_AdressZusatz") IsNot DBNull.Value AndAlso ROW("RechnungsName_AdressZusatz") <> "" Then + RechnungsName_AdressZusatz = ROW("RechnungsName_AdressZusatz") + End If + + Dim RechnungsStraße As String = "" + If ROW("RechnungsStraße") IsNot DBNull.Value AndAlso ROW("RechnungsStraße") <> "" Then + RechnungsStraße = ROW("RechnungsStraße") + End If + + Dim RechnungsOrt As String = "" + If ROW("RechnungsOrt") IsNot DBNull.Value AndAlso ROW("RechnungsOrt") <> "" Then + RechnungsOrt = ROW("RechnungsOrt") + End If + + Dim RechnungsLandKz As String = "" + If ROW("RechnungsLandKz") IsNot DBNull.Value AndAlso ROW("RechnungsLandKz") <> "" Then + RechnungsLandKz = ROW("RechnungsLandKz") 'cProgramFunctions.getLandBez_fromISO1Land(ROW("RechnungsLandKz"), "", ROW("RechnungSprache")).ToString.ToUpper + End If + + + Dim RE_UID As String = If(ROW("RechnungsUstIdKz") IsNot DBNull.Value, ROW("RechnungsUstIdKz"), "") & If(ROW("RechnungsUstIdNr") IsNot DBNull.Value, ROW("RechnungsUstIdNr"), "") + + + 'If RECHNUNG.Besonderheiten IsNot Nothing Then + ' desc.AddNote(RECHNUNG.Besonderheiten.ToString, SubjectCodes.AAI) + 'End If + + If rpt.txtVermerk.Text IsNot Nothing AndAlso rpt.txtVermerk.Text <> "" Then desc.AddNote(rpt.txtVermerk.Text.ToString, SubjectCodes.AAI) + + desc.AddNote("Es bestehen Rabatt- und Bonusvereinbarungen.", SubjectCodes.AAK) + + desc.SetBuyer(ROW("RechnungsName 1") & " " & Rechnugnsname2, RechnungsOrt, RechnungsOrt, RechnungsStraße, GetCountryCodeFromLandKZ(RechnungsLandKz, vatBuyer), IIf(Not IsDBNull(ROW("RechnungsKundenNr")), ROW("RechnungsKundenNr"), "")) + desc.SetSeller(FIRMA.Firma_Bez, FIRMA.Firma_Ort, FIRMA.Firma_Ort, FIRMA.Firma_Straße, GetCountryCodeFromLandKZ(FIRMA.Firma_LandKz, vatSeller)) + + If FIRMA.Firma_Steuernummer IsNot Nothing Then desc.AddSellerTaxRegistration(FIRMA.Firma_Steuernummer, TaxRegistrationSchemeID.FC) + desc.AddSellerTaxRegistration(FIRMA.Firma_UID.ToString.Replace("UID: ", ""), TaxRegistrationSchemeID.VA) + + ' Optionally, to support Peppol----------------------------- + + + If RE_UID <> "" Then + desc.AddBuyerTaxRegistration(RE_UID, TaxRegistrationSchemeID.VA) + If vatBuyer Then + desc.SetBuyerElectronicAddress(RE_UID, vatBuyer) + desc.SetSellerElectronicAddress(FIRMA.Firma_UID.ToString.Replace("UID: ", ""), vatSeller) + End If + + End If + + + Dim steuerProzent As Double = SQL.DLookup(" isnull([Steuersatz %],0)", "[Steuertabelle] ", "[Steuerschlüssel]='" & ROW("Steuerschlüssel") & "'", "FMZOLL", 0) + Dim steuerProzenFaktor As Double = 0 + If steuerProzent > 0 AndAlso steuerProzent < 1 Then + steuerProzenFaktor = steuerProzent * 100 + End If + + Dim einzelpreis As Double = 0 + Dim sumNetto As Double = 0 + + + For Each pos As DataRow In SR_DT.Rows + + Dim SteuerpflichtigerBetrag As Double = 0 + Dim SteuerfreierBetrag As Double = 0 + Dim anzahl As Double = 0 + Dim bez As String = "" + + Dim einzepreis = 0 + + einzelpreis = IIf(pos.Item("SteuerpflichtigerBetrag") > 0, pos.Item("SteuerpflichtigerBetrag") / checkNull(pos.Item("Anzahl")), pos.Item("SteuerfreierBetrag") / checkNull(pos.Item("Anzahl"))) + + Dim tradeLineItemNew As TradeLineItem = desc.AddTradeLineItem( + name:=checkNull(pos.Item("LeistungsBez")), + billedQuantity:=Convert.ToDecimal(checkNull(pos.Item("Anzahl"))), + unitCode:=QuantityCodes.C62, ' immer in Stück + netUnitPrice:=Convert.ToDecimal(einzelpreis), + grossUnitPrice:=Convert.ToDecimal(einzelpreis), + categoryCode:=IIf(pos.Item("SteuerpflichtigerBetrag") > 0, TaxCategoryCodes.S, TaxCategoryCodes.Z), + taxPercent:=IIf(pos.Item("SteuerpflichtigerBetrag") > 0, Convert.ToDecimal(steuerProzent * 100), 0), + taxType:=IIf(pos.Item("SteuerpflichtigerBetrag") > 0, TaxTypes.VAT, TaxTypes.VAT) + ) + Dim netUnitPrice = Convert.ToDecimal(einzelpreis) + Dim netPricePos = netUnitPrice * Convert.ToDecimal(checkNull(pos.Item("Anzahl"))) + sumNetto += netPricePos + + + + 'For Each search As GrapeCity.ActiveReports.SectionReportModel.ARControl In rpt.Detail.Controls + ' If search.Name = "lblAnzahl" Then + ' anzahl = IIf(DirectCast(search, GrapeCity.ActiveReports.SectionReportModel.Label).[Text] <> "", DirectCast(search, GrapeCity.ActiveReports.SectionReportModel.Label).[Text], 0) + ' End If + + ' If search.Name = "lblSteuerpflichtig" Then + ' SteuerpflichtigerBetrag = IIf(DirectCast(search, GrapeCity.ActiveReports.SectionReportModel.Label).[Text] <> "", DirectCast(search, GrapeCity.ActiveReports.SectionReportModel.Label).[Text], 0) + ' End If + + ' If search.Name = "lblSteuerfrei" Then + ' SteuerfreierBetrag = IIf(DirectCast(search, GrapeCity.ActiveReports.SectionReportModel.Label).[Text] <> "", DirectCast(search, GrapeCity.ActiveReports.SectionReportModel.Label).[Text], 0) + ' End If + + ' If search.Name = "txtLeistung" Then + ' bez = IIf(DirectCast(search, GrapeCity.ActiveReports.SectionReportModel.TextBox).[Text] <> "", DirectCast(search, GrapeCity.ActiveReports.SectionReportModel.TextBox).[Text], 0) + ' End If + + 'If bez <> "" Then + + ' einzelpreis = IIf(SteuerpflichtigerBetrag > 0, SteuerpflichtigerBetrag / checkNull(anzahl), SteuerfreierBetrag / checkNull(anzahl)) + + ' Dim tradeLineItemNew As TradeLineItem = desc.AddTradeLineItem( + ' name:=checkNull(bez), + ' billedQuantity:=Convert.ToDecimal(checkNull(anzahl)), + ' unitCode:=QuantityCodes.C62, ' immer in Stück + ' netUnitPrice:=Convert.ToDecimal(einzelpreis), + ' grossUnitPrice:=Convert.ToDecimal(einzelpreis), + ' categoryCode:=IIf(SteuerpflichtigerBetrag > 0, TaxCategoryCodes.S, TaxCategoryCodes.Z), + ' taxPercent:=IIf(SteuerpflichtigerBetrag > 0, Convert.ToDecimal(steuerProzent * 100), 0), + ' taxType:=IIf(SteuerpflichtigerBetrag > 0, TaxTypes.VAT, TaxTypes.VAT) + ' ) + ' Dim netUnitPrice = Convert.ToDecimal(einzelpreis) + ' Dim netPricePos = netUnitPrice * Convert.ToDecimal(checkNull(anzahl)) + ' sumNetto += netPricePos + + ' bez = "" + + ' End If + + 'Next + + Next + + + 'Summe aller Rechnungspositions-Nettobeträge der Rechnung + Dim lineTotalAmont = sumNetto + 'Der Gesamtbetrag der Umsatzsteuer für die Rechnung, + Dim taxTotalAmount = IIf(Gesamt_RG_BetragSteuerpflichtig <> 0, Math.Round(Convert.ToDecimal(Gesamt_RG_BetragSteuerpflichtig) / (100 + steuerProzenFaktor) * steuerProzenFaktor, 2), 0) + ' Die Gesamtsumme der Rechnung ohne Umsatzsteuer ' RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag + 0 - 0 + Dim taxBasisAmount = Convert.ToDecimal(Gesamt_RG_BetragSteuerfrei + Gesamt_RG_BetragSteuerpflichtig + 0 - 0 - taxTotalAmount) + 'Der Gesamtbetrag der Rechnung mit Umsatzsteuer + Dim grandTotalAmount = Convert.ToDecimal(Gesamt_RG_BetragSteuerfrei + Gesamt_RG_BetragSteuerpflichtig) + 'Der ausstehende Betrag, um dessen Zahlung gebeten wird. Dieser Betrag ist der Rechnungsgesamtbetrag einschließlich Umsatzsteuer abzüglich des im Voraus gezahlten Betrages.Im Falle einer vollständig beglichenen Rechnung ist dieser Betrag gleich null. Der Betrag kann negativ sein; In diesem Fall schuldet der Verkäufer dem Käufer den Betrag + Dim duePayableAmount = Convert.ToDecimal(Gesamt_RG_BetragSteuerfrei + Gesamt_RG_BetragSteuerpflichtig) + + desc.SetTotals( + lineTotalAmount:=Convert.ToDecimal(lineTotalAmont), + chargeTotalAmount:=0, 'Summe aller in der Rechnung enthaltenen Zuschläge der Dokumentenebene + allowanceTotalAmount:=0, 'Summe aller in der Rechnung enthaltenen Abschläge der Dokumenteneben + taxBasisAmount:=Convert.ToDecimal(taxBasisAmount), + taxTotalAmount:=Convert.ToDecimal(taxTotalAmount), + grandTotalAmount:=Convert.ToDecimal(grandTotalAmount), + totalPrepaidAmount:=0, 'Die Summe der im Voraus gezahlten Beträge + duePayableAmount:=Convert.ToDecimal(duePayableAmount), + roundingAmount:=0 'Der Betrag, der dem Rechnungsgesamtbetrag hinzuzufügen ist, um den zu zahlenden Betrag zu runden +) + + desc.AddTradePaymentTerms(rpt.Label2.Text, zahlungszieldatum) + + Dim isReverseCharge = IIf(getReverseChargeSumme(FIRMA, ROW("RechnungsLandKz"), ROW("RechnungsNr"), ROW("RechnungsDatum"), "") > 0, True, False) + + + If Gesamt_RG_BetragSteuerfrei > 0 Then + desc.AddApplicableTradeTax(Convert.ToDecimal(Gesamt_RG_BetragSteuerfrei), 0, TaxTypes.VAT, TaxCategoryCodes.Z) + End If + + If Gesamt_RG_BetragSteuerpflichtig > 0 Then + desc.AddApplicableTradeTax(Convert.ToDecimal(taxBasisAmount - Gesamt_RG_BetragSteuerfrei), Convert.ToDecimal(steuerProzenFaktor), Convert.ToDecimal(taxTotalAmount), TaxTypes.VAT, IIf(isReverseCharge, TaxCategoryCodes.AE, TaxCategoryCodes.S)) + End If + + Dim tmpPathZugpferd = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("ZUGFeRD_Invoice_" & RechnungsNr, ".xml", True, False) + Dim stream As FileStream = New FileStream(tmpPathZugpferd, FileMode.Create, FileAccess.Write) + desc.Save(stream, ZUGFeRDVersion.Version20, Profile.Comfort) + + stream.Flush() + stream.Close() + Return tmpPathZugpferd - If RECHNUNG.SteuerpflichtigerGesamtbetrag > 0 Then - desc.AddApplicableTradeTax(Convert.ToDecimal(taxBasisAmount), Convert.ToDecimal(steuerProzenFaktor), Convert.ToDecimal(taxTotalAmount), TaxTypes.VAT, IIf(isReverseCharge, TaxCategoryCodes.AE, TaxCategoryCodes.S)) End If - Dim tmpPathZugpferd = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("ZUGFeRD_Invoice_" & RECHNUNG.RechnungsNr, ".xml", True, False) - Dim stream As FileStream = New FileStream(tmpPathZugpferd, FileMode.Create, FileAccess.Write) - desc.Save(stream, ZUGFeRDVersion.Version20, Profile.Comfort) - stream.Flush() - stream.Close() - - Return tmpPathZugpferd End Function @@ -3592,6 +3824,7 @@ Public Class cFakturierung sumSteuerpflichtig += stPfl sumSteuerfrei += stFrei + ' Anz += 1 ' gesAnz += 1 @@ -3657,6 +3890,19 @@ Public Class cFakturierung p.NeverEmbedFonts = "" p.Export(rpt.Document, tmpPath) + Dim Paramslist As New cParameterList(VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID) + Dim enableZugpferd = Paramslist.GET_PARAMETER_VALUE_BOOL("ZUGFeRD") + If enableZugpferd Then + tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.addAttachementToPDF(tmpPath, createZUGFeRD(False, Nothing, dt, rpt)) + Else + + Dim Zugferdpath = createZUGFeRD(False, Nothing, dt, rpt) + Dim fileInfo_ZP As New FileInfo(Zugferdpath) + Dim ZUGF_DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "ZUGFERD", Now().Year & "_SR", "", "", fileInfo_ZP.Name, -1, False) + ZUGF_DS.uploadDataToDATENSERVER(Zugferdpath, fileInfo_ZP.Name, fileInfo_ZP.Extension,,,, True) + + End If + Select Case If(Rechnugnsdruck > 0, Rechnugnsdruck, If(AD.Rechnungsdruck, 0))'If(AD.Rechnungsdruck, 0) Case 0, 1 'DRUCKEN diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index e32a174f..43f8b0cd 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -874,6 +874,12 @@ Component + + usrcntlFremdrechnungen.vb + + + UserControl + frmUSTVoffeneAntraege.vb @@ -3376,6 +3382,9 @@ usrCntlSDLLeistungVERAGCardNEU.vb + + usrcntlFremdrechnungen.vb + usrCntlMDMDatenverarbeitungAuswertungen_divers.vb diff --git a/SDL/USTV/usrCntlUSTV.Designer.vb b/SDL/USTV/usrCntlUSTV.Designer.vb index ca72acba..fd70b88c 100644 --- a/SDL/USTV/usrCntlUSTV.Designer.vb +++ b/SDL/USTV/usrCntlUSTV.Designer.vb @@ -23,7 +23,7 @@ Partial Class usrCntlUSTV Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnlFilter = New System.Windows.Forms.Panel() Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Label1 = New System.Windows.Forms.Label() @@ -77,9 +77,9 @@ Partial Class usrCntlUSTV Me.pnlFilter.BackColor = System.Drawing.Color.White Me.pnlFilter.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.pnlFilter.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlFilter.Location = New System.Drawing.Point(0, 77) + Me.pnlFilter.Location = New System.Drawing.Point(0, 81) Me.pnlFilter.Name = "pnlFilter" - Me.pnlFilter.Size = New System.Drawing.Size(1627, 31) + Me.pnlFilter.Size = New System.Drawing.Size(1627, 27) Me.pnlFilter.TabIndex = 6 ' 'dgvUSTV @@ -87,8 +87,8 @@ Partial Class usrCntlUSTV Me.dgvUSTV.AKTUALISIERUNGS_INTERVALL = -1 Me.dgvUSTV.AllowUserToAddRows = False Me.dgvUSTV.AllowUserToDeleteRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvUSTV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUSTV.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvUSTV.Location = New System.Drawing.Point(0, 108) @@ -164,24 +164,24 @@ Partial Class usrCntlUSTV 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.ForeColor = System.Drawing.Color.Black - Me.txtRisiko.Location = New System.Drawing.Point(882, 45) + Me.txtRisiko.Location = New System.Drawing.Point(1161, 28) 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(91, 20) + Me.txtRisiko.Size = New System.Drawing.Size(107, 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(821, 48) + Me.Label10.Location = New System.Drawing.Point(1116, 31) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(36, 13) + Me.Label10.Size = New System.Drawing.Size(45, 13) Me.Label10.TabIndex = 55 - Me.Label10.Text = "Risiko" + Me.Label10.Text = "= Risiko" ' 'txtOPSaldo ' @@ -199,7 +199,7 @@ Partial Class usrCntlUSTV 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.ForeColor = System.Drawing.Color.Black - Me.txtOPSaldo.Location = New System.Drawing.Point(882, 25) + Me.txtOPSaldo.Location = New System.Drawing.Point(999, 0) Me.txtOPSaldo.MaxLineLength = -1 Me.txtOPSaldo.MaxLines_Warning = "" Me.txtOPSaldo.MaxLines_Warning_Label = Nothing @@ -212,7 +212,7 @@ Partial Class usrCntlUSTV ' 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(824, 32) + Me.Label11.Location = New System.Drawing.Point(941, 6) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(52, 13) Me.Label11.TabIndex = 53 @@ -222,7 +222,7 @@ Partial Class usrCntlUSTV ' Me.Label9.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(1483, 52) + Me.Label9.Location = New System.Drawing.Point(1512, 52) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(102, 13) Me.Label9.TabIndex = 52 @@ -244,13 +244,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(1321, 45) + Me.txtSumDiff.Location = New System.Drawing.Point(999, 19) 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(107, 20) + Me.txtSumDiff.Size = New System.Drawing.Size(91, 20) Me.txtSumDiff.TabIndex = 32 ' 'btnKundendatenaktualisieren @@ -260,7 +260,7 @@ Partial Class usrCntlUSTV Me.btnKundendatenaktualisieren.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnKundendatenaktualisieren.ForeColor = System.Drawing.Color.Black Me.btnKundendatenaktualisieren.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnKundendatenaktualisieren.Location = New System.Drawing.Point(1468, 6) + Me.btnKundendatenaktualisieren.Location = New System.Drawing.Point(1497, 6) Me.btnKundendatenaktualisieren.Name = "btnKundendatenaktualisieren" Me.btnKundendatenaktualisieren.Size = New System.Drawing.Size(127, 39) Me.btnKundendatenaktualisieren.TabIndex = 33 @@ -283,7 +283,7 @@ 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(1321, 25) + Me.txtSumErst.Location = New System.Drawing.Point(1381, 25) Me.txtSumErst.MaxLineLength = -1 Me.txtSumErst.MaxLines_Warning = "" Me.txtSumErst.MaxLines_Warning_Label = Nothing @@ -308,7 +308,7 @@ 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(1321, 5) + Me.txtSumUst.Location = New System.Drawing.Point(1381, 5) Me.txtSumUst.MaxLineLength = -1 Me.txtSumUst.MaxLines_Warning = "" Me.txtSumUst.MaxLines_Warning_Label = Nothing @@ -333,7 +333,7 @@ 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(1093, 45) + Me.txtVZBetrag.Location = New System.Drawing.Point(1161, 5) Me.txtVZBetrag.MaxLineLength = -1 Me.txtVZBetrag.MaxLines_Warning = "" Me.txtVZBetrag.MaxLines_Warning_Label = Nothing @@ -346,27 +346,27 @@ Partial Class usrCntlUSTV ' 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(1216, 48) + Me.Label5.Location = New System.Drawing.Point(914, 27) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(79, 13) + Me.Label5.Size = New System.Drawing.Size(85, 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(1032, 48) + Me.Label8.Location = New System.Drawing.Point(1100, 8) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(55, 13) + Me.Label8.Size = New System.Drawing.Size(64, 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(1216, 28) + Me.Label4.Location = New System.Drawing.Point(1276, 28) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(90, 13) Me.Label4.TabIndex = 28 @@ -388,20 +388,20 @@ Partial Class usrCntlUSTV 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.ForeColor = System.Drawing.Color.Black - Me.txt3470Betrag.Location = New System.Drawing.Point(1093, 25) + Me.txt3470Betrag.Location = New System.Drawing.Point(999, 40) 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(107, 20) + Me.txt3470Betrag.Size = New System.Drawing.Size(91, 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(1216, 7) + Me.Label3.Location = New System.Drawing.Point(1276, 7) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(59, 13) Me.Label3.TabIndex = 27 @@ -411,11 +411,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(1056, 28) + Me.Label7.Location = New System.Drawing.Point(956, 43) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(31, 13) + Me.Label7.Size = New System.Drawing.Size(37, 13) Me.Label7.TabIndex = 48 - Me.Label7.Text = "3470" + Me.Label7.Text = "- 3470" ' 'txtVorschaubetrGes ' @@ -433,24 +433,24 @@ 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(1093, 4) + Me.txtVorschaubetrGes.Location = New System.Drawing.Point(999, 60) Me.txtVorschaubetrGes.MaxLineLength = -1 Me.txtVorschaubetrGes.MaxLines_Warning = "" Me.txtVorschaubetrGes.MaxLines_Warning_Label = Nothing Me.txtVorschaubetrGes.Name = "txtVorschaubetrGes" Me.txtVorschaubetrGes.ReadOnly = True - Me.txtVorschaubetrGes.Size = New System.Drawing.Size(107, 20) + Me.txtVorschaubetrGes.Size = New System.Drawing.Size(91, 20) Me.txtVorschaubetrGes.TabIndex = 34 ' 'Label6 ' 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(969, 7) + Me.Label6.Location = New System.Drawing.Point(872, 63) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(121, 13) + Me.Label6.Size = New System.Drawing.Size(127, 13) Me.Label6.TabIndex = 33 - Me.Label6.Text = "Vorschaubetrag-Gesamt" + Me.Label6.Text = "- Vorschaubetrag-Gesamt" ' 'cbxDifferenzbetrag ' diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 1e3c1805..10420324 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -749,4 +749,5 @@ Public Class usrCntlUSTV End If End Sub + End Class diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index ee6dadad..b151a2cb 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -45,7 +45,6 @@ Partial Class frmKundenblatt 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.lblAdressenzusatz = New System.Windows.Forms.TextBox() @@ -129,10 +128,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() @@ -163,7 +160,6 @@ Partial Class frmKundenblatt Me.scanVertragVeragKd = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() Me.tbBesuchsberichte = 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() @@ -174,7 +170,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.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem() @@ -200,6 +195,12 @@ 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.tbFremdrechnungen = New System.Windows.Forms.TabPage() + 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() @@ -254,7 +255,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(325, 6) + Me.pnlInfo.Location = New System.Drawing.Point(332, 6) Me.pnlInfo.Name = "pnlInfo" Me.pnlInfo.Size = New System.Drawing.Size(602, 35) Me.pnlInfo.TabIndex = 1 @@ -276,7 +277,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(1630, 1033) + Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 1067) Me.tbFirmendaten.TabIndex = 3 Me.tbFirmendaten.Text = "Firmendaten" ' @@ -286,19 +287,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(1624, 1027) + Me.Panel4.Size = New System.Drawing.Size(1624, 1061) 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(1624, 1027) - Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 - ' 'tbcntrMain ' Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons @@ -314,7 +305,7 @@ 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(1638, 1062) + Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1096) Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein @@ -355,7 +346,7 @@ 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(1630, 1033) + Me.tbAllgemein.Size = New System.Drawing.Size(1644, 1084) Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' @@ -465,7 +456,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(714, 434) + Me.dgvOffenePosten.Size = New System.Drawing.Size(714, 485) Me.dgvOffenePosten.TabIndex = 175 ' 'btnOP @@ -805,7 +796,7 @@ Partial Class frmKundenblatt Me.dgvSperrliste.Name = "dgvSperrliste" Me.dgvSperrliste.ReadOnly = True Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle7 - Me.dgvSperrliste.Size = New System.Drawing.Size(432, 989) + Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1040) Me.dgvSperrliste.TabIndex = 23 ' 'PictureBox2 @@ -859,7 +850,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(1630, 1033) + Me.tbZoll.Size = New System.Drawing.Size(1630, 1067) Me.tbZoll.TabIndex = 9 Me.tbZoll.Text = "ZOLL" Me.tbZoll.UseVisualStyleBackColor = True @@ -871,7 +862,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(1624, 1027) + Me.tbcntrZOLL.Size = New System.Drawing.Size(1624, 1061) Me.tbcntrZOLL.TabIndex = 0 ' 'tabZoll_Artikel @@ -879,7 +870,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(1616, 1001) + Me.tabZoll_Artikel.Size = New System.Drawing.Size(1616, 1035) Me.tabZoll_Artikel.TabIndex = 1 Me.tabZoll_Artikel.Text = "Artikel" Me.tabZoll_Artikel.UseVisualStyleBackColor = True @@ -890,7 +881,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(1630, 1033) + Me.tbMdm.Size = New System.Drawing.Size(1644, 1067) Me.tbMdm.TabIndex = 10 Me.tbMdm.Text = "MDM" Me.tbMdm.UseVisualStyleBackColor = True @@ -903,12 +894,13 @@ Partial Class frmKundenblatt Me.tbcntrMDM.Controls.Add(Me.tbVERAGCard) Me.tbcntrMDM.Controls.Add(Me.tbDokumente) Me.tbcntrMDM.Controls.Add(Me.tbBesuchsberichte) + Me.tbcntrMDM.Controls.Add(Me.tbFremdrechnungen) Me.tbcntrMDM.Dock = System.Windows.Forms.DockStyle.Fill Me.tbcntrMDM.Location = New System.Drawing.Point(3, 3) Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMDM.Name = "tbcntrMDM" Me.tbcntrMDM.SelectedIndex = 0 - Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 1027) + Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 1061) Me.tbcntrMDM.TabIndex = 0 ' 'tbSDL @@ -920,7 +912,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(1616, 1001) + Me.tbSDL.Size = New System.Drawing.Size(1630, 1052) Me.tbSDL.TabIndex = 5 Me.tbSDL.Text = "SDL-Leistungen" Me.tbSDL.UseVisualStyleBackColor = True @@ -962,7 +954,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle13 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 805) + Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 856) Me.dgvSDLLeistungenFull.TabIndex = 5 ' 'Panel6 @@ -976,7 +968,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(1610, 47) + Me.Panel6.Size = New System.Drawing.Size(1624, 47) Me.Panel6.TabIndex = 178 ' 'Label28 @@ -1067,9 +1059,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, 855) + Me.Panel5.Location = New System.Drawing.Point(3, 906) Me.Panel5.Name = "Panel5" - Me.Panel5.Size = New System.Drawing.Size(1610, 143) + Me.Panel5.Size = New System.Drawing.Size(1624, 143) Me.Panel5.TabIndex = 177 ' 'Button7 @@ -1450,21 +1442,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, 1052) 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) @@ -1472,7 +1454,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, 1052) Me.tbLKW.TabIndex = 4 Me.tbLKW.Text = "LKWs" Me.tbLKW.UseVisualStyleBackColor = True @@ -1484,22 +1466,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, 1046) 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) @@ -1508,7 +1477,7 @@ 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, 1046) Me.pnlLKW.TabIndex = 3 ' 'dgvLKW @@ -1549,7 +1518,7 @@ Partial Class frmKundenblatt Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle17 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, 872) Me.dgvLKW.TabIndex = 2 ' 'pnlLKWBottom @@ -1561,7 +1530,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, 934) Me.pnlLKWBottom.Name = "pnlLKWBottom" Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112) Me.pnlLKWBottom.TabIndex = 3 @@ -1702,7 +1671,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, 1052) Me.tbVERAGCard.TabIndex = 6 Me.tbVERAGCard.Text = "VERAG Card" Me.tbVERAGCard.UseVisualStyleBackColor = True @@ -1714,7 +1683,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, 1046) Me.Panel3.TabIndex = 0 ' 'tbDokumente @@ -1732,7 +1701,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, 1052) Me.tbDokumente.TabIndex = 8 Me.tbDokumente.Text = "Dokumente" Me.tbDokumente.UseVisualStyleBackColor = True @@ -1930,7 +1899,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, 1052) Me.tbBesuchsberichte.TabIndex = 9 Me.tbBesuchsberichte.Text = "Besuchsberichte" Me.tbBesuchsberichte.UseVisualStyleBackColor = True @@ -1941,27 +1910,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(1630, 1033) + Me.tbOfferte.Size = New System.Drawing.Size(1630, 1067) 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(1630, 1033) - 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(1630, 1033) + Me.tbUSTV.Size = New System.Drawing.Size(1630, 1067) Me.tbUSTV.TabIndex = 12 Me.tbUSTV.Text = "USTV" Me.tbUSTV.UseVisualStyleBackColor = True @@ -1975,7 +1934,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(1630, 1033) + Me.tbcntrUSTV.Size = New System.Drawing.Size(1630, 1067) Me.tbcntrUSTV.TabIndex = 1 ' 'tbUSTVDokumente @@ -1988,7 +1947,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(1622, 1007) + Me.tbUSTVDokumente.Size = New System.Drawing.Size(1622, 1041) Me.tbUSTVDokumente.TabIndex = 8 Me.tbUSTVDokumente.Text = "Dokumente" Me.tbUSTVDokumente.UseVisualStyleBackColor = True @@ -2086,19 +2045,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(1622, 1041) 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 - ' 'cntxtExcel ' Me.cntxtExcel.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -2124,7 +2075,7 @@ Partial Class frmKundenblatt Me.btnAbfVerb.BackColor = System.Drawing.Color.White Me.btnAbfVerb.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnAbfVerb.ForeColor = System.Drawing.Color.Black - Me.btnAbfVerb.Location = New System.Drawing.Point(1010, 43) + Me.btnAbfVerb.Location = New System.Drawing.Point(1024, 43) Me.btnAbfVerb.Name = "btnAbfVerb" Me.btnAbfVerb.Size = New System.Drawing.Size(165, 25) Me.btnAbfVerb.TabIndex = 1 @@ -2138,7 +2089,7 @@ Partial Class frmKundenblatt Me.lblAbfVerb.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.lblAbfVerb.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAbfVerb.ForeColor = System.Drawing.Color.White - Me.lblAbfVerb.Location = New System.Drawing.Point(1396, 117) + Me.lblAbfVerb.Location = New System.Drawing.Point(1410, 117) Me.lblAbfVerb.Name = "lblAbfVerb" Me.lblAbfVerb.Size = New System.Drawing.Size(242, 20) Me.lblAbfVerb.TabIndex = 2 @@ -2188,7 +2139,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(1638, 81) + Me.mne.Size = New System.Drawing.Size(1652, 81) Me.mne.TabIndex = 3 Me.mne.Text = "mnue" ' @@ -2241,7 +2192,6 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' @@ -2301,7 +2251,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(1638, 112) + Me.pnl.Size = New System.Drawing.Size(1652, 112) Me.pnl.TabIndex = 0 ' 'lblINAKTIV @@ -2346,7 +2296,7 @@ Partial Class frmKundenblatt Me.KdSearchBox1.Name = "KdSearchBox1" Me.KdSearchBox1.nurAktive = False Me.KdSearchBox1.searchActive = True - Me.KdSearchBox1.Size = New System.Drawing.Size(1638, 34) + Me.KdSearchBox1.Size = New System.Drawing.Size(1652, 34) Me.KdSearchBox1.TabIndex = 0 Me.KdSearchBox1.TIMER_SEARCH = True Me.KdSearchBox1.usrcntl = Nothing @@ -2375,13 +2325,73 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' + 'tbFremdrechnungen + ' + Me.tbFremdrechnungen.Location = New System.Drawing.Point(4, 22) + Me.tbFremdrechnungen.Name = "tbFremdrechnungen" + Me.tbFremdrechnungen.Size = New System.Drawing.Size(1630, 1035) + Me.tbFremdrechnungen.TabIndex = 10 + Me.tbFremdrechnungen.Text = "Fremdrechnungen" + Me.tbFremdrechnungen.UseVisualStyleBackColor = True + ' + '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(1624, 1061) + 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, 1046) + 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, 1000) + 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(1630, 1067) + 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(1616, 1035) + Me.UsrCntlUSTV.TabIndex = 0 + ' 'frmKundenblatt ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1595, 1191) + Me.ClientSize = New System.Drawing.Size(1595, 1225) Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain) @@ -2617,4 +2627,5 @@ Partial Class frmKundenblatt Friend WithEvents cboFirmaFMZOLL As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents lblAdressenzusatz As TextBox Friend WithEvents Button7 As Button + Friend WithEvents tbFremdrechnungen As TabPage End Class diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index 3632b69a..b1cad625 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -273,6 +273,8 @@ Public Class frmKundenblatt scanSonstiges.INIT(kdNr, "KUNDENDATEN") scanUebernahmebestätigungen.INIT(kdNr, "KUNDENDATEN", "Übernahmebestätigungen") Case "tbBesuchsberichte" : initTABBesuchsberichte() + Case "tbFremdrechnungen" : initTABFremdrechnungen() + End Select Case "tbUSTV" Select Case tbcntrUSTV.SelectedTab.Name @@ -353,6 +355,17 @@ Public Class frmKundenblatt tbBesuchsberichte.Controls.Add(usrcntlTMP) End If End Sub + + Sub initTABFremdrechnungen() + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("MDM_Fakturierung", Me) = 0 Then + + Dim usrcntlTMP As New usrcntlFremdrechnungen + usrcntlTMP.Dock = DockStyle.Fill + usrcntlTMP.kdNr = kdNr + tbFremdrechnungen.Controls.Clear() + tbFremdrechnungen.Controls.Add(usrcntlTMP) + End If + End Sub Sub initTABSDLDATEN() If False Then @@ -960,6 +973,8 @@ Public Class frmKundenblatt End With End Sub + + 'initialisieren der Offerte-CBO ' Private Sub initOfferte(sender As Object, e As EventArgs) 'Dim offerte As List(Of cOffert) = kundenSQL.getOfferte() diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index 1f06ef2c..933ddb4b 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -1092,7 +1092,7 @@ Public Class usrCntlCBAM 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) + Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value,, False) btnCBAM_DS_DAKOSY_Deteil.Tag = path btnCBAM_DS_DAKOSY_Deteil.Enabled = True btnCBAM_DS_DAKOSY_Copy.Enabled = True diff --git a/SDL/mdm/usrcntlFremdrechnungen.Designer.vb b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb new file mode 100644 index 00000000..71a6888a --- /dev/null +++ b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb @@ -0,0 +1,553 @@ + +Partial Class usrcntlFremdrechnungen + Inherits System.Windows.Forms.UserControl + + 'UserControl ü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 + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + '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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Me.DetailsAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel() + Me.btnSDL_Alle = New System.Windows.Forms.Button() + Me.btnSDL_FREJUS = New System.Windows.Forms.Button() + Me.btnSDL_Hugo = New System.Windows.Forms.Button() + Me.btnSDL_IDS = New System.Windows.Forms.Button() + Me.btnSDL_MautMSE = New System.Windows.Forms.Button() + Me.btnSDL_UTA = New System.Windows.Forms.Button() + Me.btnVERAGCardNew = New System.Windows.Forms.Button() + Me.btnSDL_PLOSE = New System.Windows.Forms.Button() + Me.btnFilter = New System.Windows.Forms.Button() + Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.KundenblattAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.Button1 = New System.Windows.Forms.Button() + Me.cbxMax200Eintrage = New System.Windows.Forms.CheckBox() + Me.lblEinträge = New System.Windows.Forms.Label() + Me.Button4 = New System.Windows.Forms.Button() + Me.Button5 = New System.Windows.Forms.Button() + Me.Label3 = New System.Windows.Forms.Label() + Me.Button8 = New System.Windows.Forms.Button() + Me.Panel3 = New System.Windows.Forms.Panel() + Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() + Me.dgvSDL = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.UsrCntlDatenDetails1 = New SDL.usrCntlDatenDetails() + Me.Panel4 = New System.Windows.Forms.Panel() + Me.pnlTest = New System.Windows.Forms.Panel() + Me.dgvFILTER = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem() + Me.btnSDL_RMC = New System.Windows.Forms.Button() + Me.FlowLayoutPanel.SuspendLayout() + Me.ContextMenuStrip1.SuspendLayout() + Me.Panel1.SuspendLayout() + Me.Panel3.SuspendLayout() + CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainer1.Panel1.SuspendLayout() + Me.SplitContainer1.Panel2.SuspendLayout() + Me.SplitContainer1.SuspendLayout() + CType(Me.dgvSDL, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel4.SuspendLayout() + Me.pnlTest.SuspendLayout() + CType(Me.dgvFILTER, System.ComponentModel.ISupportInitialize).BeginInit() + Me.cntxtExcel.SuspendLayout() + Me.SuspendLayout() + ' + 'DetailsAnzeigenToolStripMenuItem + ' + Me.DetailsAnzeigenToolStripMenuItem.Name = "DetailsAnzeigenToolStripMenuItem" + Me.DetailsAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(189, 22) + Me.DetailsAnzeigenToolStripMenuItem.Text = "Details anzeigen" + ' + 'FlowLayoutPanel + ' + Me.FlowLayoutPanel.AutoScroll = True + Me.FlowLayoutPanel.BackColor = System.Drawing.Color.White + Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_Alle) + Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_FREJUS) + Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_Hugo) + Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_IDS) + Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_MautMSE) + Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_UTA) + Me.FlowLayoutPanel.Controls.Add(Me.btnVERAGCardNew) + Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_PLOSE) + Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_RMC) + Me.FlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill + Me.FlowLayoutPanel.Location = New System.Drawing.Point(0, 0) + Me.FlowLayoutPanel.Margin = New System.Windows.Forms.Padding(0) + Me.FlowLayoutPanel.Name = "FlowLayoutPanel" + Me.FlowLayoutPanel.Size = New System.Drawing.Size(1356, 78) + Me.FlowLayoutPanel.TabIndex = 11 + ' + 'btnSDL_Alle + ' + Me.btnSDL_Alle.Cursor = System.Windows.Forms.Cursors.Default + Me.btnSDL_Alle.FlatAppearance.BorderSize = 0 + Me.btnSDL_Alle.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSDL_Alle.ForeColor = System.Drawing.Color.Black + Me.btnSDL_Alle.Image = Global.SDL.My.Resources.Resources.rechnung1 + Me.btnSDL_Alle.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnSDL_Alle.Location = New System.Drawing.Point(0, 0) + Me.btnSDL_Alle.Margin = New System.Windows.Forms.Padding(0) + Me.btnSDL_Alle.Name = "btnSDL_Alle" + Me.btnSDL_Alle.Size = New System.Drawing.Size(78, 64) + Me.btnSDL_Alle.TabIndex = 30 + Me.btnSDL_Alle.Text = "ALLE" + Me.btnSDL_Alle.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnSDL_Alle.UseVisualStyleBackColor = True + ' + 'btnSDL_FREJUS + ' + Me.btnSDL_FREJUS.Cursor = System.Windows.Forms.Cursors.Default + Me.btnSDL_FREJUS.FlatAppearance.BorderSize = 0 + Me.btnSDL_FREJUS.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSDL_FREJUS.ForeColor = System.Drawing.Color.Black + Me.btnSDL_FREJUS.Image = Global.SDL.My.Resources.Resources.frejus + Me.btnSDL_FREJUS.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnSDL_FREJUS.Location = New System.Drawing.Point(78, 0) + Me.btnSDL_FREJUS.Margin = New System.Windows.Forms.Padding(0) + Me.btnSDL_FREJUS.Name = "btnSDL_FREJUS" + Me.btnSDL_FREJUS.Size = New System.Drawing.Size(78, 64) + Me.btnSDL_FREJUS.TabIndex = 35 + Me.btnSDL_FREJUS.Text = "FREJUS" + Me.btnSDL_FREJUS.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnSDL_FREJUS.UseVisualStyleBackColor = True + ' + 'btnSDL_Hugo + ' + Me.btnSDL_Hugo.Cursor = System.Windows.Forms.Cursors.Default + Me.btnSDL_Hugo.FlatAppearance.BorderSize = 0 + Me.btnSDL_Hugo.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSDL_Hugo.ForeColor = System.Drawing.Color.Black + Me.btnSDL_Hugo.Image = Global.SDL.My.Resources.Resources.hugo + Me.btnSDL_Hugo.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnSDL_Hugo.Location = New System.Drawing.Point(156, 0) + Me.btnSDL_Hugo.Margin = New System.Windows.Forms.Padding(0) + Me.btnSDL_Hugo.Name = "btnSDL_Hugo" + Me.btnSDL_Hugo.Size = New System.Drawing.Size(78, 64) + Me.btnSDL_Hugo.TabIndex = 38 + Me.btnSDL_Hugo.Text = "HU-GO" + Me.btnSDL_Hugo.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnSDL_Hugo.UseVisualStyleBackColor = True + ' + 'btnSDL_IDS + ' + Me.btnSDL_IDS.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnSDL_IDS.Cursor = System.Windows.Forms.Cursors.Arrow + Me.btnSDL_IDS.FlatAppearance.BorderSize = 0 + Me.btnSDL_IDS.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSDL_IDS.ForeColor = System.Drawing.Color.Black + Me.btnSDL_IDS.Image = Global.SDL.My.Resources.Resources.ids + Me.btnSDL_IDS.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnSDL_IDS.Location = New System.Drawing.Point(234, 0) + Me.btnSDL_IDS.Margin = New System.Windows.Forms.Padding(0) + Me.btnSDL_IDS.Name = "btnSDL_IDS" + Me.btnSDL_IDS.Size = New System.Drawing.Size(78, 64) + Me.btnSDL_IDS.TabIndex = 23 + Me.btnSDL_IDS.Text = "IDS" + Me.btnSDL_IDS.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnSDL_IDS.UseVisualStyleBackColor = True + ' + 'btnSDL_MautMSE + ' + Me.btnSDL_MautMSE.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnSDL_MautMSE.Cursor = System.Windows.Forms.Cursors.Default + Me.btnSDL_MautMSE.FlatAppearance.BorderSize = 0 + Me.btnSDL_MautMSE.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSDL_MautMSE.ForeColor = System.Drawing.Color.Black + Me.btnSDL_MautMSE.Image = Global.SDL.My.Resources.Resources.mse + Me.btnSDL_MautMSE.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnSDL_MautMSE.Location = New System.Drawing.Point(312, 0) + Me.btnSDL_MautMSE.Margin = New System.Windows.Forms.Padding(0) + Me.btnSDL_MautMSE.Name = "btnSDL_MautMSE" + Me.btnSDL_MautMSE.Size = New System.Drawing.Size(78, 64) + Me.btnSDL_MautMSE.TabIndex = 27 + Me.btnSDL_MautMSE.Text = "MSE" + Me.btnSDL_MautMSE.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnSDL_MautMSE.UseVisualStyleBackColor = True + Me.btnSDL_MautMSE.Visible = False + ' + 'btnSDL_UTA + ' + Me.btnSDL_UTA.Cursor = System.Windows.Forms.Cursors.Default + Me.btnSDL_UTA.FlatAppearance.BorderSize = 0 + Me.btnSDL_UTA.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSDL_UTA.ForeColor = System.Drawing.Color.Black + Me.btnSDL_UTA.Image = Global.SDL.My.Resources.Resources.uta + Me.btnSDL_UTA.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnSDL_UTA.Location = New System.Drawing.Point(390, 0) + Me.btnSDL_UTA.Margin = New System.Windows.Forms.Padding(0) + Me.btnSDL_UTA.Name = "btnSDL_UTA" + Me.btnSDL_UTA.Size = New System.Drawing.Size(78, 64) + Me.btnSDL_UTA.TabIndex = 28 + Me.btnSDL_UTA.Text = "UTA" + Me.btnSDL_UTA.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnSDL_UTA.UseVisualStyleBackColor = True + ' + 'btnVERAGCardNew + ' + Me.btnVERAGCardNew.Cursor = System.Windows.Forms.Cursors.Default + Me.btnVERAGCardNew.FlatAppearance.BorderSize = 0 + Me.btnVERAGCardNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnVERAGCardNew.ForeColor = System.Drawing.Color.Black + Me.btnVERAGCardNew.Image = Global.SDL.My.Resources.Resources.verag_Card1 + Me.btnVERAGCardNew.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnVERAGCardNew.Location = New System.Drawing.Point(468, 0) + Me.btnVERAGCardNew.Margin = New System.Windows.Forms.Padding(0) + Me.btnVERAGCardNew.Name = "btnVERAGCardNew" + Me.btnVERAGCardNew.Size = New System.Drawing.Size(78, 64) + Me.btnVERAGCardNew.TabIndex = 45 + Me.btnVERAGCardNew.Text = "VERAG" + Me.btnVERAGCardNew.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnVERAGCardNew.UseVisualStyleBackColor = True + ' + 'btnSDL_PLOSE + ' + Me.btnSDL_PLOSE.Cursor = System.Windows.Forms.Cursors.Default + Me.btnSDL_PLOSE.FlatAppearance.BorderSize = 0 + Me.btnSDL_PLOSE.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSDL_PLOSE.ForeColor = System.Drawing.Color.Black + Me.btnSDL_PLOSE.Image = Global.SDL.My.Resources.Resources.plose_1 + Me.btnSDL_PLOSE.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnSDL_PLOSE.Location = New System.Drawing.Point(546, 0) + Me.btnSDL_PLOSE.Margin = New System.Windows.Forms.Padding(0) + Me.btnSDL_PLOSE.Name = "btnSDL_PLOSE" + Me.btnSDL_PLOSE.Size = New System.Drawing.Size(92, 64) + Me.btnSDL_PLOSE.TabIndex = 41 + Me.btnSDL_PLOSE.Text = "RoadMaster" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "PLOSE" + Me.btnSDL_PLOSE.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnSDL_PLOSE.UseVisualStyleBackColor = True + ' + 'btnFilter + ' + Me.btnFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnFilter.Location = New System.Drawing.Point(7, 19) + Me.btnFilter.Name = "btnFilter" + Me.btnFilter.Size = New System.Drawing.Size(98, 23) + Me.btnFilter.TabIndex = 39 + Me.btnFilter.Text = "Filter einblenden" + Me.btnFilter.UseVisualStyleBackColor = True + Me.btnFilter.Visible = False + ' + 'ContextMenuStrip1 + ' + Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DetailsAnzeigenToolStripMenuItem, Me.KundenblattAnzeigenToolStripMenuItem}) + Me.ContextMenuStrip1.Name = "ContextMenuStrip1" + Me.ContextMenuStrip1.Size = New System.Drawing.Size(190, 48) + ' + 'KundenblattAnzeigenToolStripMenuItem + ' + Me.KundenblattAnzeigenToolStripMenuItem.Name = "KundenblattAnzeigenToolStripMenuItem" + Me.KundenblattAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(189, 22) + Me.KundenblattAnzeigenToolStripMenuItem.Text = "Kundenblatt anzeigen" + ' + 'Panel1 + ' + Me.Panel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.Panel1.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel1.Controls.Add(Me.Button1) + Me.Panel1.Controls.Add(Me.cbxMax200Eintrage) + Me.Panel1.Controls.Add(Me.lblEinträge) + Me.Panel1.Controls.Add(Me.btnFilter) + Me.Panel1.Controls.Add(Me.Button4) + Me.Panel1.Controls.Add(Me.Button5) + Me.Panel1.Controls.Add(Me.Label3) + Me.Panel1.Controls.Add(Me.Button8) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Right + Me.Panel1.Location = New System.Drawing.Point(1356, 0) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(260, 907) + Me.Panel1.TabIndex = 23 + ' + 'Button1 + ' + Me.Button1.BackgroundImage = Global.SDL.My.Resources.Resources.refresh + Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button1.Location = New System.Drawing.Point(199, 118) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(50, 44) + Me.Button1.TabIndex = 45 + Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button1.UseVisualStyleBackColor = True + ' + 'cbxMax200Eintrage + ' + Me.cbxMax200Eintrage.AutoSize = True + Me.cbxMax200Eintrage.Checked = True + Me.cbxMax200Eintrage.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxMax200Eintrage.Location = New System.Drawing.Point(7, 45) + Me.cbxMax200Eintrage.Name = "cbxMax200Eintrage" + Me.cbxMax200Eintrage.Size = New System.Drawing.Size(111, 17) + Me.cbxMax200Eintrage.TabIndex = 41 + Me.cbxMax200Eintrage.Text = "max. 200 Einträge" + Me.cbxMax200Eintrage.UseVisualStyleBackColor = True + ' + 'lblEinträge + ' + Me.lblEinträge.AutoSize = True + Me.lblEinträge.BackColor = System.Drawing.Color.White + Me.lblEinträge.Location = New System.Drawing.Point(191, 19) + Me.lblEinträge.Name = "lblEinträge" + Me.lblEinträge.Size = New System.Drawing.Size(58, 13) + Me.lblEinträge.TabIndex = 40 + Me.lblEinträge.Text = "0 Einträge " + ' + 'Button4 + ' + Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button4.Image = Global.SDL.My.Resources.Resources.checklist + Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button4.Location = New System.Drawing.Point(7, 118) + Me.Button4.Name = "Button4" + Me.Button4.Size = New System.Drawing.Size(118, 44) + Me.Button4.TabIndex = 21 + Me.Button4.Text = "Details" & Global.Microsoft.VisualBasic.ChrW(10) & "anzeigen" + Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button4.UseVisualStyleBackColor = True + ' + 'Button5 + ' + Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button5.Image = Global.SDL.My.Resources.Resources.kunden + Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button5.Location = New System.Drawing.Point(7, 68) + Me.Button5.Name = "Button5" + Me.Button5.Size = New System.Drawing.Size(118, 44) + Me.Button5.TabIndex = 22 + Me.Button5.Text = "Gehe zum" & Global.Microsoft.VisualBasic.ChrW(10) & "Kundenblatt" + Me.Button5.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button5.UseVisualStyleBackColor = True + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(3, 3) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(53, 13) + Me.Label3.TabIndex = 25 + Me.Label3.Text = "Optionen:" + ' + 'Button8 + ' + Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button8.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button8.Location = New System.Drawing.Point(131, 68) + Me.Button8.Name = "Button8" + Me.Button8.Size = New System.Drawing.Size(118, 44) + Me.Button8.TabIndex = 31 + Me.Button8.Text = "In Excel " & Global.Microsoft.VisualBasic.ChrW(10) & "konvertieren" + Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button8.UseVisualStyleBackColor = True + ' + 'Panel3 + ' + Me.Panel3.AutoScroll = True + Me.Panel3.Controls.Add(Me.SplitContainer1) + Me.Panel3.Controls.Add(Me.Panel4) + Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill + Me.Panel3.Location = New System.Drawing.Point(0, 0) + Me.Panel3.Name = "Panel3" + Me.Panel3.Size = New System.Drawing.Size(1356, 907) + Me.Panel3.TabIndex = 29 + ' + 'SplitContainer1 + ' + Me.SplitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainer1.IsSplitterFixed = True + Me.SplitContainer1.Location = New System.Drawing.Point(0, 108) + Me.SplitContainer1.Name = "SplitContainer1" + Me.SplitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal + ' + 'SplitContainer1.Panel1 + ' + Me.SplitContainer1.Panel1.AutoScroll = True + Me.SplitContainer1.Panel1.Controls.Add(Me.dgvSDL) + ' + 'SplitContainer1.Panel2 + ' + Me.SplitContainer1.Panel2.Controls.Add(Me.UsrCntlDatenDetails1) + Me.SplitContainer1.Panel2MinSize = 234 + Me.SplitContainer1.Size = New System.Drawing.Size(1356, 799) + Me.SplitContainer1.SplitterDistance = 559 + Me.SplitContainer1.TabIndex = 13 + ' + 'dgvSDL + ' + Me.dgvSDL.AKTUALISIERUNGS_INTERVALL = 1000 + Me.dgvSDL.AllowUserToAddRows = False + Me.dgvSDL.AllowUserToDeleteRows = False + Me.dgvSDL.AllowUserToResizeColumns = False + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSDL.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + Me.dgvSDL.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvSDL.Location = New System.Drawing.Point(0, -1) + Me.dgvSDL.Name = "dgvSDL" + Me.dgvSDL.Size = New System.Drawing.Size(1354, 599) + Me.dgvSDL.TabIndex = 29 + ' + 'UsrCntlDatenDetails1 + ' + Me.UsrCntlDatenDetails1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlDatenDetails1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlDatenDetails1.Name = "UsrCntlDatenDetails1" + Me.UsrCntlDatenDetails1.Size = New System.Drawing.Size(1354, 234) + Me.UsrCntlDatenDetails1.TabIndex = 0 + Me.UsrCntlDatenDetails1.Visible = False + ' + 'Panel4 + ' + Me.Panel4.BackColor = System.Drawing.Color.White + Me.Panel4.Controls.Add(Me.FlowLayoutPanel) + Me.Panel4.Controls.Add(Me.pnlTest) + Me.Panel4.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel4.Location = New System.Drawing.Point(0, 0) + Me.Panel4.Name = "Panel4" + Me.Panel4.Size = New System.Drawing.Size(1356, 108) + Me.Panel4.TabIndex = 11 + ' + 'pnlTest + ' + Me.pnlTest.BackColor = System.Drawing.Color.White + Me.pnlTest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlTest.Controls.Add(Me.dgvFILTER) + Me.pnlTest.Dock = System.Windows.Forms.DockStyle.Bottom + Me.pnlTest.Location = New System.Drawing.Point(0, 78) + Me.pnlTest.Name = "pnlTest" + Me.pnlTest.Size = New System.Drawing.Size(1356, 30) + Me.pnlTest.TabIndex = 33 + ' + 'dgvFILTER + ' + Me.dgvFILTER.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvFILTER.AllowUserToAddRows = False + Me.dgvFILTER.AllowUserToDeleteRows = False + Me.dgvFILTER.AllowUserToResizeColumns = False + Me.dgvFILTER.AllowUserToResizeRows = False + Me.dgvFILTER.BackgroundColor = System.Drawing.Color.White + Me.dgvFILTER.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.dgvFILTER.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvFILTER.ColumnHeadersVisible = False + Me.dgvFILTER.Location = New System.Drawing.Point(0, 0) + Me.dgvFILTER.Name = "dgvFILTER" + Me.dgvFILTER.ScrollBars = System.Windows.Forms.ScrollBars.None + Me.dgvFILTER.Size = New System.Drawing.Size(1286, 28) + Me.dgvFILTER.TabIndex = 0 + ' + 'cntxtExcel + ' + Me.cntxtExcel.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem3, Me.ToolStripMenuItem6}) + Me.cntxtExcel.Name = "cntxtExcel" + Me.cntxtExcel.Size = New System.Drawing.Size(211, 48) + Me.cntxtExcel.Text = "Excel" + ' + 'ToolStripMenuItem3 + ' + Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3" + Me.ToolStripMenuItem3.Size = New System.Drawing.Size(210, 22) + Me.ToolStripMenuItem3.Text = "Einfach" + ' + 'ToolStripMenuItem6 + ' + Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6" + Me.ToolStripMenuItem6.Size = New System.Drawing.Size(210, 22) + Me.ToolStripMenuItem6.Text = "Formatiert (dauert länger)" + ' + 'btnSDL_RMC + ' + Me.btnSDL_RMC.Cursor = System.Windows.Forms.Cursors.Default + Me.btnSDL_RMC.FlatAppearance.BorderSize = 0 + Me.btnSDL_RMC.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSDL_RMC.ForeColor = System.Drawing.Color.Black + Me.btnSDL_RMC.Image = Global.SDL.My.Resources.Resources.rechnung1 + Me.btnSDL_RMC.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnSDL_RMC.Location = New System.Drawing.Point(638, 0) + Me.btnSDL_RMC.Margin = New System.Windows.Forms.Padding(0) + Me.btnSDL_RMC.Name = "btnSDL_RMC" + Me.btnSDL_RMC.Size = New System.Drawing.Size(92, 64) + Me.btnSDL_RMC.TabIndex = 46 + Me.btnSDL_RMC.Text = "RMC" + Me.btnSDL_RMC.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnSDL_RMC.UseVisualStyleBackColor = True + ' + 'usrcntlFremdrechnungen + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.Panel3) + Me.Controls.Add(Me.Panel1) + Me.DoubleBuffered = True + Me.Name = "usrcntlFremdrechnungen" + Me.Size = New System.Drawing.Size(1616, 907) + Me.FlowLayoutPanel.ResumeLayout(False) + Me.ContextMenuStrip1.ResumeLayout(False) + Me.Panel1.ResumeLayout(False) + Me.Panel1.PerformLayout() + Me.Panel3.ResumeLayout(False) + Me.SplitContainer1.Panel1.ResumeLayout(False) + Me.SplitContainer1.Panel2.ResumeLayout(False) + CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainer1.ResumeLayout(False) + CType(Me.dgvSDL, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel4.ResumeLayout(False) + Me.pnlTest.ResumeLayout(False) + CType(Me.dgvFILTER, System.ComponentModel.ISupportInitialize).EndInit() + Me.cntxtExcel.ResumeLayout(False) + Me.ResumeLayout(False) + + End Sub + Friend WithEvents DetailsAnzeigenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents FlowLayoutPanel As System.Windows.Forms.FlowLayoutPanel + Friend WithEvents btnSDL_Alle As System.Windows.Forms.Button + Friend WithEvents btnSDL_IDS As System.Windows.Forms.Button + Friend WithEvents btnSDL_MautMSE As System.Windows.Forms.Button + Friend WithEvents btnSDL_UTA As System.Windows.Forms.Button + Friend WithEvents btnSDL_FREJUS As System.Windows.Forms.Button + Friend WithEvents btnSDL_Hugo As System.Windows.Forms.Button + Friend WithEvents btnFilter As System.Windows.Forms.Button + Friend WithEvents ContextMenuStrip1 As System.Windows.Forms.ContextMenuStrip + Friend WithEvents KundenblattAnzeigenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents Panel1 As System.Windows.Forms.Panel + Friend WithEvents Button8 As System.Windows.Forms.Button + Friend WithEvents Label3 As System.Windows.Forms.Label + Friend WithEvents Button5 As System.Windows.Forms.Button + Friend WithEvents Panel3 As System.Windows.Forms.Panel + Friend WithEvents SplitContainer1 As System.Windows.Forms.SplitContainer + Friend WithEvents Button4 As System.Windows.Forms.Button + Friend WithEvents dgvSDL As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents cntxtExcel As System.Windows.Forms.ContextMenuStrip + Friend WithEvents ToolStripMenuItem3 As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents ToolStripMenuItem6 As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents lblEinträge As System.Windows.Forms.Label + Friend WithEvents cbxMax200Eintrage As System.Windows.Forms.CheckBox + Friend WithEvents UsrCntlDatenDetails1 As SDL.usrCntlDatenDetails + Friend WithEvents Button1 As System.Windows.Forms.Button + Friend WithEvents Panel4 As System.Windows.Forms.Panel + Friend WithEvents pnlTest As System.Windows.Forms.Panel + Friend WithEvents dgvFILTER As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents btnSDL_PLOSE As Button + Friend WithEvents btnVERAGCardNew As Button + Friend WithEvents btnSDL_RMC As Button +End Class diff --git a/SDL/mdm/usrcntlFremdrechnungen.resx b/SDL/mdm/usrcntlFremdrechnungen.resx new file mode 100644 index 00000000..b5f92d43 --- /dev/null +++ b/SDL/mdm/usrcntlFremdrechnungen.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 807, 17 + + \ No newline at end of file diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb new file mode 100644 index 00000000..81e9d33e --- /dev/null +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -0,0 +1,677 @@ +Imports System.Reflection + + +Public Class usrcntlFremdrechnungen + Dim KUNDE As New cKunden + Public kdNr As Integer + Public kdNr_filter As Boolean = True + Dim kundenSQL As New kundenSQL + Dim SQL As New SQL + Dim FUNC As New cProgramFunctions + Dim aktbtn As String = "" + Dim dgvInitWait As Boolean = False + Dim aktSDLNr As Integer = -1 + Dim fullyPainted = False + + + ' Dim show200 = True + Private Sub usrCntlDaten_Load(sender As Object, e As EventArgs) Handles Me.Load + EnableDoubleBuffered(dgvSDL) + + init() + + AddHandler SplitContainer1.Panel1.Scroll, Sub() + initFilterLeft() + End Sub + + AddHandler cbxMax200Eintrage.Click, Sub() + reClick() + End Sub + + + + End Sub + + Public Shared Sub EnableDoubleBuffered(ByRef dgv As DataGridView) + Dim dgvType As Type = dgv.[GetType]() + Dim pi As PropertyInfo = dgvType.GetProperty("DoubleBuffered", BindingFlags.Instance Or BindingFlags.NonPublic) + pi.SetValue(dgv, True, Nothing) + End Sub + + + Sub init() + + dgvInitWait = True + + Dim kdNr_WHERE = "" + If kdNr_filter Then + kdNr_WHERE = "" + End If + If kdNr_filter Then + 'Dim dt As DataTable = SQL.loadDgvBySql("SELECT KundenSDL.SDLNr FROM KundenSDL INNER JOIN [Speditionsdienstleistungen] as S ON s.SDLNr=KundenSDL.sdlnr WHERE s.SDLTypNr IN (1,2) AND KundenSDL.KundenNr = '" & kdNr & "' group by KundenSDL.SDLNr ") + 'If dt Is Nothing Then + ' MsgBox("Es wurden noch keine Leistungen freigeschaltet.") + 'Else + btnSDL_IDS.Visible = True ' dt.Select("SDLNr=100").Count > 0 + btnSDL_UTA.Visible = True 'dt.Select("SDLNr=212").Count > 0 + btnSDL_Hugo.Visible = False ' dt.Select("SDLNr=213").Count > 0 + btnSDL_PLOSE.Visible = True 'dt.Select("SDLNr=214").Count > 0 + btnVERAGCardNew.Visible = True 'dt.Select("SDLNr=502").Count > 0 + btnSDL_MautMSE.Visible = True 'dt.Select("SDLNr=208").Count > 0 + btnSDL_FREJUS.Visible = False ' dt.Select("SDLNr=207").Count > 0 + btnSDL_RMC.Visible = True + btnSDL_Alle.Visible = False + 'End If + + SplitContainer1.Panel2Collapsed = False + dgvSDL_SelectionChanged(dgvSDL, New System.EventArgs) + + End If + + SET_SDL(-1) + + dgvInitWait = False + Panel3.Visible = True + + + End Sub + + + + + Sub initFilterLeft() + Dim left_value As Integer = SplitContainer1.Panel1.HorizontalScroll.Value 'HorizontalScrollingOffset + dgvFILTER.Left = (-1) * left_value + End Sub + + + + Sub initFilter() + dgvInitWait = True + + dgvFILTER.RowTemplate.Height = dgvFILTER.Height + If Not fullyPainted Then Exit Sub ' nur wenn die usrcntl komplett gelden wurde... + 'pnlFilter.Controls.Clear() + Try + dgvFILTER.Columns.Clear() + Catch ex As Exception + + End Try + For Each c As DataGridViewColumn In dgvSDL.Columns + Dim cNew As DataGridViewColumn = c.Clone + + If c.ReadOnly And c.Name = "IDS-KdNr" Then + cNew = New DataGridViewTextBoxColumn + cNew.Name = c.Name + cNew.Width = c.Width + cNew.Visible = c.Visible + 'KundenNr + End If + cNew.MinimumWidth = c.Width + dgvFILTER.Columns.Add(cNew) + If cNew.GetType Is GetType(DataGridViewCheckBoxColumn) Then + DirectCast(cNew, DataGridViewCheckBoxColumn).ThreeState = True + DirectCast(cNew, DataGridViewCheckBoxColumn).DefaultCellStyle.NullValue = CheckState.Indeterminate + End If + Next + + If dgvFILTER IsNot Nothing AndAlso dgvFILTER.ColumnCount > 0 Then + + 'dgv.AllowUserToAddRows = False + dgvFILTER.Rows.Add() + ' pnlTest.Controls.Add(dgv) + ' dgv.Top = 0 + ' dgv.Left = 0 + dgvFILTER.Width = dgvSDL.Width + End If + + dgvInitWait = False + + End Sub + + Dim txtchanged As Boolean = False + Sub initSearchOLD() + reClick() + Exit Sub + ' MsgBox("SEARCH") + txtchanged = True + ' initSDLBinding() + initAllg() + + + dgvSDL.RELOAD() + txtchanged = False + dgvSDL.ClearSelection() + If dgvSDL.RowCount > 0 Then dgvSDL.Rows(0).Cells(0).Selected = True + 'dgvSDL_SelectionChanged(dgvSDL, New EventArgs) + End Sub + + Function getSqlText(t) As String + Try + Return t.Replace("'", "") + Catch ex As Exception + Return "" + End Try + End Function + + Function getFilter() As String + + + Dim filter As String = "" + Dim andstr As String = "" + + If dgvFILTER.RowCount > 0 Then + For Each c As DataGridViewCell In dgvFILTER.Rows(0).Cells + If c.Value IsNot DBNull.Value Then + If c.GetType Is GetType(DataGridViewTextBoxCell) Then + If c.Value IsNot Nothing AndAlso c.Value <> "" Then + Dim srchstr = getSqlText(c.Value.ToString.Trim) + If c.OwningColumn.Name.Contains("SDLNr") Then + filter &= andstr & " FMZOLL.[" & c.OwningColumn.Name & "] LIKE '%" & srchstr & "%' " + ElseIf c.OwningColumn.Name.Contains("IDS-KdNr") Then + filter &= andstr & " (SELECT TOP 1 [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE [KdNrVERAG]=KundenNr AND KdNrAlt =0 ORDER BY Zeitstempel DESC) LIKE '%" & srchstr & "%' " + ElseIf IsDate(srchstr) Then + If srchstr.ToLower = "ist null" Then + filter &= andstr & "( [" & c.OwningColumn.Name & "] is null ) " + Else + filter &= andstr & " convert(varchar,[" & c.OwningColumn.Name & "] ,104) LIKE '%" & srchstr & "%' " + End If + Else + If srchstr.ToLower = "ist null" Then + filter &= andstr & "( [" & c.OwningColumn.Name & "] LIKE '' OR [" & c.OwningColumn.Name & "] is null ) " + Else + filter &= andstr & " [" & c.OwningColumn.Name & "] LIKE '%" & srchstr & "%' " + End If + End If + andstr = " AND " + End If + ElseIf c.GetType Is GetType(DataGridViewCheckBoxCell) Then + If c.Value IsNot Nothing AndAlso c.Value.ToString <> "" Then + If c.Value = CheckState.Checked Then + filter &= andstr & " FMZOLL.[" & c.OwningColumn.Name & "] =1 " + andstr = " AND " + ElseIf c.Value = CheckState.Unchecked Then + filter &= andstr & " FMZOLL.[" & c.OwningColumn.Name & "] =0 " + andstr = " AND " + End If + End If + End If + + End If + Next + End If + + Return filter + End Function + + + + + Sub clearFilter() + If dgvFILTER.RowCount > 0 Then + For Each c As DataGridViewCell In dgvFILTER.Rows(0).Cells + c.Value = c.DefaultNewRowValue + Next + End If + + End Sub + + + Sub initAllg() + If Not fullyPainted Then Exit Sub ' nur wenn die usrcntl komplett gelden wurde... + Try + + With dgvSDL + .RowTemplate.Height = 20 + .AllowUserToOrderColumns = False + .AllowUserToResizeRows = False + .SelectionMode = DataGridViewSelectionMode.FullRowSelect + .ReadOnly = True + + .AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells + + 'redRows() + + End With + + Catch ex As Exception + MsgBox(ex.Message) + End Try + End Sub + + + Sub initDGVWidth() + Dim DGVwidth = 0 + Dim reduceWidth = 0 + For Each c As DataGridViewColumn In dgvSDL.Columns + DGVwidth += c.Width + Next + Dim DGVheight = 0 + For Each r As DataGridViewRow In dgvSDL.Rows + DGVheight += r.Height + Next + DGVheight += 50 + ' + + If DGVheight > (SplitContainer1.Panel1.Height) Then + dgvSDL.Height = DGVheight + reduceWidth = 25 ' Scrollbar + Else + dgvSDL.Height = SplitContainer1.Panel1.Height - 25 + End If + If DGVwidth > SplitContainer1.Panel1.Width Then + dgvSDL.Width = DGVwidth - reduceWidth + Else + dgvSDL.Width = SplitContainer1.Panel1.Width - reduceWidth + End If + + End Sub + + Sub ifContainsAndTrueRed(r As DataGridViewRow, t As String) + If r.Cells(t).Value IsNot DBNull.Value AndAlso r.Cells(t).Value = True Then + r.DefaultCellStyle.ForeColor = Color.Red + End If + End Sub + Sub initBtnClick(b As Button) + 'Dim defaufl_color As Color = Color.FromArgb(240, 245, 255) + Dim defaufl_color As Color = Color.White + Dim defaufl_forecolor As Color = Color.Black + btnSDL_Alle.BackColor = defaufl_color : btnSDL_Alle.ForeColor = defaufl_forecolor : btnSDL_Alle.FlatAppearance.BorderSize = 0 + btnSDL_IDS.BackColor = defaufl_color : btnSDL_IDS.ForeColor = defaufl_forecolor : btnSDL_IDS.FlatAppearance.BorderSize = 0 + btnSDL_UTA.BackColor = defaufl_color : btnSDL_UTA.ForeColor = defaufl_forecolor : btnSDL_UTA.FlatAppearance.BorderSize = 0 + btnSDL_FREJUS.BackColor = defaufl_color : btnSDL_FREJUS.ForeColor = defaufl_forecolor : btnSDL_FREJUS.FlatAppearance.BorderSize = 0 + btnSDL_Hugo.BackColor = defaufl_color : btnSDL_Hugo.ForeColor = defaufl_forecolor : btnSDL_Hugo.FlatAppearance.BorderSize = 0 + btnSDL_MautMSE.BackColor = defaufl_color : btnSDL_MautMSE.ForeColor = defaufl_forecolor : btnSDL_MautMSE.FlatAppearance.BorderSize = 0 + btnSDL_PLOSE.BackColor = defaufl_color : btnSDL_PLOSE.ForeColor = defaufl_forecolor : btnSDL_PLOSE.FlatAppearance.BorderSize = 0 + btnVERAGCardNew.BackColor = defaufl_color : btnVERAGCardNew.ForeColor = defaufl_forecolor : btnVERAGCardNew.FlatAppearance.BorderSize = 0 + + b.FlatAppearance.BorderSize = 1 + b.BackColor = SystemColors.ButtonHighlight + b.ForeColor = Color.Black + aktbtn = b.Name + + If dgvSDL.Columns("SDLNr") IsNot Nothing Then + + If aktbtn = "btnSDL_Alle" Then + dgvSDL.Columns("SDLNr").Visible = True + Else + dgvSDL.Columns("SDLNr").Visible = False + End If + End If + + End Sub + + + Sub SET_SDL(SDLNrTmp, Optional doFilter = False) + aktSDLNr = SDLNrTmp + + Dim SQL_STR = "" + Select Case SDLNrTmp + + 'IDS + Case 100 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & + " [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM tblIDSInvoicesNew WHERE [CustomerCode] = (SELECT TOP 1 [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE [KdNrVERAG]=" & kdNr & " AND KdNrAlt =0 ORDER BY Zeitstempel DESC) order by [YearMonthDay], [Invoicenumber]" + + 'UTA + Case 212 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & + " [Rechnungsdatum],[Abrechnungsnummer] as Rechnungsnummer,Kundennummer,[daId],[Lieferland_ISO2] as Land, 'RE' as Art, cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblUTAImportNew] where Kundennummer = " & kdNr & " group by [Abrechnungsnummer],[Rechnungsdatum],Kundennummer,[daId],[Lieferland_ISO2]" + + SQL_STR &= " UNION ALL SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " [Datum], [RechnungsNr],[KundenNr],[daId],'',[DocumentTyp], cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblUTADocuments] where KundenNr = " & kdNr + + 'PLOSE + Case 214 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & + " [plInv_SupplierRechnungsDatum] as Rechnungsdatum, [plInv_SupplierRechnungsNr] as Rechnungsnummer,[plInv_Nettobetrag] as Nettobetrag,[plInv_MWSTBetrag] as MWST,[plInv_Bruttobetrag] as Bruttobetrag,[plInv_daId] as daId, [plInv_SupplierCountry] as Land, cast(case when [plInv_daId] is not null then 1 else 0 end as bit) as PDF FROM tblPLOSE_Inv_Data where plInv_PLOSEKundennummer = " & kdNr + + 'MSE + Case 208 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & + " [invoice_date] as Rechnungsdatum, [invoice_id] as Rechnungsnummer/*,[invoice_nr]*/,[customer_number] as Kundennummer, daId, [total_amount_euro] as Brutto_EUR ,[total_vat_amount_euro] as MWST,[country] as Land, cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM tblMSEInvoices where customer_number = (select top 1 customer_id from tblMSECustomers where partner_customer_number = " & kdNr & ") order by invoice_date, invoice_id" + + 'VERAG + Case 502 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & + " tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer , tblTrdinInvoice.SteuerbetragLokal, cast( 1 as bit) as PDF FROM tblTrdinInvoice WHERE tblTrdinInvoice.RechnungsKundenNr=" & kdNr & " ORDER BY tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer" + 'RMC + Case 999 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & + "[rmc_reDatum] as Rechnungsdatum,[rmc_reNr] as Rechnungsnummer,[rmc_betragNetto] as Nettobetrag,[rmc_betragBrutto] as Bruttobetrag,[rmc_waehrung] as Währung ,[rmc_euroBrutto] as Brutto_EUR,[rmc_daId] as daId,[rmc_betragMWST] as MWST, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblRMCImport] where rmc_kdNr = " & kdNr & " order by rmc_reDatum, rmc_reNr" + Case Else + Exit Sub + + End Select + + newBinding(SDLNrTmp, SQL_STR, doFilter) + initBtnClick(getSDLNrButton(SDLNrTmp)) + + With dgvSDL + + If .Columns.Count > 0 Then + If .Columns.Contains("daId") Then + If .Columns("daId") IsNot Nothing Then .Columns("daId").Visible = False + + End If + End If + + End With + + initAllg() + dgvSDL.Width = 100 + dgvSDL.Height = 100 + dgvSDL.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells + + initDGVWidth() 'vor Filter, damit richtige Größe + If Not doFilter Then initFilter() + + + End Sub + + Function getSDLNrButton(SDLNrTmp) As Object + Select Case SDLNrTmp + Case 100 : Return btnSDL_IDS + Case 212 : Return btnSDL_UTA + Case 213 : Return btnSDL_Hugo + Case 214 : Return btnSDL_PLOSE + Case 208 : Return btnSDL_MautMSE + Case 207 : Return btnSDL_FREJUS + Case 502 : Return btnVERAGCardNew + Case 999 : Return btnSDL_RMC + Case Else : Return btnSDL_Alle + End Select + End Function + Private Sub btnSDL_Alle_Click(sender As Object, e As EventArgs) Handles btnSDL_Alle.Click + SET_SDL(-1) + End Sub + + Private Sub btnSDL_IDS_Click(sender As Object, e As EventArgs) Handles btnSDL_IDS.Click + SET_SDL(100) + End Sub + + Private Sub btnSDL_UTA_Click(sender As Object, e As EventArgs) Handles btnSDL_UTA.Click + SET_SDL(212) + End Sub + + Private Sub btnSDL_Hugo_Click(sender As Object, e As EventArgs) Handles btnSDL_Hugo.Click + SET_SDL(213) + End Sub + + Private Sub btnSDL_PLOSE_Click(sender As Object, e As EventArgs) Handles btnSDL_PLOSE.Click + SET_SDL(214) + End Sub + + + Private Sub btnSDL_MautMSE_Click(sender As Object, e As EventArgs) Handles btnSDL_MautMSE.Click + SET_SDL(208) + End Sub + + Private Sub btnSDL_MotorWay_Click(sender As Object, e As EventArgs) + SET_SDL(205) + End Sub + + Private Sub btnSDL_FREJUS_Click(sender As Object, e As EventArgs) Handles btnSDL_FREJUS.Click + SET_SDL(207) + End Sub + + Private Sub btnVERAGCardNew_Click(sender As Object, e As EventArgs) Handles btnVERAGCardNew.Click + SET_SDL(502) + End Sub + + Private Sub btnSDL_RMC_Click(sender As Object, e As EventArgs) Handles btnSDL_RMC.Click + SET_SDL(999) + End Sub + + + Private Sub dgvSDL_ColumnWidthChanged(sender As Object, e As DataGridViewColumnEventArgs) Handles dgvSDL.ColumnWidthChanged + initfilterColumnsWidth() + End Sub + + Sub initfilterColumnsWidth() + + If dgvFILTER.ColumnCount > 0 AndAlso dgvFILTER.ColumnCount = dgvSDL.ColumnCount Then + + dgvFILTER.Width = dgvSDL.Width + For Each c As DataGridViewColumn In dgvSDL.Columns + dgvFILTER.Columns(c.Index).Width = c.Width + Next + + End If + End Sub + Sub newBinding(sdlNr As Integer, ByVal sql As String, doFilter As Boolean) + dgvInitWait = True + ' bindingSDL = Nothing + dgvSDL.Columns.Clear() + dgvSDL.VirtualMode = True + txtchanged = True + dgvInitWait = True + + If doFilter Then + Dim filter As String = getFilter() + If filter <> "" Then sql &= " AND " & filter + Else + + End If + + dgvSDL.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells + + dgvSDL.SET_SQL(sql, "FMZOLL") + dgvSDL.LOAD() + + lblEinträge.Text = dgvSDL.RowCount & " Einträge" + If dgvSDL.RowCount >= 200 Then lblEinträge.Text = dgvSDL.RowCount & " Einträge " & IIf(cbxMax200Eintrage.Checked, "(Anzeige auf 200 beschränkt)", "") + + dgvInitWait = False + + txtchanged = False + dgvInitWait = False + dgvSDL.ClearSelection() + + If dgvSDL.RowCount > 0 Then + dgvSDL.Rows(0).Cells(0).Selected = True + Else + End If + + End Sub + + + + Private Sub Button4_Click(sender As Object, e As EventArgs) Handles btnFilter.Click + ' MsgBox(pnlFilterInside.Height) + Exit Sub + If pnlTest.Height > 0 Then + pnlTest.Height = 0 + btnFilter.Text = "Filter einblenden" + Else + pnlTest.Height = 39 + btnFilter.Text = "Filter ausblenden" + End If + End Sub + + + + Private Sub Button4_Click_1(sender As Object, e As EventArgs) Handles Button4.Click + If SplitContainer1.Panel2Collapsed Then + SplitContainer1.Panel2Collapsed = False + dgvSDL_SelectionChanged(dgvSDL, New System.EventArgs) + Else + SplitContainer1.Panel2Collapsed = True + End If + + End Sub + + Sub reClick() + getSDLNrButton(aktSDLNr).PerformClick() + End Sub + + Sub refreshDgv(kdNr, SDLNr, Optional Kfz = "", Optional History = "") + SET_SDL(aktSDLNr, True) + + dgvSDL.ClearSelection() + If Kfz <> "" And History <> "" Then + For Each r As DataGridViewRow In dgvSDL.Rows + If r.Cells("KundenNr").Value = kdNr And + r.Cells("SDLNr").Value = SDLNr And + r.Cells("KfzKennzeichen").Value = Kfz And + r.Cells("History").Value = History Then + r.Selected = True + Exit For + End If + Next + End If + + End Sub + + + + Private Sub UsrCntlDatenDetails1_Changed(kdNr, Kfz, SDLNr, History) Handles UsrCntlDatenDetails1.Changed + 'refreshDgv(kdNr, SDLNr, Kfz, History)'?????????????? ausgebelndet,was das ein VErsuch? 31.07.2017 + dgvSDL.VALUE_CHANGED = True + End Sub + + Private Sub datadgvSDL_SelectionChanged(kdNr, Kfz, SDLNr, History) Handles UsrCntlDatenDetails1.DataChanged + ' refreshDgv(kdNr, SDLNr, Kfz, History) + dgvSDL.VALUE_CHANGED = True + Exit Sub + + dgvInitWait = True + dgvSDL.RELOAD() + dgvInitWait = False + End Sub + ' Private Sub dgvSDL_SelectionChanged(sender As Object, e As EventArgs) Handles dgvSDL.SelectionChanged + + Private Sub dgvSDL_KeyDown(sender As Object, e As KeyEventArgs) Handles dgvSDL.KeyUp + If e.KeyCode = Keys.Up Or e.KeyCode = Keys.Down Or e.KeyCode = Keys.End Or e.KeyCode = Keys.Home Then '?POS1 + ' ReloadLeistung() + End If + End Sub + Private Sub dgvSDL_SelectionChanged(sender As Object, e As EventArgs) Handles dgvSDL.Click + 'ReloadLeistung() + End Sub + + + Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click + If Not kdNr_filter Then + If dgvSDL.SelectedCells.Count > 0 Then + If IsNumeric(dgvSDL.CurrentRow.Cells("KundenNr").Value) Then + cProgramFunctions.openKundenblatt(dgvSDL.CurrentRow.Cells("KundenNr").Value, Me.FindForm, True) + End If + End If + End If + End Sub + + + Sub SelectRow(kdnr, kfz, SDLNr, history) + dgvInitWait = True + dgvSDL.ClearSelection() + For Each r As DataGridViewRow In dgvSDL.Rows + If r.Cells("KundenNr").Value = kdnr AndAlso + r.Cells("SDLNr").Value = SDLNr AndAlso + r.Cells("KfzKennzeichen").Value = kfz AndAlso + r.Cells("History").Value = history Then + r.Selected = True + dgvSDL.FirstDisplayedScrollingRowIndex = r.Index + Exit For + End If + Next + dgvInitWait = False + 'ReloadLeistung() + dgvSDL.PerformLayout() + End Sub + + + Private Sub ToolStripMenuItem3_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem3.Click + Me.Cursor = Cursors.WaitCursor + cProgramFunctions.genExcelFromDGV(dgvSDL, True) + Me.Cursor = Cursors.Default + End Sub + + Private Sub ToolStripMenuItem6_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem6.Click + Me.Cursor = Cursors.WaitCursor + cProgramFunctions.genExcelFromDGV_NEW(dgvSDL, True) + Me.Cursor = Cursors.Default + End Sub + + + Private Sub Button8_Click_1(sender As Object, e As EventArgs) Handles Button8.Click + Me.Cursor = Cursors.WaitCursor + cProgramFunctions.genExcelFromDGV_NEW(dgvSDL, True, True) + Me.Cursor = Cursors.Default + End Sub + + Private Sub Button1_Click_2(sender As Object, e As EventArgs) Handles Button1.Click + dgvSDL.RELOAD() + End Sub + + + Private Sub dgvSDL_RELOADED() Handles dgvSDL.RELOADED + ' redRows() + End Sub + + Private Sub usrCntlKartenDaten_SizeChanged(sender As Object, e As EventArgs) Handles Me.SizeChanged + ' initDGVWidth() + End Sub + + + Dim vval As Integer + Private Sub dgvSDL_GotFocus(sender As Object, e As EventArgs) Handles dgvSDL.GotFocus + 'dgvSDL.VerticalScrollingOffset = vval + SplitContainer1.Panel1.VerticalScroll.Value = vval + End Sub + + Private Sub dgvSDL_Enter(sender As Object, e As EventArgs) Handles dgvSDL.Enter + vval = SplitContainer1.Panel1.VerticalScroll.Value + End Sub + + + Private Sub dgvFILTER_SelectionChanged(sender As Object, e As EventArgs) Handles dgvFILTER.SelectionChanged + dgvFILTER.ClearSelection() + End Sub + + Private Sub dgvFILTER_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvFILTER.CellContentClick + If dgvFILTER.Columns(e.ColumnIndex).GetType Is GetType(DataGridViewCheckBoxColumn) Then + dgvSDL.Focus() + End If + End Sub + + + Private Sub dgvFILTER_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvFILTER.CellValueChanged + SET_SDL(aktSDLNr, True) + initfilterColumnsWidth() + End Sub + + Private Sub dgvSDL_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSDL.CellContentDoubleClick + + Try + If e.RowIndex >= 0 AndAlso e.ColumnIndex >= 0 Then + + Select Case aktSDLNr + Case 502 + Dim ReDat = dgvSDL.Rows(e.RowIndex).Cells("Rechnungsdatum").Value + Dim ReNr = dgvSDL.Rows(e.RowIndex).Cells("Rechnungsnummer").Value + + If ReDat IsNot Nothing AndAlso ReNr > 0 Then + Me.Cursor = Cursors.WaitCursor + Dim da_id = SQL.getValueTxtBySql("SELECT TOP(1) RK_ID FROM Rechnungsausgang where cast(Rechnungsausgang.RechnungsDatum as Date) ='" & ReDat & "' and Rechnungsausgang.RechnungsNr='" & ReNr & "' AND FilialenNr = 4814 AND RK_ID is not null", "FMZOLL") + cFakturierung.doRechnungsDruck_SRorER(da_id,, False, 3) + End If + + Case Else + Dim daId = dgvSDL.Rows(e.RowIndex).Cells("daId").Value + If daId > 0 Then + Me.Cursor = Cursors.WaitCursor + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(daId) + DS.OPEN_SINGLE() + End If + + End Select + + + End If + + + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Me.Cursor = Cursors.Default + End Try + + Me.Cursor = Cursors.Default + + + End Sub +End Class diff --git a/SDL/seriendruck/Vorlagen/Erstattungsschreiben/Erstattungsschreiben DE.dotx b/SDL/seriendruck/Vorlagen/Erstattungsschreiben/Erstattungsschreiben DE.dotx index 6246e803..7dd7bfaf 100644 Binary files a/SDL/seriendruck/Vorlagen/Erstattungsschreiben/Erstattungsschreiben DE.dotx and b/SDL/seriendruck/Vorlagen/Erstattungsschreiben/Erstattungsschreiben DE.dotx differ diff --git a/SDL/seriendruck/Vorlagen/Erstattungsschreiben/Erstattungsschreiben RO.dotx b/SDL/seriendruck/Vorlagen/Erstattungsschreiben/Erstattungsschreiben RO.dotx index b8d1f6fb..98fb2b90 100644 Binary files a/SDL/seriendruck/Vorlagen/Erstattungsschreiben/Erstattungsschreiben RO.dotx and b/SDL/seriendruck/Vorlagen/Erstattungsschreiben/Erstattungsschreiben RO.dotx differ diff --git a/SDL/seriendruck/Vorlagen/Erstattungsschreiben/Erstattungsschreiben TR.dotx b/SDL/seriendruck/Vorlagen/Erstattungsschreiben/Erstattungsschreiben TR.dotx index c6a5f0cb..1c7860d5 100644 Binary files a/SDL/seriendruck/Vorlagen/Erstattungsschreiben/Erstattungsschreiben TR.dotx and b/SDL/seriendruck/Vorlagen/Erstattungsschreiben/Erstattungsschreiben TR.dotx differ diff --git a/SDL/seriendruck/Vorlagen/Erstattungsschreiben/Erstattungsschreiben YU.dotx b/SDL/seriendruck/Vorlagen/Erstattungsschreiben/Erstattungsschreiben YU.dotx index d1f74abe..9ef6d406 100644 Binary files a/SDL/seriendruck/Vorlagen/Erstattungsschreiben/Erstattungsschreiben YU.dotx and b/SDL/seriendruck/Vorlagen/Erstattungsschreiben/Erstattungsschreiben YU.dotx differ diff --git a/SDL/seriendruck/usrCntlSeriendruck.vb b/SDL/seriendruck/usrCntlSeriendruck.vb index f39e1bfe..4d80fc6b 100644 --- a/SDL/seriendruck/usrCntlSeriendruck.vb +++ b/SDL/seriendruck/usrCntlSeriendruck.vb @@ -1,4 +1,5 @@ Imports Microsoft.Office.Interop +Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlSeriendruck @@ -32,7 +33,15 @@ Public Class usrCntlSeriendruck Dim berichteSQL As New BerichteSQL Dim bericht As cErstasttungsschreiben = berichteSQL.getErstatung(txtErstattungAbfNrFiliale_neu.Text, txtErstattungAbfNr_neu.Text, txtErstattungAbfUnterNr_neu.Text) + + Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(19) + 'Dim ADRESSE = New VERAG_PROG_ALLGEMEIN.cAdressen(bericht.) + If FIRMA IsNot Nothing Then + WordDoc.FormFields("txtAdresseZeileFirma").Range.Text = FIRMA.Firma_Bez + ", " + FIRMA.Firma_Ort + End If + + If bericht.KorrAdresse <> "" Then bericht.KorrAdresse = bericht.KorrAdresse.Replace(Chr(13) & Chr(10), Chr(13)) If InStr(bericht.KorrAdresse, Chr(13)) > 0 Then @@ -48,7 +57,8 @@ Public Class usrCntlSeriendruck Else WordDoc.FormFields("txtAdresseZeile1").Range.Text = bericht.Name.Trim WordDoc.FormFields("txtAdresseZeile2").Range.Text = bericht.Straße - WordDoc.FormFields("txtAdresseZeile3").Range.Text = bericht.LandKz & " " & bericht.Ort + WordDoc.FormFields("txtAdresseZeile3").Range.Text = bericht.Ort + WordDoc.FormFields("txtAdresseZeile4").Range.Text = cProgramFunctions.getLandBez_fromISO1Land(bericht.LandKz, "", cbxErstSprache.SelectedItem.value).ToString.ToUpper End If WordDoc.FormFields("Datum").Range.Text = bericht.MWST diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cFirmen.vb b/VERAG_PROG_ALLGEMEIN/Classes/cFirmen.vb index 6b5d8b5d..5b73dafb 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cFirmen.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cFirmen.vb @@ -28,6 +28,7 @@ Public Class cFirmen Property Firma_E_Mail_Mahnungen As Object = Nothing Property Firma_Webadresse As Object = Nothing ' NVARCHAR (40) NULL, Property Firma_LandKz As Object = Nothing ' NVARCHAR (40) NULL, + Property Firma_Steuernummer As Object = Nothing Property Firmengruppe As Object = Nothing @@ -72,6 +73,7 @@ Public Class cFirmen list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_Webadresse", Firma_Webadresse)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_LandKz", Firma_LandKz)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firmengruppe", Firmengruppe)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_Steuernummer", Firma_Steuernummer)) Return list diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb index bf7bad3c..dc047385 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb @@ -831,6 +831,130 @@ Public Class cUTA End Class + + Public Class UTADocuments + + Property Id As Integer + Property DocumentName As String + Property DocumentTyp As String + Property Zeitstempel As DateTime + Property daId As Integer + Property KundenNr As Integer + Property RechnungsNr As String + Property Datum As Object = Nothing + + Public hasEntry = False + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Sub New(Id) + Me.Id = Id + LOAD() + End Sub + + Sub New() + End Sub + + Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Id", Id,, True)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DocumentName", DocumentName)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DocumentTyp", DocumentTyp)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Zeitstempel", Zeitstempel)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("daId", daId)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KundenNr", KundenNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RechnungsNr", RechnungsNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Datum", Datum)) + Return list + End Function + + Public Function SAVE() As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim sqlstr = " BEGIN TRAN If EXISTS(Select * FROM tblUTADocuments WHERE Datum=@Datum AND KundenNr = @KundenNr AND RechnungsNr=@RechnungsNr ) " & + " BEGIN " & getUpdateCmd() & " End " & + " Else " & + " BEGIN " & getInsertCmd() & " End " & + " commit tran " + + Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list) + End Function + + Public Sub LOAD() + Try + hasEntry = False + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("Select * FROM tblUTADocuments WHERE Id=@Id ", conn) + cmd.Parameters.AddWithValue("@Id", Id) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each li In getParameterList() + Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable) + + If dr.Item(li.Text) Is DBNull.Value Then + propInfo.SetValue(Me, Nothing) + Else + propInfo.SetValue(Me, dr.Item(li.Text)) + End If + + Next + hasEntry = True + End If + dr.Close() + End Using + End Using + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name) + End Try + End Sub + + + + Public Function getUpdateCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim str As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + Return (" UPDATE tblUTADocuments SET " & str & " WHERE Datum=@Datum AND KundenNr = @KundenNr AND RechnungsNr=@RechnungsNr") + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name) + End Try + Return "" + End Function + + + Public Function getInsertCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim str As String = "" + Dim values As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "]," + values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + values = values.Substring(0, values.Length - 1) 'wg. ',' + Return (" INSERT INTO tblUTADocuments (" & str & ") VALUES(" & values & ") ") + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name) + End Try + Return "" + End Function + + + + End Class + + Public Function readAndSaveUTA(objFileRead As StreamReader, fi As FileInfo, cnt As Integer, Optional onlyTestkunedn As Boolean = False) As Boolean diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index a0348488..da3a24ad 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -270,11 +270,11 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( If autoAdjust Then 'Spaltenbreite auto: - wb.Worksheets(0).Columns().AdjustToContents() + If wb.Worksheets(0).ColumnCount > 0 Then wb.Worksheets(0).Columns().AdjustToContents() End If - Dim filename As String = "" + Dim filename As String = "" If optFileName <> "" Then filename = sPath & optFileName & endung '".xlsx" While System.IO.File.Exists(filename)